Skip to content

[action] [PR:21102] Require swap syncd before running disable VOQ watchdog #21302

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
merged 1 commit into from
Nov 17, 2025
+9 −3
Merged

[action] [PR:21102] Require swap syncd before running disable VOQ watchdog #21302

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tests/qos/test_tunnel_qos_remap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def check_running_condition(tbinfo, duthost):


@pytest.fixture(scope='module', autouse=True)
def disable_pfcwd(duthosts):
def disable_pfcwd(duthosts, swap_syncd): # noqa: F811
pfcwd_value = {}
for duthost in duthosts:
pfcwd_value[duthost.hostname] = get_pfcwd_config(duthost)
Expand Down
10 changes: 8 additions & 2 deletions tests/qos/tunnel_qos_remap_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _update_counterpoll_state(duthost, counter_name, state):


@pytest.fixture(scope='module')
def setup_module(rand_selected_dut, rand_unselected_dut, update_docker_services):
def setup_module(rand_selected_dut, rand_unselected_dut, update_docker_services, swap_syncd):
'''
Module level setup/teardown
'''
Expand Down Expand Up @@ -556,7 +556,13 @@ def run_ptf_test(ptfhost, test_case='', test_params={}):


@pytest.fixture(scope='module', autouse=True)
def disable_voq_watchdog_dualtor(duthosts, rand_selected_dut):
def disable_voq_watchdog_dualtor(duthosts, rand_selected_dut, swap_syncd):
"""
Disable VOQ watchdog for dualtor tests.

Note: This fixture depends on swap_syncd to ensure VOQ watchdog is disabled
AFTER the config reload that happens during syncd swap.
"""
get_src_dst_asic_and_duts = {}
get_src_dst_asic_and_duts["single_asic_test"] = True
get_src_dst_asic_and_duts["dst_dut"] = rand_selected_dut
Expand Down
Loading