Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions tests/everflow/everflow_test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
6 changes: 3 additions & 3 deletions tests/everflow/test_everflow_ipv6.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tests/everflow/test_everflow_per_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/everflow/test_everflow_testbed.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading