Skip to content

[yang][dhcp_server] Make gateway in dhcp_server to be an un-mandatory config #21475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yxieca merged 2 commits into from
Jan 27, 2025
Merged

[yang][dhcp_server] Make gateway in dhcp_server to be an un-mandatory config #21475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c684cfa
[yang][dhcp_server] gateway in dhcp_server to be a un-mandatory config
yaqiangz Jan 20, 2025
f25d503
Update
yaqiangz Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/sonic-yang-models/tests/yang_model_tests/tests/dhcp_server_ipv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@
"desc": "Configure both ip and ranges in DHCP_SERVER_IPV4_RANGE_RANGES",
"eStr": ["Statement of 'ips' and 'ranges' cannot both exist"]
},
"DHCP_SERVER_IPV4_GATEWAY_ABSENT": {
"desc": "Missing gateway in DHCP_SERVER_IPV4",
"eStrKey" : "Mandatory"
},
"DHCP_SERVER_IPV4_LEASE_TIME_ABSENT": {
"desc": "Missing lease_time in DHCP_SERVER_IPV4",
"eStrKey" : "Mandatory"
Expand Down
82 changes: 0 additions & 82 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcp_server_ipv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,88 +481,6 @@
}
}
},
"DHCP_SERVER_IPV4_GATEWAY_ABSENT": {
"sonic-portchannel:sonic-portchannel": {
"sonic-portchannel:PORTCHANNEL": {
"PORTCHANNEL_LIST": [
{
"name": "PortChannel1"
}
]
}
},
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "etp1",
"description": "Ethernet0",
"mtu": 9000,
"lanes": "1",
"name": "Ethernet0",
"speed": 25000,
"mode" : "trunk"
}
]
}
},
"sonic-dhcp-server-ipv4:sonic-dhcp-server-ipv4": {
"sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4": {
"DHCP_SERVER_IPV4_LIST": [
{
"name": "Vlan1000",
"lease_time": 3600,
"mode": "PORT",
"netmask": "255.255.255.0",
"customized_options": [
"option60"
],
"state": "enabled"
}
]
},
"sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS_LIST": [
{
"name": "option60",
"id": 60,
"type": "string",
"value": "dummy_value"
}
]
},
"sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_RANGE": {
"DHCP_SERVER_IPV4_RANGE_LIST": [
{
"name": "range1",
"range": [
"192.168.0.2",
"192.168.0.3"
]
}
]
},
"sonic-dhcp-server-ipv4:DHCP_SERVER_IPV4_PORT": {
"DHCP_SERVER_IPV4_PORT_LIST": [
{
"name": "Vlan1000",
"port": "Ethernet0",
"ranges": [
"range1"
]
},
{
"name": "Vlan1000",
"port": "PortChannel1",
"ips": [
"192.168.0.4"
]
}
]
}
}
},
"DHCP_SERVER_IPV4_LEASE_TIME_ABSENT": {
"sonic-portchannel:sonic-portchannel": {
"sonic-portchannel:PORTCHANNEL": {
Expand Down
1 change: 0 additions & 1 deletion src/sonic-yang-models/yang-models/sonic-dhcp-server-ipv4.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ module sonic-dhcp-server-ipv4 {

leaf gateway {
description "Gateway IP for DHCP server";
mandatory true;
type inet:ipv4-address;
}

Expand Down