Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ansible/library/conn_graph_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ def csv_to_graph_facts(self):
vlan_mode = link["VlanMode"]
autoneg_mode = link.get("AutoNeg")
fec_disable = link.get("FECDisable", False)
linktraining_mode = link.get("LinkTraining", "")

if start_device not in links:
links[start_device] = {}
Expand All @@ -327,6 +328,9 @@ def csv_to_graph_facts(self):
if autoneg_mode:
links[start_device][start_port].update({"autoneg": autoneg_mode})
links[end_device][end_port].update({"autoneg": autoneg_mode})
if linktraining_mode:
links[start_device][start_port].update({"linktraining": linktraining_mode})
links[end_device][end_port].update({"linktraining": linktraining_mode})

port_vlans[start_device][start_port] = {
"mode": vlan_mode,
Expand Down
19 changes: 19 additions & 0 deletions ansible/roles/fanout/templates/sonic_deploy_202405.j2
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,25 @@
{% if fanout_port_config[port_name]['speed'] | default('100000') in ["100000", "400000", "800000"] %}
"fec" : "rs",
{% endif %}
{% if port_name in device_conn[inventory_hostname] %}
{% if 'linktraining' in device_conn[inventory_hostname][port_name] %}
{% if 'on' in device_conn[inventory_hostname][port_name]['linktraining'] %}
"link_training": "on",
{% elif 'off' in device_conn[inventory_hostname][port_name]['linktraining'] %}
"link_training": "off",
{% endif %}
{% endif %}
{% if 'autoneg' in device_conn[inventory_hostname][port_name] %}
{% if 'on' in device_conn[inventory_hostname][port_name]['autoneg'] %}
"autoneg": "on",
{% if msft_an_enabled is defined %}
"fec": "none",
{% endif %}
{% elif 'off' in device_conn[inventory_hostname][port_name]['autoneg'] %}
"autoneg": "off",
{% endif %}
{% endif %}
{% endif %}
{% if 'broadcom' in fanout_sonic_version["asic_type"] or 'marvell' in fanout_sonic_version["asic_type"] or 'mellanox' in fanout_sonic_version["asic_type"] %}
{% if port_name in device_port_vlans[inventory_hostname] and device_port_vlans[inventory_hostname][port_name]["mode"].lower() == "access" %}
"tpid": "0x9100",
Expand Down
21 changes: 21 additions & 0 deletions ansible/templates/minigraph_link_meta.j2
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,27 @@
</a:LinkMetadata>
{% endif %}
{% endif %}
{% if iface_name in device_conn[inventory_hostname] and 'linktraining' in device_conn[inventory_hostname][iface_name] %}
<a:LinkMetadata>
<a:Name i:nil="true"/>
<a:Properties>
{% if 'on' in device_conn[inventory_hostname][iface_name]['linktraining'] %}
<a:DeviceProperty>
<a:Name>LinkTraining</a:Name>
<a:Reference i:nil="true"/>
<a:Value>True</a:Value>
</a:DeviceProperty>
{% elif 'off' in device_conn[inventory_hostname][iface_name]['linktraining'] %}
<a:DeviceProperty>
<a:Name>LinkTraining</a:Name>
<a:Reference i:nil="true"/>
<a:Value>False</a:Value>
</a:DeviceProperty>
{% endif %}
</a:Properties>
<a:Key>{{ device_conn[inventory_hostname][iface_name]['peerdevice'] }}:{{ device_conn[inventory_hostname][iface_name]['peerport'] }};{{ inventory_hostname }}:{{ port_name_map[iface_name] }}</a:Key>
</a:LinkMetadata>
{% endif %}
{% if device_conn[inventory_hostname][iface_name]["fec_disable"] %}
<a:LinkMetadata>
<a:Name i:nil="true"/>
Expand Down