[cherry-pick][202605] Add dual-ToR prober and neighbor mode golden config support by zjswhhh · Pull Request #26376 · sonic-net/sonic-mgmt

zjswhhh · 2026-07-20T19:09:40Z

Description of PR

Summary:
Cherry-pick the following master commits to 202605 to support configuring prober_type and neighbor_mode in dual-ToR golden config generation:

ff59c00 Addition of prober_typer knob of MUX_CABLE as part of golden config (#20765)
2269833 [Dualtor] add support for neighbor mode in golden_config (#25674)

Fixes # (issue): N/A - backport of existing master commits.

Type of change

Back port request

Approach

What is the motivation for this PR?

Allow dual-ToR testbeds on 202605 to select software or hardware probing and host-route or prefix-route neighbor mode through testbed configuration.

How did you do it?

Cherry-picked the two listed master commits in dependency order. The changes pass the testbed values to golden config generation and add them to existing MUX_CABLE entries when explicitly configured.

How did you verify/test it?

git diff --check upstream/202605...HEAD
python3 -m py_compile ansible/library/generate_golden_config_db.py

Any platform specific information?

The settings apply to dual-ToR topologies. Existing defaults remain unchanged when the knobs are not configured.

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

Not a new test case. The framework changes target dual-ToR topologies.

Documentation

The testbed configuration example is included in ansible/testbed.yaml.

mssonicbld · 2026-07-20T19:09:48Z

/azp run

azure-pipelines · 2026-07-20T19:09:49Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-20T19:10:04Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-20T19:13:05Z

/azp run

azure-pipelines · 2026-07-20T19:13:27Z

Azure Pipelines: Successfully started running 1 pipeline(s).

azure-pipelines · 2026-07-20T19:15:24Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

…onic-net#20765)  ### Description of PR  Summary: Prober_type knob was added in MUX_CABLE,now we needed an option to run mgmt runs with software prober or hardware prober for any run on dualtor. How to enable it : - conf-name: docker-ptf group-name: sonic_cisco topo: t0 ptf_image_name: docker-ptf-titan **prober_type: hardware** ptf: docker-ptf ptf_ip: 192.168.122.78/24 ptf_ipv6: fc0b::1/64 server: server_1 vm_base: VM0100 dut: - titan-01 inv_name: lab auto_recover: 'True' comment: Test ptf titan Fixes # (issue) ### Type of change  - [ ] Bug fix - [X ] 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? This PR is to add support for prober_type knob enable or disable in golden_config #### How did you do it? added prober_type: <hardware/software> to testbed.yaml specific config will be added to golden_config_db.json which will eventaully go to config_db.json using minigraph_override #### How did you verify/test it? Ran sanities with this option enabled and then disabled. It was generating the right golden_config #### Any platform specific information? Default value of this prober_type will be software .if nothing is added in testbed.yaml then no need to add this as default is already software. #### Supported testbed topology if it's a new test case? ### Documentation  --------- Signed-off-by: Harjot Singh <harjotpawrawork@gmail.com> Signed-off-by: harjotsinghpawra <harjotpawrawork@gmail.com>

…5674) Summary: neighbor_mode knob was added in MUX_CABLE,now we needed an option to run mgmt runs with neighbor mode set as host-route or prefix-route for any run on dualtor. ### Documentation sonic-net/SONiC#2176 Signed-off-by: Harjot Singh <harjotpawrawork@gmail.com> Signed-off-by: harjotsinghpawra <harjotpawrawork@gmail.com>

mssonicbld · 2026-07-20T19:18:18Z

/azp run

azure-pipelines · 2026-07-20T19:18:34Z

Azure Pipelines: Successfully started running 1 pipeline(s).

harjotsinghpawra · 2026-07-20T20:20:13Z

LGTM , the test case failures dose not seem related to the changes

mssonicbld · 2026-07-21T06:42:57Z

This PR has backport request for branch(es): 202605.
Added label(s) for branch(es) 202605.

_{---Powered by SONiC BuildBot}

mssonicbld · 2026-07-21T06:42:59Z

This PR has backport request label(s) for branch(es): 202605, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202605: <test result>) in the Test result section as well in your PR description.

_{---Powered by SONiC BuildBot}

vaibhavhd · 2026-07-21T07:53:16Z

PR tests failing. Please check.

zjswhhh · 2026-07-21T16:25:32Z

