Revert "Run yang validation in unit test (#3025)" (#3055)

This reverts commit e01fc89.
sonic-net · Nov 30, 2023 · 17e77fe · 17e77fe
1 parent 96dd555
commit 17e77fe
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 96 deletions.
diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
@@ -6,16 +6,13 @@
 import sys
 import traceback
 import re
-import sonic_yang
-import syslog
 
 from sonic_py_common import device_info, logger
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig
 from minigraph import parse_xml
 
 INIT_CFG_FILE = '/etc/sonic/init_cfg.json'
 MINIGRAPH_FILE = '/etc/sonic/minigraph.xml'
-YANG_MODELS_DIR = "/usr/local/yang-models"
 
 # mock the redis for unit test purposes #
 try:
@@ -1164,31 +1161,6 @@ def migrate(self):
             version = next_version
         # Perform common migration ops
         self.common_migration_ops()
-        config = self.configDB.get_config()
-        # Fix table key in tuple
-        for table_name, table in config.items():
-            new_table = {}
-            hit = False
-            for table_key, table_val in table.items():
-                if isinstance(table_key, tuple):
-                    new_key = "|".join(table_key)
-                    new_table[new_key] = table_val
-                    hit = True
-                else:
-                    new_table[table_key] = table_val
-            if hit:
-                config[table_name] = new_table
-        # Run yang validation
-        yang_parser = sonic_yang.SonicYang(YANG_MODELS_DIR)
-        yang_parser.loadYangModel()
-        try:
-            yang_parser.loadData(configdbJson=config)
-            yang_parser.validate_data_tree()
-        except sonic_yang.SonicYangException as e:
-            syslog.syslog(syslog.LOG_CRIT, "Yang validation failed: " + str(e))
-            if os.environ["UTILITIES_UNIT_TESTING"] == "2":
-                raise
-
 
 def main():
     try:

diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_4_0_3_expected.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_4_0_3_expected.json
@@ -3,17 +3,17 @@
         "VERSION": "version_4_0_3"
     },
     "FLEX_COUNTER_TABLE|ACL": {
-        "FLEX_COUNTER_STATUS": "enable",
+        "FLEX_COUNTER_STATUS": "true",
         "FLEX_COUNTER_DELAY_STATUS": "true",
         "POLL_INTERVAL": "10000"
     },
     "FLEX_COUNTER_TABLE|QUEUE": {
-        "FLEX_COUNTER_STATUS": "enable",
+        "FLEX_COUNTER_STATUS": "true",
         "FLEX_COUNTER_DELAY_STATUS": "true",
         "POLL_INTERVAL": "10000"
     },
     "FLEX_COUNTER_TABLE|PG_WATERMARK": {
-        "FLEX_COUNTER_STATUS": "disable",
+        "FLEX_COUNTER_STATUS": "false",
         "FLEX_COUNTER_DELAY_STATUS": "true"
     }
 }
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_4_0_3_input.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_4_0_3_input.json
@@ -3,16 +3,16 @@
         "VERSION": "version_1_0_1"
     },
     "FLEX_COUNTER_TABLE|ACL": {
-        "FLEX_COUNTER_STATUS": "enable",
+        "FLEX_COUNTER_STATUS": "true",
         "FLEX_COUNTER_DELAY_STATUS": "true",
         "POLL_INTERVAL": "10000"
     },
     "FLEX_COUNTER_TABLE|QUEUE": {
-        "FLEX_COUNTER_STATUS": "enable",
+        "FLEX_COUNTER_STATUS": "true",
         "FLEX_COUNTER_DELAY_STATUS": "false",
         "POLL_INTERVAL": "10000"
     },
     "FLEX_COUNTER_TABLE|PG_WATERMARK": {
-        "FLEX_COUNTER_STATUS": "disable"
+        "FLEX_COUNTER_STATUS": "false"
     }
 }
diff --git a/tests/db_migrator_input/config_db/portchannel-expected.json b/tests/db_migrator_input/config_db/portchannel-expected.json
@@ -1,24 +1,28 @@
 {
     "PORTCHANNEL|PortChannel0": {
         "admin_status": "up",
+        "members@": "Ethernet0,Ethernet4",
         "min_links": "2",
         "mtu": "9100",
         "lacp_key": "auto"
     },
     "PORTCHANNEL|PortChannel1": {
         "admin_status": "up",
+        "members@": "Ethernet8,Ethernet12",
         "min_links": "2",
         "mtu": "9100",
         "lacp_key": "auto"
     },
     "PORTCHANNEL|PortChannel0123": {
         "admin_status": "up",
+        "members@": "Ethernet16",
         "min_links": "1",
         "mtu": "9100",
         "lacp_key": "auto"
     },
     "PORTCHANNEL|PortChannel0011": {
         "admin_status": "up",
+        "members@": "Ethernet20,Ethernet24",
         "min_links": "2",
         "mtu": "9100",
         "lacp_key": "auto"

diff --git a/tests/db_migrator_input/config_db/portchannel-input.json b/tests/db_migrator_input/config_db/portchannel-input.json
@@ -1,21 +1,25 @@
 {
     "PORTCHANNEL|PortChannel0": {
         "admin_status": "up",
+        "members@": "Ethernet0,Ethernet4",
         "min_links": "2",
         "mtu": "9100"
     },
     "PORTCHANNEL|PortChannel1": {
         "admin_status": "up",
+        "members@": "Ethernet8,Ethernet12",
         "min_links": "2",
         "mtu": "9100"
     },
     "PORTCHANNEL|PortChannel0123": {
         "admin_status": "up",
+        "members@": "Ethernet16",
         "min_links": "1",
         "mtu": "9100"
     },
     "PORTCHANNEL|PortChannel0011": {
         "admin_status": "up",
+        "members@": "Ethernet20,Ethernet24",
         "min_links": "2",
         "mtu": "9100"
     },

diff --git a/tests/db_migrator_input/config_db/qos_map_table_expected.json b/tests/db_migrator_input/config_db/qos_map_table_expected.json
@@ -29,14 +29,6 @@
         "pfc_to_queue_map": "AZURE",
         "tc_to_pg_map": "AZURE",
         "tc_to_queue_map": "AZURE"
-    },
-    "TC_TO_QUEUE_MAP|AZURE": {"0": "0"},
-    "TC_TO_PRIORITY_GROUP_MAP|AZURE": {"0": "0"},
-    "MAP_PFC_PRIORITY_TO_QUEUE|AZURE": {"0": "0"},
-    "DSCP_TO_TC_MAP|AZURE": {"0": "0"},
-    "PORT|Ethernet0": {"lanes": "0", "speed": "1000"},
-    "PORT|Ethernet92": {"lanes": "92", "speed": "1000"},
-    "PORT|Ethernet96": {"lanes": "96", "speed": "1000"},
-    "PORT|Ethernet100": {"lanes": "100", "speed": "1000"}
+    }
 }
 
