Skip to content

Commit a186396

Browse files
yanmo96ytzur1
authored andcommitted
Skip ipv4 tests for IPv6-only topologies (sonic-net#20772)
To skip ipv4 test on ipv6 only topo testbed Signed-off-by: Yael Tzur <[email protected]>
1 parent af6be79 commit a186396

1 file changed

Lines changed: 58 additions & 15 deletions

File tree

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -226,17 +226,23 @@ bgp/test_bgp_bbr.py:
226226
conditions:
227227
- "https://github.com/sonic-net/sonic-mgmt/issues/20217 and '-v6-' in topo_name"
228228

229-
bgp/test_bgp_dual_asn.py::test_bgp_dual_asn_v4:
229+
bgp/test_bgp_bbr.py::test_bbr_status_consistent_after_reload[enabled]:
230+
xfail:
231+
reason: "Testcase ignored due to issue https://github.com/sonic-net/sonic-buildimage/issues/23642"
232+
conditions:
233+
- "https://github.com/sonic-net/sonic-buildimage/issues/23642 and hwsku in ['Mellanox-SN5640-C512S2', 'Mellanox-SN5640-C448O16', 'Mellanox-SN5600-C256S1','Mellanox-SN5600-C224O8']"
234+
235+
bgp/test_bgp_bbr_default_state.py::test_bbr_disabled_constants_yml_default:
230236
skip:
231237
reason: "Skip for IPv6-only topologies"
232238
conditions:
233239
- "'-v6-' in topo_name"
234240

235-
bgp/test_bgp_bbr.py::test_bbr_status_consistent_after_reload[enabled]:
236-
xfail:
237-
reason: "Testcase ignored due to issue https://github.com/sonic-net/sonic-buildimage/issues/23642"
241+
bgp/test_bgp_dual_asn.py::test_bgp_dual_asn_v4:
242+
skip:
243+
reason: "Skip for IPv6-only topologies"
238244
conditions:
239-
- "https://github.com/sonic-net/sonic-buildimage/issues/23642 and hwsku in ['Mellanox-SN5640-C512S2', 'Mellanox-SN5640-C448O16', 'Mellanox-SN5600-C256S1','Mellanox-SN5600-C224O8']"
245+
- "'-v6-' in topo_name"
240246

241247
bgp/test_bgp_gr_helper.py:
242248
skip:
@@ -318,7 +324,13 @@ bgp/test_bgp_router_id.py::test_bgp_router_id_set_without_loopback:
318324
conditions:
319325
- "https://github.com/sonic-net/sonic-mgmt/issues/19916 and '-v6-' in topo_name"
320326

321-
bgp/test_bgp_sentinel.py:
327+
bgp/test_bgp_sentinel.py::test_bgp_sentinel[IPv4:
328+
skip:
329+
reason: "Skip for IPv6-only topologies"
330+
conditions:
331+
- "'-v6-' in topo_name"
332+
333+
bgp/test_bgp_sentinel.py::test_bgp_sentinel[IPv6:
322334
xfail:
323335
reason: "xfail for IPv6-only topologies, with issue it try to parse with IPv4 style"
324336
conditions:
@@ -352,11 +364,11 @@ bgp/test_bgp_speaker.py:
352364
conditions:
353365
- "'backend' in topo_name"
354366

355-
bgp/test_bgp_speaker.py::test_bgp_speaker_announce_routes:
356-
xfail:
357-
reason: "xfail for IPv6-only topologies, is with it look for vlan_ipv4_entry"
367+
bgp/test_bgp_speaker.py::test_bgp_speaker_announce_routes[:
368+
skip:
369+
reason: "Skip for IPv6-only topologies"
358370
conditions:
359-
- "https://github.com/sonic-net/sonic-mgmt/issues/19917 and '-v6-' in topo_name"
371+
- "'-v6-' in topo_name"
360372

361373
bgp/test_bgp_speaker.py::test_bgp_speaker_announce_routes_v6:
362374
xfail:
@@ -392,9 +404,11 @@ bgp/test_bgp_update_timer.py::test_bgp_update_timer_single_route:
392404

393405
bgp/test_bgpmon.py:
394406
skip:
395-
reason: "Not supported on T2 topology or topology backend"
407+
reason: "Not supported on T2 topology or topology backend
408+
or Skip for IPv6-only topologies, since there are v6 verison of the test"
396409
conditions:
397410
- "'backend' in topo_name or 't2' in topo_name"
411+
- "'-v6-' in topo_name"
398412

399413
bgp/test_bgpmon_v6.py::test_bgpmon_no_ipv6_resolve_via_default:
400414
skip:
@@ -1636,11 +1650,13 @@ everflow/test_everflow_testbed.py::EverflowIPv4Tests::test_everflow_dscp_with_po
16361650
everflow/test_everflow_testbed.py::TestEverflowV4EgressAclEgressMirror:
16371651
skip:
16381652
reason: "For Mellanox t0-120 setup - Need to skip the test due to HW resource limitation.
1639-
For Cisco-8000 - EverflowV4 EgressAcl EgressMirror - is not yet fully supported on cisco chassis. Skipping it till it is fully validated."
1653+
For Cisco-8000 - EverflowV4 EgressAcl EgressMirror - is not yet fully supported on cisco chassis. Skipping it till it is fully validated.
1654+
Or Skip for IPv6-only topologies"
16401655
conditions_logical_operator: "OR"
16411656
conditions:
16421657
- "asic_type in ['cisco-8000']"
16431658
- "'t0-120' in topo_name and asic_type in ['mellanox']"
1659+
- "'-v6-' in topo_name"
16441660

16451661
everflow/test_everflow_testbed.py::TestEverflowV4EgressAclEgressMirror::test_everflow_basic_forwarding[erspan_ipv4-cli-downstream-default]:
16461662
skip:
@@ -1976,7 +1992,7 @@ fib/test_fib.py::test_basic_fib[True-True-1514]:
19761992
conditions:
19771993
- "'-v6-' in topo_name"
19781994

1979-
fib/test_fib.py::test_hash[ipv4]:
1995+
fib/test_fib.py::test_hash[ipv4:
19801996
skip:
19811997
reason: "Skip for IPv6-only topologies"
19821998
conditions:
@@ -1990,6 +2006,18 @@ fib/test_fib.py::test_ipinip_hash:
19902006
- "asic_type in ['mellanox']"
19912007
- "topo_name in ['t1-isolated-d128', 't1-isolated-d32']"
19922008

2009+
fib/test_fib.py::test_ipinip_hash[ipv4:
2010+
skip:
2011+
reason: "Skip for IPv6-only topologies"
2012+
conditions:
2013+
- "'-v6-' in topo_name"
2014+
2015+
fib/test_fib.py::test_ipinip_hash_negative[ipv4:
2016+
skip:
2017+
reason: "Skip for IPv6-only topologies"
2018+
conditions:
2019+
- "'-v6-' in topo_name"
2020+
19932021
fib/test_fib.py::test_nvgre_hash:
19942022
skip:
19952023
reason: 'Nvgre hash test is not fully supported on VS and Broadcom platform; Not supported on M*. Skip on t1-isolated-d32/128 topos'
@@ -2002,7 +2030,7 @@ fib/test_fib.py::test_nvgre_hash:
20022030
conditions:
20032031
- "asic_gen == 'spc1' and 't1-lag' in topo_name and https://github.com/sonic-net/sonic-mgmt/issues/17526"
20042032

2005-
fib/test_fib.py::test_nvgre_hash[ipv4-ipv4]:
2033+
fib/test_fib.py::test_nvgre_hash[ipv4-ipv4:
20062034
skip:
20072035
reason: "Skip for IPv6-only topologies"
20082036
conditions:
@@ -2127,6 +2155,12 @@ generic_config_updater/test_dynamic_acl.py:
21272155
- "topo_name in ['m0-2vlan']"
21282156
- "platform in ['x86_64-8101_32fh_o-r0', 'x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o_c01-r0']"
21292157

2158+
generic_config_updater/test_dynamic_acl.py::test_gcu_acl_arp_rule_creation[IPV4:
2159+
skip:
2160+
reason: "Skip for IPv6-only topologies"
2161+
conditions:
2162+
- "'-v6-' in topo_name"
2163+
21302164
generic_config_updater/test_dynamic_acl.py::test_gcu_acl_dhcp_rule_creation:
21312165
skip:
21322166
reason: "DHCP is not enabled in isolated topo"
@@ -2326,9 +2360,12 @@ gnmi/test_gnoi_system_reboot.py::test_gnoi_system_reboot_warm:
23262360
#######################################
23272361
hash/test_generic_hash.py:
23282362
skip:
2329-
reason: "Testcase ignored due to GitHub issue https://github.com/sonic-net/sonic-mgmt/issues/15340 on dualtor aa setup"
2363+
reason: "Testcase ignored due to GitHub issue https://github.com/sonic-net/sonic-mgmt/issues/15340 on dualtor aa setup
2364+
Or Skip for IPv6-only topologies"
2365+
conditions_logical_operator: or
23302366
conditions:
23312367
- "https://github.com/sonic-net/sonic-mgmt/issues/15340 and 'dualtor-aa' in topo_name"
2368+
- "'-v6-' in topo_name"
23322369
xfail:
23332370
reason: "This case is not supported on many platforms and often encounters issues. We can still run it, but we won’t rely on or validate the results."
23342371
conditions:
@@ -2683,6 +2720,12 @@ iface_namingmode/test_iface_namingmode.py::TestShowQueue::test_show_queue_waterm
26832720
conditions:
26842721
- "platform in ['x86_64-cel_e1031-r0']"
26852722

2723+
iface_namingmode/test_iface_namingmode.py::test_show_ip_route_v4:
2724+
skip:
2725+
reason: "Skip for IPv6-only topologies"
2726+
conditions:
2727+
- "'-v6-' in topo_name"
2728+
26862729
iface_namingmode/test_iface_namingmode.py::test_show_pfc_counters:
26872730
skip:
26882731
reason: "Not supported on SKU"

0 commit comments

Comments
 (0)