/azpw retry

mssonicbld · 2026-07-21T16:25:34Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-21T16:25:37Z

Retrying failed(or canceled) stages in build 1170162:

✅Stage Test:

Job impacted-area-kvmtest-t1-lag by Elastictest: retried.
Job impacted-area-kvmtest-t0 by Elastictest: retried.

mssonicbld · 2026-07-22T17:29:19Z

/azp run

github-actions · 2026-07-22T17:29:43Z

@StormLiangMS @wangxin @yxieca A user wants to merge changes to the conditional mark files into 202605. Please review.

azure-pipelines · 2026-07-22T17:29:44Z

Azure Pipelines: Successfully started running 1 pipeline(s).

… cherry-pick-20765-25674-202605 Signed-off-by: Jing Zhang <zhangjing@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 684f81f0-f270-43fc-b397-2cb895b9ef0f

mssonicbld · 2026-07-22T17:41:29Z

/azp run

azure-pipelines · 2026-07-22T17:41:45Z

Azure Pipelines: Successfully started running 1 pipeline(s).

zjswhhh · 2026-07-23T15:34:34Z

/azpw retry

mssonicbld · 2026-07-23T15:34:38Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-23T15:34:41Z

Retrying failed(or canceled) stages in build 1172034:

✅Stage Test:

Job impacted-area-kvmtest-dualtor by Elastictest: retried.

zjswhhh · 2026-07-23T20:30:43Z

/azpw retry

mssonicbld · 2026-07-23T20:30:45Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-23T20:30:48Z

Retrying failed(or canceled) stages in build 1172034:

✅Stage Test:

Job impacted-area-kvmtest-dualtor by Elastictest: retried.

vaibhavhd · 2026-07-26T22:09:50Z

@StormLiangMS @wangxin @yxieca A user wants to merge changes to the conditional mark files into 202605. Please review.

This seem to be a new requirement now? Unclear to me if I can approve merge to 202605 w/o an approval from tagged members. Deferring cherry pick decision to @StormLiangMS (who also manages sonic-mgmt cherry picks for 202605).

StormLiangMS · 2026-07-28T01:11:51Z

hi @zjswhhh This seems to be a feature enhancement rather than a bug fix. Could you clarify the justification for cherry-picking it into the 202605 release?

@lolyu could you help to review also?

