matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dhcp_server][yang] Update supported option type to string (#18029)

Browse Source
This commit is contained in:
Yaqiang Zhu 2024-02-06 02:25:55 +08:00 committed by GitHub
parent 2f35079979
commit c323ccfa72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sonic-yang-models/doc/Configuration.md
View File

@ -1024,7 +1024,7 @@ IPV4 DHPC Server related configuration are defined in **DHCP_SERVER_IPV4**, **DH
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": { "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
"option60": { "option60": {
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
}, },

2
src/sonic-yang-models/tests/files/sample_config_db.json
View File

@ -1970,7 +1970,7 @@
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": { "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
"option60": { "option60": {
"id": "60", "id": "60",
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
}, },

4
src/sonic-yang-models/tests/yang_model_tests/tests/dhcp_server_ipv4.json
View File

@ -43,8 +43,8 @@
"desc": "Configure DHCP port in DHCP_SERVER_IPV4_PORT table which is no exist.", "desc": "Configure DHCP port in DHCP_SERVER_IPV4_PORT table which is no exist.",
"eStrKey": "InvalidValue" "eStrKey": "InvalidValue"
}, },
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_TEXT": { "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_STRING": {
"desc": "Add text type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS." "desc": "Add string type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS."
}, },
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_IPV4_ADDRESS": { "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_TYPE_VALID_VALUE_IPV4_ADDRESS": {
"desc": "Add ipv4-address type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS." "desc": "Add ipv4-address type of DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS."

26
src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcp_server_ipv4.json
View File

@ -63,7 +63,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -212,7 +212,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -272,7 +272,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -325,14 +325,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:sonic-dhcp-server-ipv4": {
"sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": { "sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [ "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -402,7 +402,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "texts", "type": "text",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -527,7 +527,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -609,7 +609,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -691,7 +691,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -773,7 +773,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -855,7 +855,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -897,7 +897,7 @@
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [ "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [
{ {
"name": "option60", "name": "option60",
"type": "text", "type": "string",
"value": "dummy_value" "value": "dummy_value"
} }
] ]
@ -911,7 +911,7 @@
{ {
"name": "option60", "name": "option60",
"id": 60, "id": 60,
"type": "text" "type": "string"
} }
] ]
} }

2
src/sonic-yang-models/yang-models/sonic-dhcp-server-ipv4.yang
View File

@ -139,7 +139,7 @@ module sonic-dhcp-server-ipv4 {
leaf type { leaf type {
description "Type of customized option, for standard DHCP option, this field is invalid"; description "Type of customized option, for standard DHCP option, this field is invalid";
type enumeration { type enumeration {
enum text; enum string;
enum ipv4-address; enum ipv4-address;
enum uint8; enum uint8;
enum uint16; enum uint16;