Revert "[nvgre] Added YANG model and tests (sonic-net#9136)"

This reverts commit 5ce75ac.
qiluo-msft · Feb 20, 2022 · 6855105 · 6855105
1 parent f65a071
commit 6855105
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 285 deletions.
diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
@@ -108,7 +108,6 @@ def run(self):
                          './yang-models/sonic-mirror-session.yang',
                          './yang-models/sonic-ntp.yang',
                          './yang-models/sonic-nat.yang',
-                         './yang-models/sonic-nvgre-tunnel.yang',
                          './yang-models/sonic-pbh.yang',
                          './yang-models/sonic-port.yang',
                          './yang-models/sonic-policer.yang',
@@ -166,7 +165,6 @@ def run(self):
                          './cvlyang-models/sonic-mgmt_vrf.yang',
                          './cvlyang-models/sonic-ntp.yang',
                          './cvlyang-models/sonic-nat.yang',
-                         './cvlyang-models/sonic-nvgre-tunnel.yang',
                          './cvlyang-models/sonic-pbh.yang',
                          './cvlyang-models/sonic-policer.yang',
                          './cvlyang-models/sonic-port.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
@@ -1540,7 +1540,7 @@
             }
         },
 
-
+        
         "MCLAG_DOMAIN": {
             "123": {
                 "source_ip": "12.1.1.1",
@@ -1584,8 +1584,6 @@
 
             }
         },
-
-
         "POLICER": {
             "everflow_static_policer": {
                 "meter_type": "bytes",
@@ -1594,23 +1592,8 @@
                 "cbs": "12500000",
                 "color": "aware",
                 "red_packet_action": "drop"
-            }
-        },
-
-
-        "NVGRE_TUNNEL": {
-            "tunnel_1": {
-                "src_ip": "10.0.0.1"
-            }
-        },
-        "NVGRE_TUNNEL_MAP": {
-            "tunnel_1|Vlan111": {
-                "vlan_id": "111",
-                "vsid": "5000"
-            }
+           }
         }
-
-
     },
     "SAMPLE_CONFIG_DB_UNKNOWN": {
         "UNKNOWN_TABLE": {

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/nvgre.json b/src/sonic-yang-models/tests/yang_model_tests/tests/nvgre.json
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/nvgre.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/nvgre.json
diff --git a/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang b/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang