Fix L2 leaves uplinks when MLAG is not desired

[ksator]

Change Summary

L2 leaf uplinks with LAG without MLAG

This template includes

{% include 'l3leaf_l2leafs_uplinks/l2leaf-port-channel-uplinks.j2' %}

And the template /3leaf_l2leafs_uplinks/l2leaf-port-channel-uplinks.j2 was always using mlag regardless if mlag was configured or not

  Port-Channel{{ channel_group_id }}:
    description: {{ parent_l3leafs[loop.index0]}}_{{ 'Po' + l3leaf.channel_group_id }}
    vlans: {{ leaf.vlans | arista.avd.list_compress }}
    mode: trunk
    mlag: {{ channel_group_id }}

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Code style update (formatting, renaming)
• Refactoring (no functional changes)
• Documentation content changes
• Other (please describe):

Related Issue(s)

#543

Component(s) name

role eos_l3ls_evpn
template /3leaf_l2leafs_uplinks/l2leaf-port-channel-uplinks.j2

Proposed changes

update template /3leaf_l2leafs_uplinks/l2leaf-port-channel-uplinks.j2

{%             if leaf.mlag == true %}
    mlag: {{ channel_group_id }}
{%             endif %}

How to test

run the role eos_l3ls_evpn with and without mlag for l2leaf

without mlag

l2leaf:
  defaults:
    platform: vEOS-LAB
    # Parent L3 switches (list)
    parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
    # Uplink interfaces (list), interface located on L2 Leaf,
    uplink_interfaces: [ Ethernet1, Ethernet2 ]
    mlag: false
  node_groups:
    DC1_L2LEAF1:
      parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
      nodes:
        DC1-L2LEAF1A:
          id: 5
          mgmt_ip: 10.73.1.117/24
          l3leaf_interfaces: [ Ethernet3, Ethernet3 ]
    DC1_L2LEAF2:
      parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
      nodes:
        DC1-L2LEAF2A:
          id: 7
          mgmt_ip: 10.73.1.118/24
          l3leaf_interfaces: [ Ethernet4, Ethernet4 ]

expect result

port_channel_interfaces:
  Port-Channel1:
    description: DC1-LEAF1A_Po3
    vlans: 110-112,120-121,140-141,150,310-311,350,400-402
    mode: trunk

interface Port-Channel1
   description DC1-LEAF1A_Po3
   switchport trunk allowed vlan 110-112,120-121,140-141,150,310-311,350,400-402
   switchport mode trunk

with mlag

l2leaf:
  defaults:
    platform: vEOS-LAB
    # Parent L3 switches (list)
    parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
    # Uplink interfaces (list), interface located on L2 Leaf,
    uplink_interfaces: [ Ethernet1, Ethernet2 ]
    mlag: true
    # MLAG interfaces (list)
    mlag_interfaces: [ Ethernet7, Ethernet8 ]
  node_groups:
    DC1_L2LEAF1:
      parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
      nodes:
        DC1-L2LEAF1A:
          id: 5
          mgmt_ip: 10.73.1.117/24
          l3leaf_interfaces: [ Ethernet3, Ethernet3 ]
    DC1_L2LEAF2:
      parent_l3leafs: [ DC1-LEAF1A, DC1-LEAF1B ]
      nodes:
        DC1-L2LEAF2A:
          id: 7
          mgmt_ip: 10.73.1.118/24
          l3leaf_interfaces: [ Ethernet4, Ethernet4 ]

expect results:

interface Port-Channel1
   description DC1-LEAF1A_Po3
   switchport trunk allowed vlan 110-112,120-121,140-141,150,310-311,350,400-402
   switchport mode trunk
   mlag 1

Checklist:

• I have read the CONTRIBUTING document.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• All new and existing tests passed (pre-commit, make linting and make sanity-lint).
• I have updated molecule CI testing accordingly

[carlbuchmann]

LGTM! Validated with avd validation lab!

[titom73]

cherry-picked to pre-release branch: https://github.com/titom73/ansible-avd/tree/release-v1.1.3-preparation