Refactor(eos_designs)!: Combine the VLAN trunk groups used for MLAG (#…

…4494)
aristanetworks · Sep 23, 2024 · 59d84e2 · 59d84e2
1 parent 60b28e3
commit 59d84e2
Show file tree

Hide file tree

Showing 270 changed files with 1,459 additions and 1,711 deletions.
diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -396,6 +396,19 @@ The description can be reverted manually if needed:
 +mgmt_interface_description: "oob_management"
 ```
 
+### Combine the VLAN trunk groups used for MLAG
+
+With AVD version 5.0.0 a single `MLAG` trunk group is used for MLAG and MLAG L3 peerings, including the peerings in VRFs.
+Previously MLAG L3 peerings used a separate `LEAF_PEER_L3` trunk group.
+
+The trunk group for MLAG L3 peerings can be reverted if needed:
+
+```diff
++trunk_groups:
++  mlag_l3:
++    name: LEAF_PEER_L3
+```
+
 ### `wan_mode: autovpn` renamed `wan_mode: legacy-autovpn`
 
 With AVD version 5.0.0 the valid values for `wan_mode` key have changed. If using the `autovpn` mode in AVD 4.x, the `wan_mode` key needs to be updated to `legacy-autovpn`.

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md
@@ -255,7 +255,7 @@ vlan internal order ascending range 1006 1199
 | 310 | IDF3-Data | - |
 | 320 | IDF3-Voice | - |
 | 330 | IDF3-Guest | - |
-| 4093 | LEAF_PEER_L3 | LEAF_PEER_L3 |
+| 4093 | LEAF_PEER_L3 | MLAG |
 | 4094 | MLAG_PEER | MLAG |
 
 ### VLANs Device Configuration
@@ -294,7 +294,7 @@ vlan 330
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -315,8 +315,8 @@ vlan 4094
 | Ethernet49/1 | LEAF2A_Ethernet1/1 | *trunk | *10,210,220,230 | *- | *- | 491 |
 | Ethernet50/1 | LEAF3A_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 501 |
 | Ethernet51/1 | LEAF3B_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 501 |
-| Ethernet55/1 | MLAG_PEER_SPINE2_Ethernet55/1 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 551 |
-| Ethernet56/1 | MLAG_PEER_SPINE2_Ethernet56/1 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 551 |
+| Ethernet55/1 | MLAG_PEER_SPINE2_Ethernet55/1 | *trunk | *- | *- | *MLAG | 551 |
+| Ethernet56/1 | MLAG_PEER_SPINE2_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |
 
 *Inherited from Port-Channel Interface
 
@@ -381,7 +381,7 @@ interface Ethernet56/1
 | Port-Channel1 | IDF1_Po51 | trunk | 10,110,120,130 | - | - | - | - | 1 | - |
 | Port-Channel491 | LEAF2A_Po11 | trunk | 10,210,220,230 | - | - | - | - | 491 | - |
 | Port-Channel501 | IDF3_AGG_Po971 | trunk | 10,310,320,330 | - | - | - | - | 501 | - |
-| Port-Channel551 | MLAG_PEER_SPINE2_Po551 | trunk | - | - | LEAF_PEER_L3, MLAG | - | - | - | - |
+| Port-Channel551 | MLAG_PEER_SPINE2_Po551 | trunk | - | - | MLAG | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
@@ -415,7 +415,6 @@ interface Port-Channel551
    description MLAG_PEER_SPINE2_Po551
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 ```

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md
@@ -255,7 +255,7 @@ vlan internal order ascending range 1006 1199
 | 310 | IDF3-Data | - |
 | 320 | IDF3-Voice | - |
 | 330 | IDF3-Guest | - |
-| 4093 | LEAF_PEER_L3 | LEAF_PEER_L3 |
+| 4093 | LEAF_PEER_L3 | MLAG |
 | 4094 | MLAG_PEER | MLAG |
 
 ### VLANs Device Configuration
