Fix test for pfcwd_sw_enable in db_migrator_test (#2252)

Author: bingwang-ms

tests/db_migrator_input/config_db/qos_map_table_expected.json

@@ -2,35 +2,34 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_2_0_0"
     },
-    "PORT_QOS_MAP": {
-        "Ethernet0": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_enable": "3,4",
-            "pfcwd_sw_enable": "3,4",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet100": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_enable": "2,3,4,6",
-            "pfcwd_sw_enable": "3,4",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet92": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet96": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        }
+    "PORT_QOS_MAP|Ethernet0": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_enable": "3,4",
+        "pfcwd_sw_enable": "3,4",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet100": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_enable": "2,3,4,6",
+        "pfcwd_sw_enable": "3,4",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet92": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet96": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
     }
 }
 
+

tests/db_migrator_input/config_db/qos_map_table_input.json

@@ -2,34 +2,32 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_2_0_0"
     },
-    "PORT_QOS_MAP": {
-        "Ethernet0": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_enable": "3,4",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet100": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_enable": "2,3,4,6",
-            "pfcwd_sw_enable": "3,4",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet92": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        },
-        "Ethernet96": {
-            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
-        }
+    "PORT_QOS_MAP|Ethernet0": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_enable": "3,4",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet100": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_enable": "2,3,4,6",
+        "pfcwd_sw_enable": "3,4",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet92": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
+    },
+    "PORT_QOS_MAP|Ethernet96": {
+        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
     }
 }