Skip to content

Commit ad40697

Browse files
bingwang-msyxieca
bingwang-ms
authored and
yxieca
committed
Fix test for pfcwd_sw_enable in db_migrator_test (#2253)
1 parent 886f612 commit ad40697

File tree

2 files changed

+52
-57
lines changed

2 files changed

+52
-57
lines changed

‎tests/db_migrator_input/config_db/qos_map_table_expected.json

+27-29
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,33 @@
22
"VERSIONS|DATABASE": {
33
"VERSION": "version_2_0_5"
44
},
5-
"PORT_QOS_MAP": {
6-
"Ethernet0": {
7-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
8-
"pfc_enable": "3,4",
9-
"pfcwd_sw_enable": "3,4",
10-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
11-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
12-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
13-
},
14-
"Ethernet100": {
15-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
16-
"pfc_enable": "3,4",
17-
"pfcwd_sw_enable": "3,4",
18-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
19-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
20-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
21-
},
22-
"Ethernet92": {
23-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
24-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
25-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
26-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
27-
},
28-
"Ethernet96": {
29-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
30-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
31-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
32-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
33-
}
5+
"PORT_QOS_MAP|Ethernet0": {
6+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
7+
"pfc_enable": "3,4",
8+
"pfcwd_sw_enable": "3,4",
9+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
10+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
11+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
12+
},
13+
"PORT_QOS_MAP|Ethernet100": {
14+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
15+
"pfc_enable": "3,4",
16+
"pfcwd_sw_enable": "3,4",
17+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
18+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
19+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
20+
},
21+
"PORT_QOS_MAP|Ethernet92": {
22+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
23+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
24+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
25+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
26+
},
27+
"PORT_QOS_MAP|Ethernet96": {
28+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
29+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
30+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
31+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
3432
}
3533
}
3634

‎tests/db_migrator_input/config_db/qos_map_table_input.json

+25-28
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,30 @@
22
"VERSIONS|DATABASE": {
33
"VERSION": "version_2_0_4"
44
},
5-
"PORT_QOS_MAP": {
6-
"Ethernet0": {
7-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
8-
"pfc_enable": "3,4",
9-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
10-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
11-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
12-
},
13-
"Ethernet100": {
14-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
15-
"pfc_enable": "3,4",
16-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
17-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
18-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
19-
},
20-
"Ethernet92": {
21-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
22-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
23-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
24-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
25-
},
26-
"Ethernet96": {
27-
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
28-
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
29-
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
30-
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
31-
}
5+
"PORT_QOS_MAP|Ethernet0": {
6+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
7+
"pfc_enable": "3,4",
8+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
9+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
10+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
11+
},
12+
"PORT_QOS_MAP|Ethernet100": {
13+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
14+
"pfc_enable": "3,4",
15+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
16+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
17+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
18+
},
19+
"PORT_QOS_MAP|Ethernet92": {
20+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
21+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
22+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
23+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
24+
},
25+
"PORT_QOS_MAP|Ethernet96": {
26+
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
27+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
28+
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
29+
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
3230
}
3331
}
34-

0 commit comments

Comments
 (0)