@@ -294,7 +294,7 @@ vlan 330
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -315,8 +315,8 @@ vlan 4094
 | Ethernet49/1 | LEAF2A_Ethernet1/3 | *trunk | *10,210,220,230 | *- | *- | 491 |
 | Ethernet50/1 | LEAF3A_Ethernet97/2 | *trunk | *10,310,320,330 | *- | *- | 501 |
 | Ethernet51/1 | LEAF3B_Ethernet97/2 | *trunk | *10,310,320,330 | *- | *- | 501 |
-| Ethernet55/1 | MLAG_PEER_SPINE1_Ethernet55/1 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 551 |
-| Ethernet56/1 | MLAG_PEER_SPINE1_Ethernet56/1 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 551 |
+| Ethernet55/1 | MLAG_PEER_SPINE1_Ethernet55/1 | *trunk | *- | *- | *MLAG | 551 |
+| Ethernet56/1 | MLAG_PEER_SPINE1_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |
 
 *Inherited from Port-Channel Interface
 
@@ -381,7 +381,7 @@ interface Ethernet56/1
 | Port-Channel1 | IDF1_Po51 | trunk | 10,110,120,130 | - | - | - | - | 1 | - |
 | Port-Channel491 | LEAF2A_Po11 | trunk | 10,210,220,230 | - | - | - | - | 491 | - |
 | Port-Channel501 | IDF3_AGG_Po971 | trunk | 10,310,320,330 | - | - | - | - | 501 | - |
