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

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

Browse Source
This commit is contained in:
Yaqiang Zhu 2024-02-07 08:31:19 +08:00 committed by GitHub
parent 5352135776
commit 0611bdfb39
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": {
"option60": {
"id": 60,
"type": "text",
"type": "string",
"value": "dummy_value"
}
},

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

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

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

@ -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."

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

@ -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"
}
]
}

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

@ -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;