[202311][dhcp_server][yang] Update supported option type to string (s…

…onic-net#18029) (sonic-net#18043)
mssonicbld · Feb 7, 2024 · 0611bdf · 0611bdf
1 parent 5352135
commit 0611bdf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
@@ -1024,7 +1024,7 @@ IPV4 DHPC Server related configuration are defined in **DHCP_SERVER_IPV4**, **DH
     "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
         "option60": {
             "id": 60,
-            "type": "text",
+            "type": "string",
             "value": "dummy_value"
         }
     },

diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1924,7 +1924,7 @@
         "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
             "option60": {
                 "id": "60",
-                "type": "text",
+                "type": "string",
                 "value": "dummy_value"
             }
         },

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/dhcp_server_ipv4.json b/src/sonic-yang-models/tests/yang_model_tests/tests/dhcp_server_ipv4.json
@@ -35,8 +35,8 @@
         "eStrKey": "InvalidValue",
         "eStr": ["type"]
     },
-    "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_TEXT": {
-        "desc": "Add text type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS."
+    "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_STRING": {
+        "desc": "Add string type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS."
     },
     "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_IPV4_ADDRESS": {
         "desc": "Add ipv4-address type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS."

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcp_server_ipv4.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcp_server_ipv4.json
@@ -46,7 +46,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -171,7 +171,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -230,7 +230,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -248,14 +248,14 @@
             }
         }
     },
-    "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_TEXT": {
+    "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_STRING": {
         "sonic-dhcp-server-ipv4:sonic-dhcp-server-ipv4": {
             "sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
                 "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -325,7 +325,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "texts",
+                        "type": "text",
                         "value": "dummy_value"
                     }
                 ]
@@ -448,7 +448,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -529,7 +529,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -610,7 +610,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -691,7 +691,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -772,7 +772,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -814,7 +814,7 @@
                 "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [
                     {
                         "name": "option60",
-                        "type": "text",
+                        "type": "string",
                         "value": "dummy_value"
                     }
                 ]
@@ -828,7 +828,7 @@
                     {
                         "name": "option60",
                         "id": 60,
-                        "type": "text"
+                        "type": "string"
                     }
                 ]
             }

diff --git a/src/sonic-yang-models/yang-models/sonic-dhcp-server-ipv4.yang b/src/sonic-yang-models/yang-models/sonic-dhcp-server-ipv4.yang
@@ -130,7 +130,7 @@ module sonic-dhcp-server-ipv4 {
                 leaf type {
                     description "Type of customized option, for standard DHCP option, this field is invalid";
                     type enumeration {
-                        enum text;
+                        enum string;
                         enum ipv4-address;
                         enum uint8;
                         enum uint16;