Enhance minigraph link template for autonegotiation and remove requirement to add autoneg interfaces in topo file#16956
Merged
yxieca merged 15 commits intosonic-net:masterfrom Feb 21, 2025
Conversation
and add ports for t0-56 topo to have autoneg interfaces Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ansible/vars/topo_t0-56-o8v48.yml
Outdated
| vm_offset: 7 | ||
| DUT: | ||
| autoneg_interfaces: | ||
| intfs: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] |
There was a problem hiding this comment.
This change hardcodes interfaces and remove ability set interface 1,5,7 with autoneg enabled on 1 setup with t0-56 and 2,5,7,8 etc on other setup
Contributor
Author
There was a problem hiding this comment.
fixed, we dont need to add interfaces in this file anymore
Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
vdahiya12
changed the title
prgeor
previously approved these changes
Feb 14, 2025
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prgeor
reviewed
Feb 20, 2025
Collaborator
|
Hi @vdahiya12 , this change caused loading minigraph failure in master branch. The error message is as below I think that's because the namespace declaration is removed in this change, can you please check? |
bingwang-ms
reviewed
Feb 27, 2025
| {% endif %} | ||
|
|
||
| {% if msft_an_enabled is defined and vm_topo_config.get('autoneg_interfaces') is not none %} | ||
| <LinkMetadataDeclaration> |
Collaborator
There was a problem hiding this comment.
This part is probably needed
Contributor
|
@bingwang-ms The fix for this is in #17191. |
Collaborator
Yeah, got it after discussing with Vaibhav. Thanks for the reminding! |
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Feb 28, 2025
…ement to add autoneg interfaces in topo file (sonic-net#16956) This PR updates the minigraph_link_meta.j2 template and topology configuration to enhance how AutoNegotiation (autoneg) interfaces are processed in SONiC's Ansible scripts. The changes streamline interface detection and remove redundant conditions. Removed dependency on msft_an_enabled for processing autoneg_interfaces. Improved logic to check for 'autoneg' directly in device_conn rather than relying on predefined interface lists. Ensured FEC settings are included only if msft_an_enabled is defined. Type of change Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
Collaborator
|
Cherry-pick PR to 202411: #17261 |
11 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Mar 3, 2025
…ement to add autoneg interfaces in topo file (#16956) This PR updates the minigraph_link_meta.j2 template and topology configuration to enhance how AutoNegotiation (autoneg) interfaces are processed in SONiC's Ansible scripts. The changes streamline interface detection and remove redundant conditions. Removed dependency on msft_an_enabled for processing autoneg_interfaces. Improved logic to check for 'autoneg' directly in device_conn rather than relying on predefined interface lists. Ensured FEC settings are included only if msft_an_enabled is defined. Type of change Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
mssonicbld
added
Included in 202411 branch
and removed
Created PR to 202411 branch
labels
nnelluri-cisco
pushed a commit
to nnelluri-cisco/sonic-mgmt
that referenced
this pull request
Mar 15, 2025
…ement to add autoneg interfaces in topo file (sonic-net#16956) This PR updates the minigraph_link_meta.j2 template and topology configuration to enhance how AutoNegotiation (autoneg) interfaces are processed in SONiC's Ansible scripts. The changes streamline interface detection and remove redundant conditions. Removed dependency on msft_an_enabled for processing autoneg_interfaces. Improved logic to check for 'autoneg' directly in device_conn rather than relying on predefined interface lists. Ensured FEC settings are included only if msft_an_enabled is defined. Type of change Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
11 tasks
11 tasks
Collaborator
|
Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#169 |
mssonicbld
added
Included in msft-202405 Branch
and removed
Created PR to msft-202405 Branch
labels
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.
Description of PR
This PR updates the
minigraph_link_meta.j2template and topology configuration to enhance how AutoNegotiation (autoneg) interfaces are processed in SONiC's Ansible scripts. The changes streamline interface detection and remove redundant conditions.Summary:
Fixes # (issue)
msft_an_enabledfor processingautoneg_interfaces.'autoneg'directly indevice_connrather than relying on predefined interface lists.msft_an_enabledis defined.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