Skip to content

Commit 0ee1e60

Browse files
authored
Skip some test_generic_hash for broadcom platforms (#16530)
What is the motivation for this PR? Now test_conditional_mark uses the longest match mechanism to search the matched scripts/cases. In mark file, hash/test_generic_hash.py::test_lag_member_flap[CRC-INNER_IP_PROTOCOL is longer than hash/test_generic_hash.py::test_lag_member_flap, so even on Broadcom testbed, it will still run test_ecmp_and_lag_hash[CRC_CCITT-INNER_IP_PROTOCOL-ipv4-ipv6-vxlan], which should be skipped actually. How did you do it? Add Broadcom asic type for those longer cases, to make sure those test_generic_hash cases should be skipped on broadcom platforms. How did you verify/test it? Run test_generic_hash on broadcom testbed. plugins: metadata-3.1.1, allure-pytest-2.8.22, forked-1.6.0, repeat-0.9.3, html-4.1.1, ansible-4.0.0, xdist-1.28.0 collected 10 items hash/test_generic_hash.py::test_hash_capability XFAIL (This is a new test cases and doesn't work for platform other than Mellanox, xfail them before the issue is addressed) [ 10%] hash/test_generic_hash.py::test_ecmp_hash[CRC_CCITT-INNER_DST_IP-ipv4-ipv6-ipinip] SKIPPED (ECMP hash not supported in broadcom SAI) [ 20%] hash/test_generic_hash.py::test_lag_hash[CRC-SRC_IP-ipv6-None-None] SKIPPED (LAG hash not supported in broadcom SAI) [ 30%] hash/test_generic_hash.py::test_ecmp_and_lag_hash[CRC-INNER_SRC_IP-ipv6-ipv6-ipinip] SKIPPED (On Mellanox SPC1 platforms, due to HW limitation, it would not support CRC_CCITT algorithm. For broadcom, ECMP/LAG ...) [ 40%] hash/test_generic_hash.py::test_nexthop_flap[CRC-SRC_IP-ipv6-None-None] SKIPPED (On Mellanox SPC1 platforms, due to HW limitation, it would not support CRC_CCITT algorithm. For broadcom, ECMP/LAG hash not supp...) [ 50%] hash/test_generic_hash.py::test_lag_member_flap[CRC_CCITT-INNER_ETHERTYPE-ipv4-None-nvgre] SKIPPED (On Mellanox SPC1 platforms, due to HW limitation, it would not support CRC_CCITT algorithm. For broadcom, LAG...) [ 60%] hash/test_generic_hash.py::test_lag_member_remove_add[CRC-ETHERTYPE-ipv6-None-None] SKIPPED (On Mellanox SPC1 platforms, due to HW limitation, it would not support CRC_CCITT algorithm. For broadcom, LAG hash n...) [ 70%] hash/test_generic_hash.py::test_reboot[CRC_CCITT-INNER_SRC_MAC-ipv6-ipv6-vxlan-warm] SKIPPED (On Mellanox SPC1 platforms, due to HW limitation, it would not support CRC_CCITT algorithm. For broadcom, ECMP/LAG ...) [ 80%] hash/test_generic_hash.py::test_backend_error_messages XFAIL (This is a new test cases and doesn't work for platform other than Mellanox, xfail them before the issue is addressed) [ 90%] hash/test_generic_hash.py::test_algorithm_config XFAIL (This is a new test cases and doesn't work for platform other than Mellanox, xfail them before the issue is addressed) [100%] ===================================================================================================== warnings summary ====================================================================================================== . Any platform specific information?
1 parent 56aa539 commit 0ee1e60

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,21 +1071,21 @@ hash/test_generic_hash.py::test_ecmp_and_lag_hash:
10711071

10721072
hash/test_generic_hash.py::test_ecmp_and_lag_hash[CRC-INNER_IP_PROTOCOL:
10731073
skip:
1074-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP hash is not supported in broadcom SAI."
1074+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
10751075
conditions:
10761076
- "asic_type in ['broadcom', 'mellanox']"
10771077

10781078
hash/test_generic_hash.py::test_ecmp_and_lag_hash[CRC_CCITT-INNER_IP_PROTOCOL:
10791079
skip:
1080-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1080+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
10811081
conditions:
1082-
- "asic_type in ['mellanox']"
1082+
- "asic_type in ['broadcom', 'mellanox']"
10831083

10841084
hash/test_generic_hash.py::test_ecmp_and_lag_hash[CRC_CCITT-IN_PORT:
10851085
skip:
1086-
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field"
1086+
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
10871087
conditions:
1088-
- "asic_type in ['mellanox']"
1088+
- "asic_type in ['broadcom', 'mellanox']"
10891089

10901090
hash/test_generic_hash.py::test_ecmp_hash:
10911091
skip:
@@ -1129,22 +1129,22 @@ hash/test_generic_hash.py::test_lag_member_flap:
11291129

11301130
hash/test_generic_hash.py::test_lag_member_flap[CRC-INNER_IP_PROTOCOL:
11311131
skip:
1132-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1132+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, LAG hash not supported in broadcom SAI."
11331133
conditions:
1134-
- "asic_type in ['mellanox']"
1134+
- "asic_type in ['broadcom', 'mellanox']"
11351135

11361136
hash/test_generic_hash.py::test_lag_member_flap[CRC_CCITT-INNER_IP_PROTOCOL:
11371137
skip:
1138-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1138+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, LAG hash not supported in broadcom SAI."
11391139
conditions:
1140-
- "asic_type in ['mellanox']"
1140+
- "asic_type in ['broadcom', 'mellanox']"
11411141

11421142
hash/test_generic_hash.py::test_lag_member_flap[CRC_CCITT-IN_PORT:
11431143
skip:
11441144
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support
1145-
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field"
1145+
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field. For broadcom, LAG hash not supported in broadcom SAI."
11461146
conditions:
1147-
- "asic_type in ['mellanox']"
1147+
- "asic_type in ['broadcom', 'mellanox']"
11481148

11491149
hash/test_generic_hash.py::test_lag_member_remove_add:
11501150
skip:
@@ -1157,22 +1157,22 @@ hash/test_generic_hash.py::test_lag_member_remove_add:
11571157

11581158
hash/test_generic_hash.py::test_lag_member_remove_add[CRC-INNER_IP_PROTOCOL:
11591159
skip:
1160-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1160+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, LAG hash not supported in broadcom SAI."
11611161
conditions:
1162-
- "asic_type in ['mellanox']"
1162+
- "asic_type in ['broadcom', 'mellanox']"
11631163

11641164
hash/test_generic_hash.py::test_lag_member_remove_add[CRC_CCITT-INNER_IP_PROTOCOL:
11651165
skip:
1166-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1166+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, LAG hash not supported in broadcom SAI."
11671167
conditions:
1168-
- "asic_type in ['mellanox']"
1168+
- "asic_type in ['broadcom', 'mellanox']"
11691169

11701170
hash/test_generic_hash.py::test_lag_member_remove_add[CRC_CCITT-IN_PORT:
11711171
skip:
11721172
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support
1173-
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field"
1173+
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field. For broadcom, LAG hash not supported in broadcom SAI."
11741174
conditions:
1175-
- "asic_type in ['mellanox']"
1175+
- "asic_type in ['broadcom', 'mellanox']"
11761176

11771177
hash/test_generic_hash.py::test_nexthop_flap:
11781178
skip:
@@ -1185,22 +1185,22 @@ hash/test_generic_hash.py::test_nexthop_flap:
11851185

11861186
hash/test_generic_hash.py::test_nexthop_flap[CRC-INNER_IP_PROTOCOL:
11871187
skip:
1188-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1188+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI. "
11891189
conditions:
1190-
- "asic_type in ['mellanox']"
1190+
- "asic_type in ['broadcom', 'mellanox']"
11911191

11921192
hash/test_generic_hash.py::test_nexthop_flap[CRC_CCITT-INNER_IP_PROTOCOL:
11931193
skip:
1194-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1194+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI. "
11951195
conditions:
1196-
- "asic_type in ['mellanox']"
1196+
- "asic_type in ['broadcom', 'mellanox']"
11971197

11981198
hash/test_generic_hash.py::test_nexthop_flap[CRC_CCITT-IN_PORT:
11991199
skip:
12001200
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support
1201-
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field"
1201+
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field. For broadcom, ECMP/LAG hash not supported in broadcom SAI. "
12021202
conditions:
1203-
- "asic_type in ['mellanox']"
1203+
- "asic_type in ['broadcom', 'mellanox']"
12041204

12051205
hash/test_generic_hash.py::test_reboot:
12061206
skip:
@@ -1212,22 +1212,22 @@ hash/test_generic_hash.py::test_reboot:
12121212

12131213
hash/test_generic_hash.py::test_reboot[CRC-INNER_IP_PROTOCOL:
12141214
skip:
1215-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1215+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
12161216
conditions:
1217-
- "asic_type in ['mellanox']"
1217+
- "asic_type in ['broadcom', 'mellanox']"
12181218

12191219
hash/test_generic_hash.py::test_reboot[CRC_CCITT-INNER_IP_PROTOCOL:
12201220
skip:
1221-
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field"
1221+
reason: "On Mellanox platforms, due to HW limitation, it would not support CRC algorithm on INNER_IP_PROTOCOL field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
12221222
conditions:
1223-
- "asic_type in ['mellanox']"
1223+
- "asic_type in ['broadcom', 'mellanox']"
12241224

12251225
hash/test_generic_hash.py::test_reboot[CRC_CCITT-IN_PORT:
12261226
skip:
12271227
reason: "On Mellanox platforms, due to HW limitation, when ecmp and lag hash at the same time, it would not support
1228-
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field"
1228+
setting ecmp hash as CRC_CCITT and lag hash as CRC on ingress port hash field. For broadcom, ECMP/LAG hash not supported in broadcom SAI"
12291229
conditions:
1230-
- "asic_type in ['mellanox']"
1230+
- "asic_type in ['broadcom', 'mellanox']"
12311231

12321232
#######################################
12331233
##### http #####

0 commit comments

Comments
 (0)