…eration (#27337)  ### Description of PR  PR #26376 added dual-ToR golden config generation support for `prober_type` and `neighbor_mode`. As part of that change, dualtor topologies started generating `golden_config_db.json` with a `PORT` table copied from minigraph. The deploy flow already runs `config load_minigraph -y` before golden config generation for `lt2` and `ft2`, because those topologies modify/copy `PORT` and need the DUT config to reflect testbed-specific interface admin state first. The new dualtor golden config path missed this preload step. Without the preload, unused routed ports can be preserved as `admin up` in `golden_config_db.json`. These ports have no link, remain `oper down`, and pretest interface sanity fails. This PR extends the existing preload condition to include dualtor. Summary: Fixes #26673  ### Type of change  - [x] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request  - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [ ] 202512 - [x] 202605 Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO): Failure type: regression ### Tested branch  - [ ] master - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [ ] 202512 - [x] 202605 - [ ] N/A ### Test result  202605 **Failure Results** - SONiC image: branch.202605-ars.e7f59890-buildimage.de4f9f0baae9667c05bfe9fdeb1a4fdf4bd19d6c-nightly-2026.07.28.16.40 - SONiC build commit: 0a4101e99 - Build date: Tue Jul 28 21:11:40 UTC 2026 [test_pretest.log](https://github.com/user-attachments/files/30528920/test_pretest.log) [test_pretest.xml](https://github.com/user-attachments/files/30528921/test_pretest.xml) **Pass Results (after fix)** - SONiC image: branch.202605-ars.e7f59890-buildimage.de4f9f0baae9667c05bfe9fdeb1a4fdf4bd19d6c-nightly-2026.07.28.16.40 - SONiC build commit: 0a4101e99 - Build date: Tue Jul 28 21:11:40 UTC 2026 [test_pretest.log](https://github.com/user-attachments/files/30528954/test_pretest.log) [test_pretest.xml](https://github.com/user-attachments/files/30528955/test_pretest.xml) sonic-mgmt change under test: - PR head commit: f0c462b Note: Both before and after tests used the same SONiC image/build; the validated change is in sonic-mgmt. ### Approach #### What is the motivation for this PR? Fix a regression introduced when dualtor was added to the golden config generation path. dualtor golden config now copies `PORT`, so it needs the same minigraph preload step that already exists for `lt2` and `ft2`. #### How did you do it? Updated `ansible/config_sonic_basedon_testbed.yml` so the existing `config load_minigraph -y` step runs for dualtor before `golden_config_db.json` is generated. ``` - when: "'lt2' in topo or 'ft2' in topo" + when: "'lt2' in topo or 'ft2' in topo or 'dualtor' in topo" ``` #### How did you verify/test it?  Inspected failed pretest logs from tst-esx-31. All failed during pretest setup sanity with unused routed ports left as admin up / oper down. Applied the fix and sanitized the duts , ran deploy-mg and pret-tests #### Any platform specific information? N/A #### Supported testbed topology if it's a new test case? N/A ### Documentation  N/A Signed-off-by: mssonicbld <sonicbld@microsoft.com> Co-authored-by: Pratik Dam <pdam@arista.com>

This is another config that is only present in the golden_config_db.json This config will only be present for dualtor systems sonic-net#26376 Signed-off-by: Nathan Wolfe <nwolfe@arista.com>

github-actions Bot requested review from r12f, sdszhang and wangxin July 20, 2026 19:10

zjswhhh marked this pull request as draft July 20, 2026 19:10

zjswhhh force-pushed the cherry-pick-20765-25674-202605 branch from 9f34e99 to 2349e4d Compare July 20, 2026 19:12

zjswhhh marked this pull request as ready for review July 20, 2026 19:15

zjswhhh requested a review from vaibhavhd July 20, 2026 19:16

harjotsinghpawra added 2 commits July 20, 2026 19:18

zjswhhh force-pushed the cherry-pick-20765-25674-202605 branch from 2349e4d to 9a4f99a Compare July 20, 2026 19:18

mssonicbld added the Request for 202605 branch label Jul 21, 2026

vaibhavhd previously approved these changes Jul 21, 2026

View reviewed changes

zjswhhh dismissed vaibhavhd’s stale review via 124659a July 22, 2026 17:29

github-actions Bot requested a review from xwjiang-ms July 22, 2026 17:29

github-advanced-security Bot found potential problems Jul 22, 2026

View reviewed changes

Comment thread tests/acl/test_src_mac_rewrite.py Fixed

Comment thread tests/bgp/test_bgp_authentication.py Fixed

Merge branch '202605' of https://github.com/sonic-net/sonic-mgmt into…

f087e07

… cherry-pick-20765-25674-202605 Signed-off-by: Jing Zhang <zhangjing@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 684f81f0-f270-43fc-b397-2cb895b9ef0f

zjswhhh force-pushed the cherry-pick-20765-25674-202605 branch from 124659a to f087e07 Compare July 22, 2026 17:41

StormLiangMS requested a review from lolyu July 28, 2026 01:12

vaibhavhd added Approved for 202605 branch and removed Approved for 202605 branch labels Jul 28, 2026

lolyu approved these changes Jul 28, 2026

View reviewed changes

StormLiangMS removed the Request for 202605 branch label Jul 29, 2026

StormLiangMS merged commit 687aa6d into sonic-net:202605 Jul 29, 2026
26 checks passed

This was referenced Jul 30, 2026

Bug: dualtor golden config generation preserves unused ports as admin up #26673

Closed

[dualtor] Load minigraph before golden config generation #26676

Merged

mssonicbld mentioned this pull request Aug 25, 2026

[action] [PR:26676] [dualtor] Load minigraph before golden config generation #27337

Merged

21 tasks

Conversation

zjswhhh commented Jul 20, 2026 • edited by StormLiangMS Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

Uh oh!

mssonicbld commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

mssonicbld commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

mssonicbld commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

harjotsinghpawra commented Jul 20, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

vaibhavhd commented Jul 21, 2026

Uh oh!

zjswhhh commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

github-actions Bot commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

zjswhhh commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

zjswhhh commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

vaibhavhd commented Jul 26, 2026

Uh oh!

StormLiangMS commented Jul 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

zjswhhh commented Jul 20, 2026 •

edited by StormLiangMS

Loading