-| Port-Channel551 | MLAG_PEER_SPINE1_Po551 | trunk | - | - | LEAF_PEER_L3, MLAG | - | - | - | - |
+| Port-Channel551 | MLAG_PEER_SPINE1_Po551 | trunk | - | - | MLAG | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
@@ -415,7 +415,6 @@ interface Port-Channel551
    description MLAG_PEER_SPINE1_Po551
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 ```

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg
@@ -57,7 +57,7 @@ vlan 330
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -95,7 +95,6 @@ interface Port-Channel551
    description MLAG_PEER_SPINE2_Po551
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 !

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg
@@ -57,7 +57,7 @@ vlan 330
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -95,7 +95,6 @@ interface Port-Channel551
    description MLAG_PEER_SPINE1_Po551
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 !

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml
@@ -63,7 +63,7 @@ vlans:
   tenant: system
   name: LEAF_PEER_L3
   trunk_groups:
-  - LEAF_PEER_L3
+  - MLAG
 - id: 4094
   tenant: system
   name: MLAG_PEER
@@ -212,7 +212,6 @@ port_channel_interfaces:
     mode: trunk
     trunk:
       groups:
-      - LEAF_PEER_L3
       - MLAG
   shutdown: false
 - name: Port-Channel1

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml
@@ -63,7 +63,7 @@ vlans:
   tenant: system
   name: LEAF_PEER_L3
   trunk_groups:
-  - LEAF_PEER_L3
+  - MLAG
 - id: 4094
   tenant: system
   name: MLAG_PEER
@@ -212,7 +212,6 @@ port_channel_interfaces:
     mode: trunk
     trunk:
       groups:
-      - LEAF_PEER_L3
       - MLAG
   shutdown: false
 - name: Port-Channel1

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md
@@ -198,11 +198,11 @@ vlan internal order ascending range 1006 1199
 | 12 | VRF10_VLAN12 | - |
 | 21 | VRF11_VLAN21 | - |
 | 22 | VRF11_VLAN22 | - |
-| 3009 | MLAG_iBGP_VRF10 | LEAF_PEER_L3 |
-| 3010 | MLAG_iBGP_VRF11 | LEAF_PEER_L3 |
+| 3009 | MLAG_iBGP_VRF10 | MLAG |
+| 3010 | MLAG_iBGP_VRF11 | MLAG |
 | 3401 | L2_VLAN3401 | - |
 | 3402 | L2_VLAN3402 | - |
-| 4093 | LEAF_PEER_L3 | LEAF_PEER_L3 |
+| 4093 | LEAF_PEER_L3 | MLAG |
 | 4094 | MLAG_PEER | MLAG |
 
 ### VLANs Device Configuration
@@ -223,11 +223,11 @@ vlan 22
 !
 vlan 3009
    name MLAG_iBGP_VRF10
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3010
    name MLAG_iBGP_VRF11
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3401
    name L2_VLAN3401
@@ -237,7 +237,7 @@ vlan 3402
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -254,8 +254,8 @@ vlan 4094
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group |
 | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- |
-| Ethernet3 | MLAG_PEER_dc1-leaf1b_Ethernet3 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
-| Ethernet4 | MLAG_PEER_dc1-leaf1b_Ethernet4 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
+| Ethernet3 | MLAG_PEER_dc1-leaf1b_Ethernet3 | *trunk | *- | *- | *MLAG | 3 |
+| Ethernet4 | MLAG_PEER_dc1-leaf1b_Ethernet4 | *trunk | *- | *- | *MLAG | 3 |
 | Ethernet5 | dc1-leaf1-server1_PCI1 | *trunk | *11-12,21-22 | *4092 | *- | 5 |
 | Ethernet8 | DC1-LEAF1C_Ethernet1 | *trunk | *11-12,21-22,3401-3402 | *- | *- | 8 |
 
@@ -315,7 +315,7 @@ interface Ethernet8
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
 | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
-| Port-Channel3 | MLAG_PEER_dc1-leaf1b_Po3 | trunk | - | - | LEAF_PEER_L3, MLAG | - | - | - | - |
+| Port-Channel3 | MLAG_PEER_dc1-leaf1b_Po3 | trunk | - | - | MLAG | - | - | - | - |
 | Port-Channel5 | dc1-leaf1-server1_PortChannel dc1-leaf1-server1 | trunk | 11-12,21-22 | 4092 | - | - | - | 5 | - |
 | Port-Channel8 | DC1-LEAF1C_Po1 | trunk | 11-12,21-22,3401-3402 | - | - | - | - | 8 | - |
 
@@ -327,7 +327,6 @@ interface Port-Channel3
    description MLAG_PEER_dc1-leaf1b_Po3
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md
@@ -198,11 +198,11 @@ vlan internal order ascending range 1006 1199
 | 12 | VRF10_VLAN12 | - |
 | 21 | VRF11_VLAN21 | - |
 | 22 | VRF11_VLAN22 | - |
-| 3009 | MLAG_iBGP_VRF10 | LEAF_PEER_L3 |
-| 3010 | MLAG_iBGP_VRF11 | LEAF_PEER_L3 |
+| 3009 | MLAG_iBGP_VRF10 | MLAG |
+| 3010 | MLAG_iBGP_VRF11 | MLAG |
 | 3401 | L2_VLAN3401 | - |
 | 3402 | L2_VLAN3402 | - |
-| 4093 | LEAF_PEER_L3 | LEAF_PEER_L3 |
+| 4093 | LEAF_PEER_L3 | MLAG |
 | 4094 | MLAG_PEER | MLAG |
 
 ### VLANs Device Configuration
@@ -223,11 +223,11 @@ vlan 22
 !
 vlan 3009
    name MLAG_iBGP_VRF10
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3010
    name MLAG_iBGP_VRF11
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3401
    name L2_VLAN3401
@@ -237,7 +237,7 @@ vlan 3402
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -254,8 +254,8 @@ vlan 4094
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group |
 | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- |
-| Ethernet3 | MLAG_PEER_dc1-leaf1a_Ethernet3 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
-| Ethernet4 | MLAG_PEER_dc1-leaf1a_Ethernet4 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
+| Ethernet3 | MLAG_PEER_dc1-leaf1a_Ethernet3 | *trunk | *- | *- | *MLAG | 3 |
+| Ethernet4 | MLAG_PEER_dc1-leaf1a_Ethernet4 | *trunk | *- | *- | *MLAG | 3 |
 | Ethernet5 | dc1-leaf1-server1_PCI2 | *trunk | *11-12,21-22 | *4092 | *- | 5 |
 | Ethernet8 | DC1-LEAF1C_Ethernet2 | *trunk | *11-12,21-22,3401-3402 | *- | *- | 8 |
 
@@ -315,7 +315,7 @@ interface Ethernet8
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
 | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
-| Port-Channel3 | MLAG_PEER_dc1-leaf1a_Po3 | trunk | - | - | LEAF_PEER_L3, MLAG | - | - | - | - |
+| Port-Channel3 | MLAG_PEER_dc1-leaf1a_Po3 | trunk | - | - | MLAG | - | - | - | - |
 | Port-Channel5 | dc1-leaf1-server1_PortChannel dc1-leaf1-server1 | trunk | 11-12,21-22 | 4092 | - | - | - | 5 | - |
 | Port-Channel8 | DC1-LEAF1C_Po1 | trunk | 11-12,21-22,3401-3402 | - | - | - | - | 8 | - |
 
@@ -327,7 +327,6 @@ interface Port-Channel3
    description MLAG_PEER_dc1-leaf1a_Po3
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md
@@ -198,11 +198,11 @@ vlan internal order ascending range 1006 1199
 | 12 | VRF10_VLAN12 | - |
 | 21 | VRF11_VLAN21 | - |
 | 22 | VRF11_VLAN22 | - |
-| 3009 | MLAG_iBGP_VRF10 | LEAF_PEER_L3 |
-| 3010 | MLAG_iBGP_VRF11 | LEAF_PEER_L3 |
+| 3009 | MLAG_iBGP_VRF10 | MLAG |
+| 3010 | MLAG_iBGP_VRF11 | MLAG |
 | 3401 | L2_VLAN3401 | - |
 | 3402 | L2_VLAN3402 | - |
-| 4093 | LEAF_PEER_L3 | LEAF_PEER_L3 |
+| 4093 | LEAF_PEER_L3 | MLAG |
 | 4094 | MLAG_PEER | MLAG |
 
 ### VLANs Device Configuration
@@ -223,11 +223,11 @@ vlan 22
 !
 vlan 3009
    name MLAG_iBGP_VRF10
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3010
    name MLAG_iBGP_VRF11
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 3401
    name L2_VLAN3401
@@ -237,7 +237,7 @@ vlan 3402
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group MLAG
 !
 vlan 4094
    name MLAG_PEER
@@ -254,8 +254,8 @@ vlan 4094
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group |
 | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- |
-| Ethernet3 | MLAG_PEER_dc1-leaf2b_Ethernet3 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
-| Ethernet4 | MLAG_PEER_dc1-leaf2b_Ethernet4 | *trunk | *- | *- | *LEAF_PEER_L3, MLAG | 3 |
+| Ethernet3 | MLAG_PEER_dc1-leaf2b_Ethernet3 | *trunk | *- | *- | *MLAG | 3 |
+| Ethernet4 | MLAG_PEER_dc1-leaf2b_Ethernet4 | *trunk | *- | *- | *MLAG | 3 |
 | Ethernet5 | dc1-leaf2-server1_PCI1 | *trunk | *11-12,21-22 | *4092 | *- | 5 |
 | Ethernet8 | DC1-LEAF2C_Ethernet1 | *trunk | *11-12,21-22,3401-3402 | *- | *- | 8 |
 
@@ -323,7 +323,7 @@ interface Ethernet8
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
 | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
-| Port-Channel3 | MLAG_PEER_dc1-leaf2b_Po3 | trunk | - | - | LEAF_PEER_L3, MLAG | - | - | - | - |
+| Port-Channel3 | MLAG_PEER_dc1-leaf2b_Po3 | trunk | - | - | MLAG | - | - | - | - |
 | Port-Channel5 | dc1-leaf2-server1_PortChannel dc1-leaf2-server1 | trunk | 11-12,21-22 | 4092 | - | - | - | 5 | - |
 | Port-Channel8 | DC1-LEAF2C_Po1 | trunk | 11-12,21-22,3401-3402 | - | - | - | - | 8 | - |
 
@@ -335,7 +335,6 @@ interface Port-Channel3
    description MLAG_PEER_dc1-leaf2b_Po3
    no shutdown
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
 !