diff --git a/tests/db_migrator_input/config_db/qos_map_table_input.json b/tests/db_migrator_input/config_db/qos_map_table_input.json
@@ -27,13 +27,5 @@
         "pfc_to_queue_map": "AZURE",
         "tc_to_pg_map": "AZURE",
         "tc_to_queue_map": "AZURE"
-    },
-    "TC_TO_QUEUE_MAP|AZURE": {"0": "0"},
-    "TC_TO_PRIORITY_GROUP_MAP|AZURE": {"0": "0"},
-    "MAP_PFC_PRIORITY_TO_QUEUE|AZURE": {"0": "0"},
-    "DSCP_TO_TC_MAP|AZURE": {"0": "0"},
-    "PORT|Ethernet0": {"lanes": "0", "speed": "1000"},
-    "PORT|Ethernet92": {"lanes": "92", "speed": "1000"},
-    "PORT|Ethernet96": {"lanes": "96", "speed": "1000"},
-    "PORT|Ethernet100": {"lanes": "100", "speed": "1000"}
+    }
 }
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
@@ -12,7 +12,7 @@
         "profile": "NULL"
     },
     "BUFFER_PG|Ethernet8|3-4": {
-        "profile": "customized_ingress_lossless_profile"
+        "profile": "customized_lossless_profile"
     },
     "BUFFER_PG|Ethernet12|0": {
         "profile": "ingress_lossy_profile"
@@ -103,11 +103,6 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST|Ethernet24": {
         "profile_list": "ingress_lossless_profile,ingress_lossy_profile"
     },
-    "BUFFER_PROFILE|customized_egress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "egress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|egress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "egress_lossless_pool",
@@ -118,11 +113,6 @@
         "pool": "egress_lossy_pool",
         "size": "9216"
     },
-    "BUFFER_PROFILE|customized_ingress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "ingress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|ingress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "ingress_lossless_pool",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
@@ -3,7 +3,7 @@
         "profile": "NULL"
     },
     "BUFFER_PG|Ethernet8|3-4": {
-        "profile": "customized_ingress_lossless_profile"
+        "profile": "customized_lossless_profile"
     },
     "BUFFER_PG|Ethernet12|0": {
         "profile": "ingress_lossy_profile"
@@ -55,11 +55,6 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST|Ethernet24": {
         "profile_list": "ingress_lossless_profile,ingress_lossy_profile"
     },
-    "BUFFER_PROFILE|customized_egress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "egress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|egress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "egress_lossless_pool",
@@ -70,11 +65,6 @@
         "pool": "egress_lossy_pool",
         "size": "9216"
     },
-    "BUFFER_PROFILE|customized_ingress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "ingress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|ingress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "ingress_lossless_pool",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
@@ -12,7 +12,7 @@
         "profile": "NULL"
     },
     "BUFFER_PG|Ethernet8|3-4": {
-        "profile": "customized_ingress_lossless_profile"
+        "profile": "customized_lossless_profile"
     },
     "BUFFER_PG|Ethernet12|0": {
         "profile": "ingress_lossy_profile"
@@ -99,11 +99,6 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST|Ethernet24": {
         "profile_list": "ingress_lossless_profile"
     },
-    "BUFFER_PROFILE|customized_egress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "egress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|egress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "egress_lossless_pool",
@@ -114,11 +109,6 @@
         "pool": "egress_lossy_pool",
         "size": "9216"
     },
-    "BUFFER_PROFILE|customized_ingress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "ingress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|ingress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "ingress_lossless_pool",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
@@ -3,7 +3,7 @@
         "profile": "NULL"
     },
     "BUFFER_PG|Ethernet8|3-4": {
-        "profile": "customized_ingress_lossless_profile"
+        "profile": "customized_lossless_profile"
     },
     "BUFFER_PG|Ethernet12|0": {
         "profile": "ingress_lossy_profile"
@@ -51,11 +51,6 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST|Ethernet24": {
         "profile_list": "ingress_lossless_profile"
     },
-    "BUFFER_PROFILE|customized_egress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "egress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|egress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "egress_lossless_pool",
@@ -66,11 +61,6 @@
         "pool": "egress_lossy_pool",
         "size": "9216"
     },
-    "BUFFER_PROFILE|customized_ingress_lossless_profile": {
-        "dynamic_th": "7",
-        "pool": "ingress_lossless_pool",
-        "size": "0"
-    },
     "BUFFER_PROFILE|ingress_lossless_profile": {
         "dynamic_th": "7",
         "pool": "ingress_lossless_pool",