diff --git a/tests/everflow/everflow_test_utilities.py b/tests/everflow/everflow_test_utilities.py index 1ebb643cb65..27eb771e4f8 100644 --- a/tests/everflow/everflow_test_utilities.py +++ b/tests/everflow/everflow_test_utilities.py @@ -388,6 +388,15 @@ def setup_info(duthosts, rand_one_dut_hostname, tbinfo, request, topo_scenario): time.sleep(60) +@pytest.fixture(scope="module", autouse=True) +def skip_ipv6_everflow_tests(setup_info, erspan_ip_ver): + """ + Skip IPv6 Everflow tests if the DUT is a virtual switch. + """ + if erspan_ip_ver == 6 and setup_info[UP_STREAM]["everflow_dut"].facts["asic_type"] == "vs": + pytest.skip("Skipping IPv6 Everflow tests to speed up PR test execution.") + + # TODO: This should be refactored to some common area of sonic-mgmt. def add_route(duthost, prefix, nexthop, namespace): """ diff --git a/tests/everflow/test_everflow_ipv6.py b/tests/everflow/test_everflow_ipv6.py index 0b14e83084e..e50a4d8e445 100644 --- a/tests/everflow/test_everflow_ipv6.py +++ b/tests/everflow/test_everflow_ipv6.py @@ -7,11 +7,11 @@ from ptf.mask import Mask import ptf.packet as scapy from . import everflow_test_utilities as everflow_utils -from .everflow_test_utilities import BaseEverflowTest, DOWN_STREAM, UP_STREAM, erspan_ip_ver # noqa F401 +from .everflow_test_utilities import BaseEverflowTest, DOWN_STREAM, UP_STREAM, erspan_ip_ver # noqa: F401 import random # Module-level fixtures -from .everflow_test_utilities import setup_info # noqa: F401 -from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor # noqa F401 +from .everflow_test_utilities import setup_info, skip_ipv6_everflow_tests # noqa: F401 +from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor # noqa: F401 pytestmark = [ pytest.mark.topology("t0", "t1", "t2", "m0", "m1", "m2", "m3") diff --git a/tests/everflow/test_everflow_per_interface.py b/tests/everflow/test_everflow_per_interface.py index da830a919c4..b4359f4d7f6 100644 --- a/tests/everflow/test_everflow_per_interface.py +++ b/tests/everflow/test_everflow_per_interface.py @@ -10,7 +10,7 @@ from scapy.layers.vxlan import VXLAN from . import everflow_test_utilities as everflow_utils -from .everflow_test_utilities import BaseEverflowTest, erspan_ip_ver # noqa: F401 +from .everflow_test_utilities import BaseEverflowTest, erspan_ip_ver, skip_ipv6_everflow_tests # noqa: F401 from .everflow_test_utilities import TEMPLATE_DIR, EVERFLOW_RULE_CREATE_TEMPLATE, \ DUT_RUN_DIR, EVERFLOW_RULE_CREATE_FILE, UP_STREAM from tests.common.helpers.assertions import pytest_require diff --git a/tests/everflow/test_everflow_testbed.py b/tests/everflow/test_everflow_testbed.py index 5ce2fc536fa..6c6ee502db4 100644 --- a/tests/everflow/test_everflow_testbed.py +++ b/tests/everflow/test_everflow_testbed.py @@ -15,6 +15,7 @@ from tests.common.fixtures.ptfhost_utils import copy_ptftests_directory # noqa: F401 from tests.common.fixtures.ptfhost_utils import copy_acstests_directory # noqa: F401 from .everflow_test_utilities import setup_info, setup_arp_responder, erspan_ip_ver, EVERFLOW_DSCP_RULES # noqa: F401 +from .everflow_test_utilities import skip_ipv6_everflow_tests # noqa: F401 from tests.common.fixtures.ptfhost_utils import copy_arp_responder_py # noqa: F401 from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor # noqa: F401