[#3198] add data as key for option-data in YANG modules

Setting mandatory for keys is redundant as mentioned in RFC 7950 section
7.8.2: Any "mandatory" statements in the key leafs are ignored.

So they were removed. This now makes it consistent with how data is
declared in option-data as well.

diff --git a/src/share/yang/modules/kea-dhcp4-server@2023-06-28.yang b/src/share/yang/modules/kea-dhcp4-server@2023-06-28.yang
index c2561057e898534a4b2d774d964d18645401ecd8..e82b3d1ad3bdc63953b8ac2f304215caf2678fd3 100644 (file)
--- a/src/share/yang/modules/kea-dhcp4-server@2023-06-28.yang
+++ b/src/share/yang/modules/kea-dhcp4-server@2023-06-28.yang
@@ -331,16 +331,14 @@ module kea-dhcp4-server {
   grouping option-data-list {
     description "Option data list grouping.";
     list option-data {
-      key "code space";
+      key "code space data";
       description "Option data entry.";
       leaf code {
         type uint8;
-        mandatory true;
         description "Option code.";
       }
       leaf space {
         type string;
-        mandatory true;
         description "Option space.";
       }
       uses dhcp:option-data-name;

diff --git a/src/share/yang/modules/kea-dhcp6-server@2023-06-28.yang b/src/share/yang/modules/kea-dhcp6-server@2023-06-28.yang
index 8f716201cbe5666d985031960fc2ccc7f16769c5..d843d8277fbdd2408f98d9286cf34cfa6d05a93b 100644 (file)
--- a/src/share/yang/modules/kea-dhcp6-server@2023-06-28.yang
+++ b/src/share/yang/modules/kea-dhcp6-server@2023-06-28.yang
@@ -365,16 +365,14 @@ module kea-dhcp6-server {
   grouping option-data-list {
     description "Option data list grouping.";
     list option-data {
-      key "code space";
+      key "code space data";
       description "Option data entry.";
       leaf code {
         type uint16;
-        mandatory true;
         description "Option code.";
       }
       leaf space {
         type string;
-        mandatory true;
         description "Option space.";
       }
       uses dhcp:option-data-name;