Fix test for pfcwd_sw_enable in db_migrator_test (#2253)

sonic-net · Jul 21, 2022 · 27667cf · 27667cf
1 parent e1866e3
commit 27667cf
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 57 deletions.
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
@@ -2,35 +2,33 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_5"
     },
-    "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": "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]"
-        },
-        "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": "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|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]"
     }
 }
 
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
@@ -2,33 +2,30 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_4"
     },
-    "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": "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": "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]"
     }
 }
-