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

Jump to bottom

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

Merged
merged 4 commits into from
Sep 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c29952
Refactor(eos_designs)!: Combine the VLAN trunk groups used for MLAG
ClausHolbechArista Sep 19, 2024
01a8275
Merge branch 'devel' into refactor/eos_designs/change-mlag-l3-trunk-g…
gmuloc Sep 23, 2024
f086791
Test: Re-run molecule
gmuloc Sep 23, 2024
d50519c
Merge branch 'devel' into refactor/eos_designs/change-mlag-l3-trunk-g…
ClausHolbechArista Sep 23, 2024
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
13 changes: 13 additions & 0 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
11 changes: 5 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
```
Expand Down
11 changes: 5 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
```
Expand Down
3 changes: 1 addition & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
!
Expand Down
3 changes: 1 addition & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
!
Expand Down
3 changes: 1 addition & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ vlans:
tenant: system
name: LEAF_PEER_L3
trunk_groups:
- LEAF_PEER_L3
- MLAG
- id: 4094
tenant: system
name: MLAG_PEER
Expand Down Expand Up @@ -212,7 +212,6 @@ port_channel_interfaces:
mode: trunk
trunk:
groups:
- LEAF_PEER_L3
- MLAG
shutdown: false
- name: Port-Channel1
Expand Down
3 changes: 1 addition & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ vlans:
tenant: system
name: LEAF_PEER_L3
trunk_groups:
- LEAF_PEER_L3
- MLAG
- id: 4094
tenant: system
name: MLAG_PEER
Expand Down Expand Up @@ -212,7 +212,6 @@ port_channel_interfaces:
mode: trunk
trunk:
groups:
- LEAF_PEER_L3
- MLAG
shutdown: false
- name: Port-Channel1
Expand Down
19 changes: 9 additions & 10 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 |

Expand Down Expand Up @@ -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 | - |

Expand All @@ -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
!
Expand Down
19 changes: 9 additions & 10 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 |

Expand Down Expand Up @@ -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 | - |

Expand All @@ -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
!
Expand Down
19 changes: 9 additions & 10 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 |

Expand Down Expand Up @@ -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 | - |

Expand All @@ -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
!
Expand Down
Loading
Loading