Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(eos_cli_config_gen): Port-channel can use LACP fallback configuration on physical interface #1335

Merged
merged 7 commits into from
Dec 3, 2021
Merged

Fix(eos_cli_config_gen): Port-channel can use LACP fallback configuration on physical interface #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
309eb6a
SNMP settings documentation
xaviramon Dec 8, 2020
2001f33
Merge https://github.com/aristanetworks/ansible-avd into devel
xaviramon Dec 8, 2020
29d2139
Merge https://github.com/aristanetworks/ansible-avd into devel
xaviramon Aug 5, 2021
d304eed
Merge branch 'aristanetworks:devel' into devel
xaviramon Aug 11, 2021
b21b003
Merge https://github.com/aristanetworks/ansible-avd into upstream/devel
xaviramon Nov 4, 2021
63d8570
LACP fallback individual + documentation
xaviramon Nov 16, 2021
3d66e9a
optimization in code
xaviramon Nov 25, 2021
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
18 changes: 18 additions & 0 deletions ...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ interface Management1
| Ethernet10/1 | LAG Member | *access | *110 | *- | *- | 101 |
| Ethernet10/2 | LAG Member | *trunk | *110-112 | *- | *- | 102 |
| Ethernet10/3 | LAG Member | *trunk | *110-112 | *- | *- | 103 |
| Ethernet10/4 | LAG Member LACP fallback | *trunk | *112 | *- | *- | 104 |
| Ethernet15 | DC1-AGG03_Ethernet1 | *trunk | *110,201 | *- | *- | 15 |
| Ethernet16 | DC1-AGG04_Ethernet1 | *trunk | *110,201 | *- | *- | 16 |
| Ethernet50 | SRV-POD03_Eth1 | *trunk | *110,201 | *- | *- | 5 |
Expand Down Expand Up @@ -126,6 +127,14 @@ interface Ethernet10/3
description LAG Member
channel-group 103 mode active
!
interface Ethernet10/4
description LAG Member LACP fallback
channel-group 104 mode active
switchport
switchport trunk allowed vlan 100
switchport mode trunk
spanning-tree portfast
!
interface Ethernet15
description DC1-AGG03_Ethernet1
channel-group 15 mode active
Expand Down Expand Up @@ -168,6 +177,7 @@ interface Ethernet50
| Port-Channel101 | PVLAN Promiscuous Access - only one secondary | switched | access | 110 | - | - | - | - | - | - |
| Port-Channel102 | PVLAN Promiscuous Trunk - vlan translation out | switched | trunk | 110-112 | - | - | - | - | - | - |
| Port-Channel103 | PVLAN Secondary Trunk | switched | trunk | 110-112 | - | - | - | - | - | - |
| Port-Channel104 | LACP fallback individual | switched | trunk | 112 | - | - | 300 | individual | - | - |

#### Private VLAN

Expand Down Expand Up @@ -327,6 +337,14 @@ interface Port-Channel103
switchport trunk allowed vlan 110-112
switchport mode trunk
switchport trunk private-vlan secondary
!
interface Port-Channel104
description LACP fallback individual
switchport
switchport trunk allowed vlan 112
switchport mode trunk
port-channel lacp fallback timeout 300
port-channel lacp fallback individual
```

# Routing
Expand Down
16 changes: 16 additions & 0 deletions ...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,14 @@ interface Port-Channel103
switchport mode trunk
switchport trunk private-vlan secondary
!
interface Port-Channel104
description LACP fallback individual
switchport
switchport trunk allowed vlan 112
switchport mode trunk
port-channel lacp fallback timeout 300
port-channel lacp fallback individual
!
interface Ethernet3
description MLAG_PEER_DC1-LEAF1B_Ethernet3
channel-group 3 mode active
Expand Down Expand Up @@ -170,6 +178,14 @@ interface Ethernet10/3
description LAG Member
channel-group 103 mode active
!
interface Ethernet10/4
description LAG Member LACP fallback
channel-group 104 mode active
switchport
switchport trunk allowed vlan 100
switchport mode trunk
spanning-tree portfast
!
interface Ethernet15
description DC1-AGG03_Ethernet1
channel-group 15 mode active
Expand Down
16 changes: 16 additions & 0 deletions ...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ port_channel_interfaces:
vlans: 110-112
trunk_private_vlan_secondary: true

Port-Channel104:
description: LACP fallback individual
mode: trunk
vlans: 112
lacp_fallback_timeout: 300
lacp_fallback_mode: individual

# Children interfaces
ethernet_interfaces:
Ethernet5:
Expand Down Expand Up @@ -250,3 +257,12 @@ ethernet_interfaces:
channel_group:
id: 103
mode: active

Ethernet10/4:
description: LAG Member LACP fallback
channel_group:
id: 104
mode: active
mode: trunk
vlans: 100
spanning_tree_portfast: edge
6 changes: 6 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ethernet-interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@ interface {{ ethernet_interface }}
{% if ethernet_interfaces[ethernet_interface].lacp_timer.multiplier is arista.avd.defined %}
lacp timer multiplier {{ ethernet_interfaces[ethernet_interface].lacp_timer.multiplier }}
{% endif %}
{% if port_channel_interfaces['Port-Channel' ~ ethernet_interfaces[ethernet_interface].channel_group.id].lacp_fallback_mode is arista.avd.defined("individual") %}
{% set print_ethernet = true %}
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
{% else %}
{% set print_ethernet = true %}
{% endif %}
{% if print_ethernet is arista.avd.defined(true) %}
{% if ethernet_interfaces[ethernet_interface].mtu is arista.avd.defined %}
mtu {{ ethernet_interfaces[ethernet_interface].mtu }}
{% endif %}
Expand Down