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
16 changes: 13 additions & 3 deletions tests/cacl/test_cacl_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@
]


@pytest.fixture(scope="module", autouse=True)
def disable_port_toggle(duthosts, tbinfo):
# set mux mode to manual on both TORs to avoid port state change during test
if "dualtor" in tbinfo['topo']['name']:
for dut in duthosts:
dut.shell("sudo config mux mode manual all")
yield
if "dualtor" in tbinfo['topo']['name']:
for dut in duthosts:
dut.shell("sudo config mux mode auto all")


@pytest.fixture(scope="function", params=["active_tor", "standby_tor"])
def duthost_dualtor(request, upper_tor_host, lower_tor_host): # noqa F811
which_tor = request.param
Expand All @@ -28,9 +40,7 @@ def duthost_dualtor(request, upper_tor_host, lower_tor_host): # noqa F811
else:
logger.info("Select upper tor...")
dut = upper_tor_host
dut.shell("sudo config mux mode manual all")
yield dut
dut.shell("sudo config mux mode auto all")
return dut


@pytest.fixture
Expand Down
12 changes: 12 additions & 0 deletions tests/generic_config_updater/test_cacl.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ def get_iptable_rules(duthost):
return rules_chain


@pytest.fixture(scope="module", autouse=True)
def disable_port_toggle(duthosts, tbinfo):
# set mux mode to manual on both TORs to avoid port state change during test
if "dualtor" in tbinfo['topo']['name']:
for dut in duthosts:
dut.shell("sudo config mux mode manual all")
yield
if "dualtor" in tbinfo['topo']['name']:
for dut in duthosts:
dut.shell("sudo config mux mode auto all")


@pytest.fixture(autouse=True)
def setup_env(duthosts, rand_one_dut_hostname):
"""
Expand Down