Skip to content

Commit 646df9a

Browse files
wen587sonic-otn
authored andcommitted
Revert "[yang][dhcp_server] Add dhcp_server_ipv4 yang model (sonic-net#15955)" (sonic-net#16322)
This reverts commit 44d52db.
1 parent b9629ee commit 646df9a

File tree

6 files changed

+0
-1357
lines changed

6 files changed

+0
-1357
lines changed

src/sonic-yang-models/doc/Configuration.md

-45
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Table of Contents
2929
* [Device Metadata](#device-metadata)
3030
* [Device neighbor metada](#device-neighbor-metada)
3131
* [DHCP_RELAY](#dhcp_relay)
32-
* [DHCP Server IPV4](#dhcp_server_ipv4)
3332
* [DSCP_TO_TC_MAP](#dscp_to_tc_map)
3433
* [FG_NHG](#fg_nhg)
3534
* [FG_NHG_MEMBER](#fg_nhg_member)
@@ -987,50 +986,6 @@ instance is supported in SONiC.
987986
988987
```
989988

990-
### DHCP_SERVER_IPV4
991-
IPV4 DHPC Server related configuration are defined in **DHCP_SERVER_IPV4**, **DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS**, **DHCP_SERVER_IPV4_RANGE**, **DHCP_SERVER_IPV4_PORT** tables.
992-
```
993-
{
994-
"DHCP_SERVER_IPV4": {
995-
"Vlan100": {
996-
"gateway": "100.1.1.1",
997-
"lease_time": 3600,
998-
"mode": "PORT",
999-
"netmask": "255.255.255.0",
1000-
"customized_options": [
1001-
"option60"
1002-
],
1003-
"state": "enabled"
1004-
}
1005-
},
1006-
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
1007-
"option60": {
1008-
"id": 60,
1009-
"type": "text",
1010-
"value": "dummy_value"
1011-
}
1012-
},
1013-
"DHCP_SERVER_IPV4_RANGE": {
1014-
"range1": {
1015-
"ip_start": "100.1.1.3",
1016-
"ip_end": "100.1.1.5"
1017-
}
1018-
},
1019-
"DHCP_SERVER_IPV4_PORT": {
1020-
"Vlan100|PortChannel0003": {
1021-
"ips": [
1022-
"100.1.1.10"
1023-
]
1024-
},
1025-
"Vlan100|PortChannel2": {
1026-
"ranges": [
1027-
"range1"
1028-
]
1029-
}
1030-
}
1031-
}
1032-
```
1033-
1034989
### DSCP_TO_TC_MAP
1035990
```
1036991
{

src/sonic-yang-models/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ def run(self):
178178
'./yang-models/sonic-dscp-fc-map.yang',
179179
'./yang-models/sonic-exp-fc-map.yang',
180180
'./yang-models/sonic-dscp-tc-map.yang',
181-
'./yang-models/sonic-dhcp-server-ipv4.yang',
182181
'./yang-models/sonic-dot1p-tc-map.yang',
183182
'./yang-models/sonic-storm-control.yang',
184183
'./yang-models/sonic-tc-priority-group-map.yang',

src/sonic-yang-models/tests/files/sample_config_db.json

-39
Original file line numberDiff line numberDiff line change
@@ -1880,45 +1880,6 @@
18801880
"interface_id": "true"
18811881
}
18821882
},
1883-
"DHCP_SERVER_IPV4": {
1884-
"Vlan100": {
1885-
"gateway": "100.1.1.1",
1886-
"lease_time": "3600",
1887-
"mode": "PORT",
1888-
"netmask": "255.255.255.0",
1889-
"customized_options": [
1890-
"option60"
1891-
],
1892-
"state": "enabled"
1893-
}
1894-
},
1895-
"DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
1896-
"option60": {
1897-
"id": "60",
1898-
"type": "text",
1899-
"value": "dummy_value"
1900-
}
1901-
},
1902-
"DHCP_SERVER_IPV4_RANGE": {
1903-
"range1": {
1904-
"range": [
1905-
"100.1.1.3",
1906-
"100.1.1.5"
1907-
]
1908-
}
1909-
},
1910-
"DHCP_SERVER_IPV4_PORT": {
1911-
"Vlan100|Ethernet0": {
1912-
"ips": [
1913-
"100.1.1.10"
1914-
]
1915-
},
1916-
"Vlan100|Ethernet1": {
1917-
"ranges": [
1918-
"range1"
1919-
]
1920-
}
1921-
},
19221883
"SCHEDULER": {
19231884
"TEST@0": {
19241885
"cbs": "256",

src/sonic-yang-models/tests/yang_model_tests/tests/dhcp_server_ipv4.json

-96
This file was deleted.

0 commit comments

Comments
 (0)