[202511] Cherry-pick conditional marks + HA planned shutdown tests#23655
Merged
vmittal-msft merged 5 commits intoApr 10, 2026
Merged
Conversation
theasianpianist
requested review from
BYGX-wcr and
yutongzhang-microsoft
as code owners
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
12 tasks
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
What is the motivation for this PR?\nThe conditional markers needed to be handled for various qos cases for marvell-teralynx TL7 and TL10 asic family.\n\nHow did you do it?\nDepending on the ASIC and topology, fixed the conditions to either skip or run the test case for marvell-teralynx.\n\nHow did you verify/test it?\nRan the PTF cases listed above in T0 and T1 topology both in TL7 and TL10 platform.\n\nSigned-off-by:\nSigned-off-by: Anandhi Dhanabalan <adhanabalan@marvell.com>
…#22089) reliable tsa tests require two duthosts: one as supe and one as LC single asic voq dut have only one duthost, hence reliable tsa tests are skipped Signed-off-by: Saravanan Sellappa <saravanan@nexthop.ai>
Description of PR Add the HA planned shutdown tests as per Module 2 of the HA testplan Summary: This test is verifying 2 scenarios Traffic is sent while the primary is set to dead. No traffic loss should be observed Traffic is sent while standby is set to dead. Also no traffic loss is expected.
Description of PR Summary: The argument order is wrong when setting ha scope desired_state to dead. It failed the GNMI call, and led to test failures. Submitting this PR to fix the issue. Reference: sonic-mgmt/tests/ha/ha_utils.py Line 268 in 6a548d3 def set_dead_dash_ha_scope(localhost, duthost, ptfhost, scope_key):
theasianpianist
force-pushed
the
cherrypick/batch5-ha-planned-shutdown/202511
branch
from
bb07572 to
8d2ea56
Compare
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
vmittal-msft
approved these changes
Apr 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires #23654 to be merged first
Cherry-pick of 4 PRs to 202511 — conditional mark fixes and HA planned shutdown tests.
Three adjacency conflicts in
tests_mark_conditions.yamlwere resolved by keeping both the existing 202511 entries and the incoming entries (they are independent sections inserted at the same location).Included PRs (in cherry-pick order):
Conflict Details
All three conflicts were adjacency conflicts in
tests/common/plugins/conditional_mark/tests_mark_conditions.yaml— unrelated PRs inserting new YAML sections at the same anchor point. Resolution was to keep both sections since they are independent.