[202012] [cherry-pick] Update db_migrator to support PORT_QOS_MAP|global

scripts/db_migrator.py

@@ -422,6 +422,23 @@ def migrate_pfcwd_sw_enable_table(self):
                 v['pfcwd_sw_enable'] = v['pfc_enable']
                 self.configDB.set_entry('PORT_QOS_MAP', k, v)
 
+    def migrate_port_qos_map_global(self):
+        """
+        Generate dscp_to_tc_map for switch.
+        """
+        asics_require_global_dscp_to_tc_map = ["broadcom"]
+        if self.asic_type not in asics_require_global_dscp_to_tc_map:
+            return True
+        dscp_to_tc_map_table_names = self.configDB.get_keys('DSCP_TO_TC_MAP')
+        if len(dscp_to_tc_map_table_names) == 0:
+            return True
+
+        qos_maps = self.configDB.get_table('PORT_QOS_MAP')
+        if 'global' not in qos_maps.keys():
+            # We are unlikely to have more than 1 DSCP_TO_TC_MAP in previous versions
+            self.configDB.set_entry('PORT_QOS_MAP', 'global', {"dscp_to_tc_map": "[DSCP_TO_TC_MAP|{}]".format(dscp_to_tc_map_table_names[0])})
+            log.log_info("Created entry for global DSCP_TO_TC_MAP {}".format(dscp_to_tc_map_table_names[0]))
+
     def version_unknown(self):
         """
         version_unknown tracks all SONiC versions that doesn't have a version
@@ -614,6 +631,8 @@ def common_migration_ops(self):
 
         # Migrate pfcwd_sw_enable table  
         self.migrate_pfcwd_sw_enable_table()
+        # Migrate entry for switch level DSCP_TO_TC_MAP
+        self.migrate_port_qos_map_global()
 
     def migrate(self):
         version = self.get_version()

tests/db_migrator_input/config_db/qos_map_table_global_expected.json

@@ -0,0 +1,12 @@
+{
+    "VERSIONS|DATABASE": {
+        "VERSION": "version_2_0_0"
+    },
+    "DSCP_TO_TC_MAP|AZURE": {
+        "0": "0",
+        "1": "1"
+    },
+    "PORT_QOS_MAP|global": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]"
+    }
+}

tests/db_migrator_input/config_db/qos_map_table_global_input.json

@@ -0,0 +1,10 @@
+{
+    "VERSIONS|DATABASE": {
+        "VERSION": "version_2_0_0"
+    },
+    "DSCP_TO_TC_MAP|AZURE": {
+        "0": "0",
+        "1": "1"
+    }
+}
+

tests/db_migrator_test.py

@@ -274,3 +274,29 @@ def test_pfc_enable_migrator(self):
         diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
         assert not diff
 
+class TestGlobalDscpToTcMapMigrator(object):
+    @classmethod
+    def setup_class(cls):
+        os.environ['UTILITIES_UNIT_TESTING'] = "2"
+
+    @classmethod
+    def teardown_class(cls):
+        os.environ['UTILITIES_UNIT_TESTING'] = "0"
+        dbconnector.dedicated_dbs['CONFIG_DB'] = None
+
+    def test_global_dscp_to_tc_map_migrator(self):
+        dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'qos_map_table_global_input')
+        import db_migrator
+        dbmgtr = db_migrator.DBMigrator(None)
+        dbmgtr.asic_type = "broadcom"
+        dbmgtr.hwsku = "vs"
+        dbmgtr.migrate()
+        dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'qos_map_table_global_expected')
+        expected_db = Db()
+
+        resulting_table = dbmgtr.configDB.get_table('PORT_QOS_MAP')
+        expected_table = expected_db.cfgdb.get_table('PORT_QOS_MAP')
+
+        diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
+        assert not diff
+