[ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS by vdahiya12 · Pull Request #13990 · sonic-net/sonic-mgmt

vdahiya12 · 2024-08-05T23:30:12Z

Description of PR

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

autoneg_enabled : True
must be enabled in inventory files
to 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

Summary:
Fixes # (issue)

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

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

minigraph templates Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

prgeor

@vdahiya12 do we need more changes to enable AN on EOS?

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

ansible/templates/minigraph_link_meta.j2

wangxin · 2024-08-22T02:15:35Z

ansible/vars/topo_t0-116.yml

      vm_offset: 3
  DUT:
+    autoneg_interfaces:
+      intfs: [13, 14, 15, 16, 17, 18, 19, 20]


Since auto negotiation needs to be matched between DUT and fanout ports. This definition means that both DUT and fanout configuration need to be updated while deploying minigraph. An extra step needs to be added to after deploy minigraph to configure fanout ports accordingly.

discussed offline, resolved

why 8 interfaces? i thought we said half of them an/lt, and half of none an/lt?

changed it to 4 ports

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

mssonicbld · 2024-09-03T21:05:31Z

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check yaml...............................................................Passed check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 ansible/TestbedProcessing.py:334:21: F841 local variable 'AutoNeg' is assigned to but never used flake8...............................................(no files to check)Skipped check conditional mark sort..............................................Passed

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

ansible/roles/fanout/templates/arista_7060_deploy.j2

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

prgeor · 2024-09-11T00:49:32Z

ansible/templates/minigraph_link_meta.j2

+                 <a:Name>FECDisabled</a:Name>
+                 <a:Reference i:nil="true"/>
+                 <a:Value>True</a:Value>


@vdahiya12 disabling FEC when AN is enabled, I would suggest to use msft_an_enabled. Also keep autoneg_enabled for only enabling AN which can be used in future

ansible/templates/minigraph_link_meta.j2

prgeor · 2024-09-11T00:58:29Z

ansible/roles/fanout/templates/arista_7060_deploy.j2

@vdahiya12 In future each SKU needs to be updated to parse the device connection if onboarded for AN testbed?

yes, every template will need to be enhanced

prgeor · 2024-09-11T00:58:54Z

ansible/roles/fanout/templates/arista_7060_deploy.j2

   switchport mode dot1q-tunnel
   switchport access vlan {{ device_port_vlans[inventory_hostname][intf]['vlanids'] }}
-{%     if device_conn[inventory_hostname][intf]['speed'] == "100000" %}
+{%     if device_conn[inventory_hostname][intf]['speed'] == "100000" and device_conn[inventory_hostname][intf]['autoneg']|lower == "off" %}


@vdahiya12 Why are we restricting to 100G only?

there is no restriction here, only if speed is 100000 and autoneg is off, then we keep fec as reed-solomon

add the peer device check

@vdahiya12 prevent configuration of RS FEC if msft_an_lt is enabled?

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

ansible/templates/minigraph_meta.j2

ansible/templates/minigraph_link_meta.j2

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

…aph templates and fanout EOS (sonic-net#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 <vdahiya@microsoft.com>

mssonicbld · 2024-10-25T07:19:26Z

@vdahiya12 PR conflicts with 202305 branch

mssonicbld · 2024-10-25T07:19:26Z

Cherry-pick PR to 202405: #15172

mssonicbld · 2024-10-25T07:19:26Z

@vdahiya12 PR conflicts with 202311 branch

…aph 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 <vdahiya@microsoft.com>

…aph templates and fanout EOS (sonic-net#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 <vdahiya@microsoft.com>

…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 <vdahiya@microsoft.com> * [ansible][minigraph] enhance template for adding autonegotiation in Mellanox and add EOS 7260 template changes (#15004) Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com> * [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 <vdahiya@microsoft.com>

…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 <vdahiya@microsoft.com> * [ansible][minigraph] enhance template for adding autonegotiation in Mellanox and add EOS 7260 template changes (#15004) Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com> * [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 <vdahiya@microsoft.com>

[ansible][minigraph] add support for adding autonegotiation in

6b1de4c

minigraph templates Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

prgeor requested a review from wangxin August 6, 2024 23:32

prgeor reviewed Aug 6, 2024

View reviewed changes

vdahiya12 added 2 commits August 15, 2024 00:46

add changes for topo files

5f38d56

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add more changes

f631fac

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

wangxin reviewed Aug 22, 2024

View reviewed changes

add fanout settings

8515737

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

vdahiya12 added 2 commits September 5, 2024 20:16

add changes

68e4662

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add columns

7fcd219

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

vdahiya12 changed the title ~~[ansible][minigraph] add support for adding autonegotiation in minigraph templates~~ [ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS Sep 5, 2024

add fixes

20af214

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

ZhaohuiS reviewed Sep 9, 2024

View reviewed changes

ansible/roles/fanout/templates/arista_7060_deploy.j2 Outdated Show resolved Hide resolved

ZhaohuiS reviewed Sep 9, 2024

View reviewed changes

ansible/roles/fanout/templates/arista_7060_deploy.j2 Outdated Show resolved Hide resolved

wangxin previously approved these changes Sep 10, 2024

View reviewed changes

add all changes

461180a

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

vdahiya12 dismissed wangxin’s stale review via 461180a September 11, 2024 00:39

prgeor reviewed Sep 11, 2024

View reviewed changes

ansible/templates/minigraph_link_meta.j2 Show resolved Hide resolved

prgeor reviewed Sep 11, 2024

View reviewed changes

vdahiya12 added 5 commits September 23, 2024 15:11

change port assignment

a9ead6d

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add all

c359d2c

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add

e0b9105

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add dependency

ae22bea

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

add t0 topology as well

7cc9a7d

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

prgeor reviewed Oct 2, 2024

View reviewed changes

ansible/templates/minigraph_meta.j2 Show resolved Hide resolved

prgeor reviewed Oct 2, 2024

View reviewed changes

ansible/templates/minigraph_link_meta.j2 Show resolved Hide resolved

vdahiya12 added 2 commits October 2, 2024 07:40

cosmetic

3779707

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

fix comments

99e8e5b

Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>

wangxin merged commit f3364fa into sonic-net:master Oct 8, 2024

StormLiangMS added Request for 202305 branch Request for 202311 branch Request for 202405 branch Approved for 202305 branch Approved for 202311 branch Approved for 202405 branch labels Oct 25, 2024

mssonicbld added Cherry Pick Conflict_202305 Created PR to 202405 branch Cherry Pick Conflict_202311 labels Oct 25, 2024

mssonicbld mentioned this pull request Oct 25, 2024

[action] [PR:13990] [ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS #15172

Merged

8 tasks

mssonicbld added Included in 202405 branch and removed Created PR to 202405 branch labels Oct 25, 2024

vdahiya12 mentioned this pull request Oct 26, 2024

[ansible][minigraph] add support for adding autonegotiation in minigraph templates and fanout EOS (#13990) #15196

Merged

8 tasks

vdahiya12 mentioned this pull request Oct 26, 2024

[ansible][minigraph] add support for adding autonegotiation in minigrph templates and fanout EOS (#13990) #15197

Merged

8 tasks

SavchukRomanLv mentioned this pull request Nov 6, 2024

[Bug]: enabling autoneg from topology file limiting setup deployment #15396

Open

vdahiya12 mentioned this pull request Feb 7, 2025

Increase timeout and set port AutonNeg according to the links file #16647

Closed

11 tasks

Conversation

vdahiya12 commented Aug 5, 2024 • edited 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!

prgeor left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Sep 3, 2024

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Oct 25, 2024

Uh oh!

mssonicbld commented Oct 25, 2024

Uh oh!

mssonicbld commented Oct 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

vdahiya12 commented Aug 5, 2024 •

edited

Loading