Fix(eos_cli_config_gen): Port-channel can use LACP fallback configura…

…tion on physical interface (#1335)
aristanetworks · Dec 3, 2021 · 0c40b5d · 0c40b5d
1 parent bd8f730
commit 0c40b5d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
@@ -78,6 +78,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 |
@@ -124,6 +125,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
@@ -166,6 +175,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
 
@@ -336,6 +346,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

diff --git a/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg b/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
@@ -145,6 +145,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
@@ -174,6 +182,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

diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml
@@ -163,6 +163,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:
@@ -260,3 +267,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
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ethernet-interfaces.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ethernet-interfaces.j2
@@ -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 %}
+{%         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 %}