Skip to content

[202205][dualtor] Add mux direction checks to toggle fixtures #8831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yxieca merged 1 commit into from
Jul 7, 2023
Merged

[202205][dualtor] Add mux direction checks to toggle fixtures #8831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions tests/common/dualtor/mux_simulator_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,27 +349,37 @@ def _toggle(side):


@pytest.fixture
def toggle_all_simulator_ports_to_upper_tor(mux_server_url, tbinfo, cable_type):
def toggle_all_simulator_ports_to_upper_tor(active_standby_ports, duthosts, mux_server_url, tbinfo, cable_type): # noqa F811
"""
A function level fixture to toggle all active-standby ports to upper_tor

For this fixture to work properly, ICMP responder must be running. Please ensure that fixture run_icmp_responder
is imported in test script. The run_icmp_responder fixture is defined in tests.common.fixtures.ptfhost_utils
"""
# Skip on non dualtor testbed
if 'dualtor' not in tbinfo['topo']['name'] or not active_standby_ports:
logger.info('Skipping toggle on non-dualtor testbed or active-active dualtor topo.')
return

if cable_type == CableType.active_standby:
_toggle_all_simulator_ports(mux_server_url, UPPER_TOR, tbinfo)
_toggle_all_simulator_ports_to_target_dut(duthosts[0].hostname, duthosts, mux_server_url, tbinfo)


@pytest.fixture
def toggle_all_simulator_ports_to_lower_tor(mux_server_url, tbinfo, cable_type):
def toggle_all_simulator_ports_to_lower_tor(active_standby_ports, duthosts, mux_server_url, tbinfo, cable_type): # noqa F811
"""
A function level fixture to toggle all active-standby ports to lower_tor

For this fixture to work properly, ICMP responder must be running. Please ensure that fixture run_icmp_responder
is imported in test script. The run_icmp_responder fixture is defined in tests.common.fixtures.ptfhost_utils
"""
# Skip on non dualtor testbed
if 'dualtor' not in tbinfo['topo']['name'] or not active_standby_ports:
logger.info('Skipping toggle on non-dualtor testbed or active-active dualtor topo.')
return

if cable_type == CableType.active_standby:
_toggle_all_simulator_ports(mux_server_url, LOWER_TOR, tbinfo)
_toggle_all_simulator_ports_to_target_dut(duthosts[1].hostname, duthosts, mux_server_url, tbinfo)


def _probe_mux_ports(duthosts, ports):
Expand Down