Revert "[yang][dhcp_server] Add dhcp_server_ipv4 yang model (#15955)" (…

…#16322) This reverts commit 44d52db.
sonic-net · Aug 29, 2023 · f39adda · f39adda
1 parent 42cf153
commit f39adda
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 1,357 deletions.
diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
@@ -29,7 +29,6 @@ Table of Contents
          * [Device Metadata](#device-metadata)
          * [Device neighbor metada](#device-neighbor-metada)
          * [DHCP_RELAY](#dhcp_relay)
-         * [DHCP Server IPV4](#dhcp_server_ipv4)
          * [DSCP_TO_TC_MAP](#dscp_to_tc_map)
          * [FG_NHG](#fg_nhg)
          * [FG_NHG_MEMBER](#fg_nhg_member)
@@ -987,50 +986,6 @@ instance is supported in SONiC.
 
 ```
 
-### DHCP_SERVER_IPV4
-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.
-```
-{
-    "DHCP_SERVER_IPV4": {
-        "Vlan100": {
-            "gateway": "100.1.1.1",
-            "lease_time": 3600,
-            "mode": "PORT",
-            "netmask": "255.255.255.0",
-            "customized_options": [
-                "option60"
-            ],
-            "state": "enabled"
-        }
-    },
-    "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
-        "option60": {
-            "id": 60,
-            "type": "text",
-            "value": "dummy_value"
-        }
-    },
-    "DHCP_SERVER_IPV4_RANGE": {
-        "range1": {
-            "ip_start": "100.1.1.3",
-            "ip_end": "100.1.1.5"
-        }
-    },
-    "DHCP_SERVER_IPV4_PORT": {
-        "Vlan100|PortChannel0003": {
-            "ips": [
-                "100.1.1.10"
-            ]
-        },
-        "Vlan100|PortChannel2": {
-            "ranges": [
-                "range1"
-            ]
-        }
-    }
-}
-```
-
 ### DSCP_TO_TC_MAP
 ```
 {

diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
@@ -178,7 +178,6 @@ def run(self):
                          './yang-models/sonic-dscp-fc-map.yang',
                          './yang-models/sonic-exp-fc-map.yang',
                          './yang-models/sonic-dscp-tc-map.yang',
-                         './yang-models/sonic-dhcp-server-ipv4.yang',
                          './yang-models/sonic-dot1p-tc-map.yang',
                          './yang-models/sonic-storm-control.yang',
                          './yang-models/sonic-tc-priority-group-map.yang',

diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1880,45 +1880,6 @@
                 "interface_id": "true"
             }
         },
-        "DHCP_SERVER_IPV4": {
-            "Vlan100": {
-                "gateway": "100.1.1.1",
-                "lease_time": "3600",
-                "mode": "PORT",
-                "netmask": "255.255.255.0",
-                "customized_options": [
-                    "option60"
-                ],
-                "state": "enabled"
-            }
-        },
-        "DHCP_SERVER_IPV4_CUSTOMIZED_OPTIONS": {
-            "option60": {
-                "id": "60",
-                "type": "text",
-                "value": "dummy_value"
-            }
-        },
-        "DHCP_SERVER_IPV4_RANGE": {
-            "range1": {
-                "range": [
-                    "100.1.1.3",
-                    "100.1.1.5"
-                ]
-            }
-        },
-        "DHCP_SERVER_IPV4_PORT": {
-            "Vlan100|Ethernet0": {
-                "ips": [
-                    "100.1.1.10"
-                ]
-            },
-            "Vlan100|Ethernet1": {
-                "ranges": [
-                    "range1"
-                ]
-            }
-        },
         "SCHEDULER": {
             "TEST@0": {
                 "cbs": "256",

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