Skip to content

Commit 2fe174b

Browse files
rbpittmandcaugher
authored andcommitted
Require swap syncd before running disable VOQ watchdog (sonic-net#21102)
What is the motivation for this PR? How did you do it? How did you verify/test it? Validated on master branch qos/test_tunnel_qos_remap.py on hash 20aae03 without extra parameters (for example, without "--qos_swap_syncd=False" or disabling loganalyzer) Validated on 202411 active watermark test case passes =============================================== 10 passed, 7 skipped, 851 warnings in 8220.27s (2:17:00) ============= sonic-mgmt$ git log -n 1 commit 20aae03 (HEAD -> voq_wd_syncd_swap_issue_master, origin/voq_wd_syncd_swap_issue_master) Author: Randall Pittman <[email protected]> Date: Wed Nov 5 23:25:14 2025 +0000 Require swap_syncd before setup_module.
1 parent 651ffb4 commit 2fe174b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

tests/qos/test_tunnel_qos_remap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def check_running_condition(tbinfo, duthost):
7070

7171

7272
@pytest.fixture(scope='module', autouse=True)
73-
def disable_pfcwd(duthosts):
73+
def disable_pfcwd(duthosts, swap_syncd): # noqa: F811
7474
pfcwd_value = {}
7575
for duthost in duthosts:
7676
pfcwd_value[duthost.hostname] = get_pfcwd_config(duthost)

tests/qos/tunnel_qos_remap_base.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def _update_counterpoll_state(duthost, counter_name, state):
441441

442442

443443
@pytest.fixture(scope='module')
444-
def setup_module(rand_selected_dut, rand_unselected_dut, update_docker_services):
444+
def setup_module(rand_selected_dut, rand_unselected_dut, update_docker_services, swap_syncd):
445445
'''
446446
Module level setup/teardown
447447
'''
@@ -556,7 +556,13 @@ def run_ptf_test(ptfhost, test_case='', test_params={}):
556556

557557

558558
@pytest.fixture(scope='module', autouse=True)
559-
def disable_voq_watchdog_dualtor(duthosts, rand_selected_dut):
559+
def disable_voq_watchdog_dualtor(duthosts, rand_selected_dut, swap_syncd):
560+
"""
561+
Disable VOQ watchdog for dualtor tests.
562+
563+
Note: This fixture depends on swap_syncd to ensure VOQ watchdog is disabled
564+
AFTER the config reload that happens during syncd swap.
565+
"""
560566
get_src_dst_asic_and_duts = {}
561567
get_src_dst_asic_and_duts["single_asic_test"] = True
562568
get_src_dst_asic_and_duts["dst_dut"] = rand_selected_dut

0 commit comments

Comments
 (0)