Skip to content

[Dualtor] add support for neighbor mode in golden_config - #25674

Merged
bingwang-ms merged 1 commit into
sonic-net:masterfrom
harjotsinghpawra:neighbor_mode
Jul 7, 2026
Merged

bingwang-ms merged 1 commit into
sonic-net:masterfrom
harjotsinghpawra:neighbor_mode

Conversation

@harjotsinghpawra

Copy link
Copy Markdown
Contributor

Description of PR

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.

How to enable it :

conf-name: docker-ptf
group-name: sonic_cisco
topo: t0
ptf_image_name: docker-ptf-titan
prober_type: hardware
neighbor_mode: prefix-route
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

Summary:
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

  • 202311
  • 202405
  • 202411
  • 202505
  • 202511
  • 202512
  • 202605

Tracking issue/work item for backport/cherry-pick request:
Failure type:

Approach

What is the motivation for this PR?

Support for neighbor_mode was added as part of following PR
sonic-net/sonic-swss#4152

Needed a knob for dualtor setups to use one setting always to test it

How did you do it?

Added a new knob in testbed.yaml which will only be active for dualtor testbeds
and add neighbor_mode to golden_config_db.json

How did you verify/test it?

Ran on local setup

Any platform specific information?

By default its set to host-route which is supported by all platforms

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

dualtor

Documentation

sonic-net/SONiC#2176

Signed-off-by: Harjot Singh <harjotpawrawork@gmail.com>
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@github-actions
github-actions Bot requested review from r12f, sdszhang and wangxin June 25, 2026 18:18
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@zjswhhh

zjswhhh commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

/azpw run

@mssonicbld

Copy link
Copy Markdown
Collaborator

⚠️ Notice: /azpw run only runs failed jobs now. If you want to trigger a whole pipline run, please rebase your branch or close and reopen the PR.
💡 Tip: You can also use /azpw retry to retry failed jobs directly.

Retrying failed(or canceled) jobs...

@mssonicbld

Copy link
Copy Markdown
Collaborator

Retrying failed(or canceled) stages in build 1148923:

✅Stage Test:

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

@zjswhhh

zjswhhh commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Hi @bingwang-ms - please help review.

Comment thread ansible/library/generate_golden_config_db.py Outdated
Comment thread ansible/config_sonic_basedon_testbed.yml
@bingwang-ms
bingwang-ms merged commit 2269833 into sonic-net:master Jul 7, 2026
27 checks passed
@prsunny

prsunny commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Approving for 202605 since this is planned to be the default config for Dualtor
@vaibhavhd , @yxieca , @lolyu for viz cherry-pick

@mssonicbld

Copy link
Copy Markdown
Collaborator

@harjotsinghpawra PR conflicts with 202605 branch

@zjswhhh

zjswhhh commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Hi @harjotsinghpawra -can you raise a PR to 202605 to manually pick up this change?

@harjotsinghpawra

Copy link
Copy Markdown
Contributor Author

@zjswhhh Hi Jing actually this PR needs to go first
#20765

@mssonicbld

Copy link
Copy Markdown
Collaborator

This PR is approved for branch 202605. No cherry pick PR has been created because of code conflict. @harjotsinghpawra, please manually create the cherry pick PR.
If this change is already in 202605, please comment "already in 202605". Thanks!

---Powered by SONiC BuildBot

selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Jul 16, 2026
…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: selldinesh <dinesh.sellappan@keysight.com>
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Jul 16, 2026
…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: selldinesh <dinesh.sellappan@keysight.com>
@zjswhhh

zjswhhh commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@zjswhhh Hi Jing actually this PR needs to go first #20765

Hi @harjotsinghpawra - can you raise a PR to 202605 to manually cherry-pick both?

zjswhhh pushed a commit to zjswhhh/sonic-mgmt that referenced this pull request Jul 20, 2026
…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>
@zjswhhh

zjswhhh commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@zjswhhh Hi Jing actually this PR needs to go first #20765

Hi @harjotsinghpawra - can you raise a PR to 202605 to manually cherry-pick both?

Hi @harjotsinghpawra - nvm I raised it already, please help review.

zjswhhh pushed a commit to zjswhhh/sonic-mgmt that referenced this pull request Jul 20, 2026
…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>
ssithaia-ebay pushed a commit to ssithaia-ebay/sflow-yang-sonic-mgmt that referenced this pull request Jul 21, 2026
…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: ssithaia-ebay <ssithaian@ebay.com>
@mssonicbld

Copy link
Copy Markdown
Collaborator

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

StormLiangMS pushed a commit that referenced this pull request Jul 29, 2026
…nfig support (#26376)

### 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
- [ ] Bug fix
- [x] 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
- [ ] 202605

### 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`.

---------

Signed-off-by: Harjot Singh <harjotpawrawork@gmail.com>
Signed-off-by: harjotsinghpawra <harjotpawrawork@gmail.com>
Signed-off-by: Jing Zhang <zhangjing@microsoft.com>
Co-authored-by: harjotsinghpawra <harjotpawrawork@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 684f81f0-f270-43fc-b397-2cb895b9ef0f
rraghav-cisco pushed a commit to rraghav-cisco/sonic-mgmt that referenced this pull request Aug 24, 2026
…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: Raghavendran Ramanathan <rraghav@cisco.com>
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.

7 participants