Skip to content

Conversation

@mssonicbld
Copy link
Collaborator

Description of PR

Summary:
Fixes issue with order of operations when syncd container is dynamically swapped during test_tunnel_qos_remap.py with respect to the VOQ Watchdog disabler.
The VOQ watchdog fixture runs first because it has no dependency on the syncd swap. Thus the WD is temporarily disabled, but then the syncd-swap (config reload) reload re-enables it.
Fix by requiring the syncd_swap to be performed before the disable_voq_watchdog_dualtor fixture runs.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
  • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505

Approach

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 20aae0310ff04063c2a65d0045eac41a41728be5 (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. 

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

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.
@mssonicbld
Copy link
Collaborator Author

Original PR: #21102

@mssonicbld
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants