[ansible][minigraph] Fix minigraph template for devices which have autoneg enabled but the topo file does not contain autoneg interfaces#15134
Merged
wangxin merged 3 commits intosonic-net:masterfrom Oct 25, 2024
Conversation
…ellanox and add EOS 7260 template changes Signed-off-by: Vaibhav Dahiya <[email protected]>
autoneg enabled but the topo file does not contain autoneg interfaces Signed-off-by: Vaibhav Dahiya <[email protected]>
xwjiang-ms
approved these changes
Oct 24, 2024
wangxin
approved these changes
Oct 24, 2024
prgeor
approved these changes
Oct 24, 2024
Collaborator
|
@vdahiya12 PR conflicts with 202311 branch |
Collaborator
|
@vdahiya12 PR conflicts with 202405 branch |
Collaborator
|
@vdahiya12 PR conflicts with 202305 branch |
vdahiya12
added a commit
to vdahiya12/sonic-mgmt
that referenced
this pull request
Oct 25, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
vdahiya12
added a commit
to vdahiya12/sonic-mgmt
that referenced
this pull request
Oct 25, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
8 tasks
Contributor
Author
|
#15195 fixes 202405 conflict |
vdahiya12
added a commit
to vdahiya12/sonic-mgmt
that referenced
this pull request
Oct 28, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
8 tasks
vdahiya12
added a commit
to vdahiya12/sonic-mgmt
that referenced
this pull request
Oct 28, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
8 tasks
wangxin
pushed a commit
that referenced
this pull request
Oct 29, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (#15134) (#15195) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
wangxin
pushed a commit
that referenced
this pull request
Oct 29, 2024
…aph templates and fanout EOS (#13990) (#15196) * [ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS (#13990) These changes add a support for adding auto negotiation to specific testbed based on variables defined in ansible Two things are required for autoneg support 1. autoneg_enabled : True must be enabled in inventory files 2. t0 topo file must have a port list for autoneg Example: intfs : [1, 2, 3, 4, 5, 6, 7, 8] With these changes the PR includes changes to pick the port numbering from topo file and apply minigraph parsing changes such that during deploy-mg or gen-mg the required ports have autoneg and deployment is clean with link up Signed-off-by: Vaibhav Dahiya <[email protected]> * [ansible][minigraph] enhance template for adding autonegotiation in Mellanox and add EOS 7260 template changes (#15004) Signed-off-by: Vaibhav Dahiya <[email protected]> * [ansible][minigraph] Fix minigraph template for devices which have autoneg enabled but the topo file does not contain autoneg interfaces (#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
wangxin
pushed a commit
that referenced
this pull request
Oct 29, 2024
…ph templates and fanout EOS (#13990) (#15197) * [ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS (#13990) These changes add a support for adding auto negotiation to specific testbed based on variables defined in ansible Two things are required for autoneg support 1. autoneg_enabled : True must be enabled in inventory files 2. t0 topo file must have a port list for autoneg Example: intfs : [1, 2, 3, 4, 5, 6, 7, 8] With these changes the PR includes changes to pick the port numbering from topo file and apply minigraph parsing changes such that during deploy-mg or gen-mg the required ports have autoneg and deployment is clean with link up Signed-off-by: Vaibhav Dahiya <[email protected]> * [ansible][minigraph] enhance template for adding autonegotiation in Mellanox and add EOS 7260 template changes (#15004) Signed-off-by: Vaibhav Dahiya <[email protected]> * [ansible][minigraph] Fix minigraph template for devices which have autoneg enabled but the topo file does not contain autoneg interfaces (#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
sreejithsreekumaran
pushed a commit
to sreejithsreekumaran/sonic-mgmt
that referenced
this pull request
Nov 15, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
yutongzhang-microsoft
pushed a commit
to yutongzhang-microsoft/sonic-mgmt
that referenced
this pull request
Nov 21, 2024
…toneg enabled but the topo file does not contain autoneg interfaces (sonic-net#15134) This pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section. Key Changes: * The condition has been changed from simply checking if msft_an_enabled is defined to also checking if vm_topo_config.get('autoneg_interfaces') is not None. * This ensures that the section is only included if both msft_an_enabled is defined and the autoneg_interfaces attribute in vm_topo_config exists and is not None. This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list Signed-off-by: Vaibhav Dahiya <[email protected]>
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
6 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 pull request updates the Jinja2 template minigraph_link_meta.j2 by modifying the generation of the section.
Key Changes:
This ensures if some testbeds/devices have msft_an_enabled they do not end up treated as autoneg devices unless the topo file contains the AN interface list
Summary:
Fixes # (issue)
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