[202511] Cherry-pick HA core infrastructure#23654
Merged
vmittal-msft merged 8 commits intoApr 7, 2026
Merged
Conversation
…et#22161) * DASH - [HA] [smartswitch] add ha steady traffic test with PL config (sonic-net#22161) Summary: This test is covering the module 1 of the HA testplan. The following is being tested Load HA configuration on Primary and Standby Activate HA on Primary and Standby Send private link traffic and verify that is received as expected.
…ic-net#22958) * ha test workaround for the neigh resolve issue Summary: neigh resolve is not working without interface name with VLAN interface so the ha traffic tests will fail. Need to introduce a ping before HA configuration
What is the motivation for this PR? Currently the sonic-mgmt HA tests us a local proto_utils script to program APPL_DB for HA. This PR changs this to use GNMI commands sent from PTF. How did you do it? Add a send_message for HA GNMI configs to APPL_DB.
…net#22664) What is the motivation for this PR? We should not use swbus-cli to extract HA info, such as pending_operation_id. swbus-cli is for debugging only. There is no contract to external entities so the format could change. Instead, we should use dash-ha-scope-state in state-db. That is the interface to SDN controller, which must be stable. It is also easier and accurate to get the required information comparing to using RE to parse the output of swbus-cli. How did you do it? Use sonic-db-cli to read dash-ha-scope-state in state-db
* revert PR 22920 to the original BFD values (sonic-net#23106) What is the motivation for this PR? Need to use the original BFD parameters How did you do it? Reverted the diff from PR 22920
… of hard coding Currently the remote npu pa ip is harded in the config, which doesn't match the loopback of remote npu's loopback. Submitting this PR to fix that. Signed-off-by: Jing Zhang <zhangjing@microsoft.com>
Summary: Need to perform vxlan setup on both primary and standby DPUs and also do a config reload during the cleanup. This is required to generate the PL packets by the DPU with a certain VxLAN range.It is the same as the one used in the DASH tests: https://github.com/sonic-net/sonic-mgmt/blob/master/tests/dash/conftest.py#L421
sonic-net#22952) What is the motivation for this PR? he generate_vlan_config function and associated VLAN configuration (VLAN, VLAN_INTERFACE, VLAN_MEMBER) in the HA conftest.py are being moved to a dedicated PR on feature/smartswitch-vlan-dataplane-config. Keeping the VLAN config in both places would cause duplication and potential merge conflicts. This PR removes the VLAN config generation from the HA conftest to avoid overlap. How did you do it? Removed the generate_vlan_config helper function and its banner comment from tests/ha/conftest.py Removed the svi_ip variable and the call to generate_vlan_config in generate_ha_config_for_dut Removed the VLAN, VLAN_INTERFACE, and VLAN_MEMBER keys from the config dictionary returned by generate_ha_config_for_dut
theasianpianist
requested review from
BYGX-wcr,
Pterosaur,
lolyu,
wangxin,
xwjiang-ms and
yutongzhang-microsoft
as code owners
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
vmittal-msft
approved these changes
Apr 7, 2026
vmittal-msft
pushed a commit
that referenced
this pull request
Apr 10, 2026
…23655) 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.yaml` were 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): 1. #20934 — Fix conditional marks for marvell-teralynx (conflict resolved) 2. #22089 — reliable tsa tests are now skipped on single asic voq duts (conflict resolved) 3. #22853 — [HA] [smartswitch] HA planned shutdown tests (conflict resolved) 4. #23407 — [ha] fix argument order in planned shutdown test case ### 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. --------- Signed-off-by: Saravanan Sellappa <saravanan@nexthop.ai> Co-authored-by: Anandhi Dhanabalan <adhanabalan@marvell.com> Co-authored-by: saravanan sellappa <saravanan@nexthop.ai> Co-authored-by: aronovic <166534786+aronovic@users.noreply.github.com> Co-authored-by: Jing Zhang <zhangjing@microsoft.com>
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
9 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.
Cherry-pick of 9 PRs to 202511 — HA core infrastructure (conftest.py chain, BFD, GNMI, state_db).
All cherry-picks apply cleanly with no conflicts. 3 PRs from the original batch (#22489, #22736, #22920) were already on 202511 and are skipped.
Included PRs (in cherry-pick order):
Already on 202511 (skipped):
Why batched?
These PRs form a dependency chain through
tests/ha/conftest.pyand related HA files. Each commit modifies files that subsequent commits also touch, so they must be applied in order.