Skip to content

Commit

Permalink
Refactor(eos_designs)!: Change MLAG L3 VRF VLAN names and SVI descrip…
Browse files Browse the repository at this point in the history 
…tions (aristanetworks#4514)

Co-authored-by: Guillaume Mulocher <[email protected]>
  • Loading branch information
@ClausHolbechArista @gmuloc
ClausHolbechArista and gmuloc authored Sep 26, 2024
1 parent 43ff91b commit 0291d26
Show file tree
Hide file tree
Showing 192 changed files with 1,856 additions and 1,709 deletions.
24 changes: 24 additions & 0 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,18 @@ The description can be reverted manually if needed:

The description setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 VRF peering VLAN interface

The interface description for the MLAG L3 VRF peering SVI changes to `MLAG_L3_VRF_{vrf}`. Previously the description was `MLAG_PEER_L3_iBGP: vrf {vrf}`.

The description can be reverted manually if needed:

```diff
+mlag_peer_l3_vrf_svi_description: "MLAG_PEER_L3_iBGP: vrf {vrf}"
```

The description setting supports a template. See the input variables documentation for available fields.

### Default VLAN names are changed for more consistency

#### MLAG peer VLAN
Expand All @@ -552,6 +564,18 @@ The name can be reverted manually if needed:

The setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 VRF peering VLAN

The name of the MLAG L3 VRF peering VLAN changes to `MLAG_L3_VRF_{vrf}`. Previously the name was `MLAG_iBGP_{vrf}`.

The name can be reverted manually if needed:

```diff
+mlag_peer_l3_vrf_vlan_name: "MLAG_iBGP_{vrf}"
```

The setting supports a template. See the input variables documentation for available fields.

### 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.
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -408,8 +408,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -455,14 +455,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.1.96/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -408,8 +408,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -455,14 +455,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.1.97/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -416,8 +416,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -463,14 +463,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.1.100/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -416,8 +416,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -463,14 +463,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.1.101/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -408,8 +408,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -455,14 +455,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.129.116/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ vlan internal order ascending range 1006 1199
| 12 | VRF10_VLAN12 | - |
| 21 | VRF11_VLAN21 | - |
| 22 | VRF11_VLAN22 | - |
| 3009 | MLAG_iBGP_VRF10 | MLAG |
| 3010 | MLAG_iBGP_VRF11 | MLAG |
| 3009 | MLAG_L3_VRF_VRF10 | MLAG |
| 3010 | MLAG_L3_VRF_VRF11 | MLAG |
| 3401 | L2_VLAN3401 | - |
| 3402 | L2_VLAN3402 | - |
| 4093 | MLAG_L3 | MLAG |
Expand All @@ -222,11 +222,11 @@ vlan 22
name VRF11_VLAN22
!
vlan 3009
name MLAG_iBGP_VRF10
name MLAG_L3_VRF_VRF10
trunk group MLAG
!
vlan 3010
name MLAG_iBGP_VRF11
name MLAG_L3_VRF_VRF11
trunk group MLAG
!
vlan 3401
Expand Down Expand Up @@ -408,8 +408,8 @@ interface Loopback11
| Vlan12 | VRF10_VLAN12 | VRF10 | - | False |
| Vlan21 | VRF11_VLAN21 | VRF11 | - | False |
| Vlan22 | VRF11_VLAN22 | VRF11 | - | False |
| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False |
| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False |
| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False |
| Vlan4093 | MLAG_L3 | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

Expand Down Expand Up @@ -455,14 +455,14 @@ interface Vlan22
ip address virtual 10.10.22.1/24
!
interface Vlan3009
description MLAG_PEER_L3_iBGP: vrf VRF10
description MLAG_L3_VRF_VRF10
no shutdown
mtu 1500
vrf VRF10
ip address 10.255.129.117/31
!
interface Vlan3010
description MLAG_PEER_L3_iBGP: vrf VRF11
description MLAG_L3_VRF_VRF11
no shutdown
mtu 1500
vrf VRF11
Expand Down
Loading

0 comments on commit 0291d26

Please sign in to comment.