Skip to content

chore: change portchannel naming#18161

Merged
bingwang-ms merged 2 commits intosonic-net:masterfrom
auspham:austinpham/32562998-change-port-channel-naming-convention
May 12, 2025
Merged

chore: change portchannel naming#18161
bingwang-ms merged 2 commits intosonic-net:masterfrom
auspham:austinpham/32562998-change-port-channel-naming-convention

Conversation

@auspham
Copy link
Contributor

@auspham auspham commented Apr 28, 2025

Description of PR

Summary: Change the current logic for portchannel naming to only apply for multi-asics. For topology that requires more than 100 lags, if we use PortChannel10x as the prefix we will get more than 16 characters which will violate the linux interface naming convention (only less than 15 characters)

Fixes # (issue) 32562998

Type of change

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

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

Described above

How did you do it?

Only apply PortChannel10 if num_asics > 1, otherwise we stick with standard PortChannel to restrict the change to multi-asics

How did you verify/test it?

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Collaborator

LGTM. Thanks for addressing this issue.
@abdosi Can you help review this change to ensure it won't break chassis?

bingwang-ms
bingwang-ms previously approved these changes Apr 28, 2025
@auspham auspham requested a review from abdosi April 28, 2025 23:51
abdosi
abdosi previously approved these changes Apr 29, 2025
@bingwang-ms bingwang-ms enabled auto-merge (squash) April 30, 2025 21:49
auto-merge was automatically disabled May 1, 2025 21:15

Head branch was pushed to by a user without write access

@auspham auspham dismissed stale reviews from abdosi and bingwang-ms via 8e42f77 May 1, 2025 21:15
@mssonicbld
Copy link
Collaborator

/azp run

1 similar comment
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

1 similar comment
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham requested a review from abdosi May 2, 2025 04:17
@auspham
Copy link
Contributor Author

auspham commented May 2, 2025

Hi @bingwang-ms @abdosi please help reviewing again as an update to add as integer instead rather than string. Thanks

@auspham auspham force-pushed the austinpham/32562998-change-port-channel-naming-convention branch from 8e42f77 to a803c43 Compare May 6, 2025 05:32
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@auspham
Copy link
Contributor Author

auspham commented May 8, 2025

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@auspham
Copy link
Contributor Author

auspham commented May 9, 2025

Hi @bingwang-ms @abdosi can i have this re-review please?

@bingwang-ms bingwang-ms merged commit ac074f8 into sonic-net:master May 12, 2025
17 of 18 checks passed
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to msft-202503: Azure/sonic-mgmt.msft#288

@vmittal-msft vmittal-msft self-requested a review May 22, 2025 18:03
arlakshm pushed a commit that referenced this pull request May 25, 2025
…late files #18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic #18507 caused by chore: change portchannel naming #18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
auspham pushed a commit to auspham/sonic-mgmt that referenced this pull request May 30, 2025
… asic minigraph template files (sonic-net#327)

<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:
Fixes # (issue)

- This PR fixes the issue sonic-net#18507 caused by sonic-net#18161
- Portchannel name changes are done in file _ansible/templates/minigraph_dpg.j2_ but we need corresponding change in _ansible/templates/minigraph_dpg_asic.j2_ file as well so the names are same in both global and asic configs.

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

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

### Back port request
- [ ] 202012
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411

### Approach
#### What is the motivation for this PR?

- To fix the minigraph template issues w.r.t Portchannel names for global and asic.

#### How did you do it?

- Add corresponding changes on _ansible/templates/minigraph_dpg_asic.j2_ similar to _ansible/templates/minigraph_dpg.j2_

#### How did you verify/test it?

- Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

#### Any platform specific information?
Mutliasic

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

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
bachalla pushed a commit to bachalla/sonic-mgmt that referenced this pull request Jun 2, 2025
…late files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
* adjust portchannel naming convention

Signed-off-by: Austin Pham <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
…late files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>

Signed-off-by: opcoder0 <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
* adjust portchannel naming convention

Signed-off-by: Austin Pham <[email protected]>
Signed-off-by: Aharon Malkin <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
…late files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
* adjust portchannel naming convention

Signed-off-by: Austin Pham <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
…late files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
* adjust portchannel naming convention

Signed-off-by: Austin Pham <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
…late files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
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.

4 participants