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

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 <[email protected]>

prgeor

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

Signed-off-by: Vaibhav Dahiya <[email protected]>

ansible/templates/minigraph_link_meta.j2

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

ansible/vars/topo_t0-116.yml

@@ -134,6 +134,8 @@ topology:
        - 31
      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 <[email protected]>

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 <[email protected]>

ansible/roles/fanout/templates/arista_7060_deploy.j2

Signed-off-by: Vaibhav Dahiya <[email protected]>

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

 {%   if device_port_vlans[inventory_hostname][intf]['mode'] == 'Trunk' %}
   switchport mode trunk
   switchport trunk allowed vlan {{ device_port_vlans[inventory_hostname][intf]['vlanids'] }}
 {%   else %}
   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 <[email protected]>

ansible/templates/minigraph_meta.j2

ansible/templates/minigraph_link_meta.j2

Signed-off-by: Vaibhav Dahiya <[email protected]>

prgeor · 2024-10-02T22:05:40Z

ansible/templates/minigraph_link_meta.j2

+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+{% for if_index in vm_topo_config['autoneg_interfaces']['intfs'] %}
+{% set autoneg_intf = "Ethernet" ~ if_index ~ "/1" %}
+{% if device_conn[inventory_hostname][port_alias_map[autoneg_intf]]['autoneg']|lower == "on" %}


@vdahiya12 please add a comment this is for peer/link
device AN check

Signed-off-by: Vaibhav Dahiya <[email protected]>

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

6b1de4c

minigraph templates Signed-off-by: Vaibhav Dahiya <[email protected]>

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 <[email protected]>

add more changes

f631fac

Signed-off-by: Vaibhav Dahiya <[email protected]>

wangxin reviewed Aug 22, 2024

View reviewed changes

add fanout settings

8515737

Signed-off-by: Vaibhav Dahiya <[email protected]>

vdahiya12 added 2 commits September 5, 2024 20:16

add changes

68e4662

Signed-off-by: Vaibhav Dahiya <[email protected]>

add columns

7fcd219

Signed-off-by: Vaibhav Dahiya <[email protected]>

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

add all

c359d2c

Signed-off-by: Vaibhav Dahiya <[email protected]>

add

e0b9105

Signed-off-by: Vaibhav Dahiya <[email protected]>

add dependency

ae22bea

Signed-off-by: Vaibhav Dahiya <[email protected]>

add t0 topology as well

7cc9a7d

Signed-off-by: Vaibhav Dahiya <[email protected]>

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 <[email protected]>

fix comments

99e8e5b

Signed-off-by: Vaibhav Dahiya <[email protected]>

prgeor reviewed Oct 2, 2024

View reviewed changes

vdahiya12 added 3 commits October 2, 2024 22:32

add comment

7ac510c

Signed-off-by: Vaibhav Dahiya <[email protected]>

add another comment

dc6fa54

Signed-off-by: Vaibhav Dahiya <[email protected]>

format

b78563c

Signed-off-by: Vaibhav Dahiya <[email protected]>

prgeor approved these changes Oct 4, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

vdahiya12 commented Aug 5, 2024 •

edited

Loading

prgeor left a comment

wangxin Aug 22, 2024

vdahiya12 Sep 11, 2024

lguohan Sep 20, 2024

vdahiya12 Sep 23, 2024

mssonicbld commented Sep 3, 2024

prgeor Sep 11, 2024

vdahiya12 Sep 27, 2024

prgeor Sep 11, 2024

vdahiya12 Sep 27, 2024

prgeor Sep 11, 2024

vdahiya12 Sep 27, 2024

vdahiya12 Oct 2, 2024

prgeor Oct 3, 2024

prgeor Oct 2, 2024

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

Are you sure you want to change the base?

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

Conversation

vdahiya12 commented Aug 5, 2024 • edited Loading

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

prgeor left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mssonicbld commented Sep 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vdahiya12 commented Aug 5, 2024 •

edited

Loading