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)!: Change default mlag interface descriptions #4464

Merged
merged 5 commits into from
Sep 24, 2024
Merged

Refactor(eos_designs)!: Change default mlag interface descriptions #4464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc48d9a
Refactor(eos_designs)!: Change default mlag interface descriptions
ClausHolbechArista Sep 13, 2024
c172994
Merge branch 'devel' into refactor/eos_designs/mlag-descriptions
ClausHolbechArista Sep 24, 2024
78e3de9
Merge branch 'devel' into refactor/eos_designs/mlag-descriptions
gmuloc Sep 24, 2024
b7c4ee8
Update ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
gmuloc Sep 24, 2024
b421d9f
Merge branch 'devel' into refactor/eos_designs/mlag-descriptions
carlbuchmann Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 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 @@ -480,6 +480,28 @@ To retain the old descriptions, the value of the `description` key under `port_c
+default_network_ports_port_channel_description: "{adapter_description_or_endpoint}{endpoint_port_channel?<_}"
```

#### MLAG peer-link ethernet interfaces

The interface description for the MLAG peer-link ethernet interfaces changes to `MLAG_{mlag_peer}_{peer_interface}`.
Previously the description was `MLAG_PEER_{mlag_peer}_{interface}` so using the local interface instead of the peer's. Most often the MLAG interfaces are the same, so this is a minor issue.

The description can be reverted manually if needed:

```diff
+mlag_member_description: "MLAG_PEER_{mlag_peer}_{interface}"
```

#### MLAG peer-link port-channel interfaces

The interface description for the MLAG peer-link port-channel interfaces changes to `MLAG_{mlag_peer}_{peer_interface}`.
Previously the description was `MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}` so using the local port-channel ID instead of the peer's. Most often the MLAG interfaces are the same, so this is a minor issue.

The description can be reverted manually if needed:

```diff
+mlag_port_channel_description: "MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}"
```

### 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
12 changes: 6 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ vlan 4094
| Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet51 | SPINE1_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
| Ethernet53 | MLAG_PEER_LEAF1B_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_PEER_LEAF1B_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet53 | MLAG_LEAF1B_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_LEAF1B_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -1358,12 +1358,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1B_Ethernet53
description MLAG_LEAF1B_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1B_Ethernet54
description MLAG_LEAF1B_Ethernet54
no shutdown
channel-group 53 mode active
```
Expand All @@ -1377,7 +1377,7 @@ interface Ethernet54
| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel51 | SPINES_Po1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
| Port-Channel53 | MLAG_PEER_LEAF1B_Po53 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel53 | MLAG_LEAF1B_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand All @@ -1392,7 +1392,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1B_Po53
description MLAG_LEAF1B_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
12 changes: 6 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ vlan 4094
| Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet51 | SPINE2_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
| Ethernet53 | MLAG_PEER_LEAF1A_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_PEER_LEAF1A_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet53 | MLAG_LEAF1A_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_LEAF1A_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -1358,12 +1358,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1A_Ethernet53
description MLAG_LEAF1A_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1A_Ethernet54
description MLAG_LEAF1A_Ethernet54
no shutdown
channel-group 53 mode active
```
Expand All @@ -1377,7 +1377,7 @@ interface Ethernet54
| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel51 | SPINES_Po1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
| Port-Channel53 | MLAG_PEER_LEAF1A_Po53 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel53 | MLAG_LEAF1A_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand All @@ -1392,7 +1392,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1A_Po53
description MLAG_LEAF1A_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
12 changes: 6 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ vlan 4094
| Ethernet97/3 | LEAF3C_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 973 |
| Ethernet97/4 | LEAF3D_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 974 |
| Ethernet98/1 | LEAF3E_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 981 |
| Ethernet98/3 | MLAG_PEER_LEAF3B_Ethernet98/3 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/4 | MLAG_PEER_LEAF3B_Ethernet98/4 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/3 | MLAG_LEAF3B_Ethernet98/3 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/4 | MLAG_LEAF3B_Ethernet98/4 | *trunk | *- | *- | *MLAG | 983 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -2438,12 +2438,12 @@ interface Ethernet98/1
channel-group 981 mode active
!
interface Ethernet98/3
description MLAG_PEER_LEAF3B_Ethernet98/3
description MLAG_LEAF3B_Ethernet98/3
no shutdown
channel-group 983 mode active
!
interface Ethernet98/4
description MLAG_PEER_LEAF3B_Ethernet98/4
description MLAG_LEAF3B_Ethernet98/4
no shutdown
channel-group 983 mode active
```
Expand All @@ -2460,7 +2460,7 @@ interface Ethernet98/4
| Port-Channel973 | LEAF3C_Po971 | trunk | 10,310,320,330 | - | - | - | - | 973 | - |
| Port-Channel974 | LEAF3D_Po971 | trunk | 10,310,320,330 | - | - | - | - | 974 | - |
| Port-Channel981 | LEAF3E_Po971 | trunk | 10,310,320,330 | - | - | - | - | 981 | - |
| Port-Channel983 | MLAG_PEER_LEAF3B_Po983 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel983 | MLAG_LEAF3B_Port-Channel983 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand Down Expand Up @@ -2499,7 +2499,7 @@ interface Port-Channel981
mlag 981
!
interface Port-Channel983
description MLAG_PEER_LEAF3B_Po983
description MLAG_LEAF3B_Port-Channel983
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
12 changes: 6 additions & 6 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ vlan 4094
| Ethernet97/3 | LEAF3C_Ethernet97/2 | *trunk | *10,310,320,330 | *- | *- | 973 |
| Ethernet97/4 | LEAF3D_Ethernet97/2 | *trunk | *10,310,320,330 | *- | *- | 974 |
| Ethernet98/1 | LEAF3E_Ethernet97/2 | *trunk | *10,310,320,330 | *- | *- | 981 |
| Ethernet98/3 | MLAG_PEER_LEAF3A_Ethernet98/3 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/4 | MLAG_PEER_LEAF3A_Ethernet98/4 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/3 | MLAG_LEAF3A_Ethernet98/3 | *trunk | *- | *- | *MLAG | 983 |
| Ethernet98/4 | MLAG_LEAF3A_Ethernet98/4 | *trunk | *- | *- | *MLAG | 983 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -2438,12 +2438,12 @@ interface Ethernet98/1
channel-group 981 mode active
!
interface Ethernet98/3
description MLAG_PEER_LEAF3A_Ethernet98/3
description MLAG_LEAF3A_Ethernet98/3
no shutdown
channel-group 983 mode active
!
interface Ethernet98/4
description MLAG_PEER_LEAF3A_Ethernet98/4
description MLAG_LEAF3A_Ethernet98/4
no shutdown
channel-group 983 mode active
```
Expand All @@ -2460,7 +2460,7 @@ interface Ethernet98/4
| Port-Channel973 | LEAF3C_Po971 | trunk | 10,310,320,330 | - | - | - | - | 973 | - |
| Port-Channel974 | LEAF3D_Po971 | trunk | 10,310,320,330 | - | - | - | - | 974 | - |
| Port-Channel981 | LEAF3E_Po971 | trunk | 10,310,320,330 | - | - | - | - | 981 | - |
| Port-Channel983 | MLAG_PEER_LEAF3A_Po983 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel983 | MLAG_LEAF3A_Port-Channel983 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand Down Expand Up @@ -2499,7 +2499,7 @@ interface Port-Channel981
mlag 981
!
interface Port-Channel983
description MLAG_PEER_LEAF3A_Po983
description MLAG_LEAF3A_Port-Channel983
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
12 changes: 6 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 @@ -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 | *- | *- | *MLAG | 551 |
| Ethernet56/1 | MLAG_PEER_SPINE2_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |
| Ethernet55/1 | MLAG_SPINE2_Ethernet55/1 | *trunk | *- | *- | *MLAG | 551 |
| Ethernet56/1 | MLAG_SPINE2_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -360,12 +360,12 @@ interface Ethernet52/1
ip ospf area 0.0.0.0
!
interface Ethernet55/1
description MLAG_PEER_SPINE2_Ethernet55/1
description MLAG_SPINE2_Ethernet55/1
no shutdown
channel-group 551 mode active
!
interface Ethernet56/1
description MLAG_PEER_SPINE2_Ethernet56/1
description MLAG_SPINE2_Ethernet56/1
no shutdown
channel-group 551 mode active
```
Expand All @@ -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 | - | - | MLAG | - | - | - | - |
| Port-Channel551 | MLAG_SPINE2_Port-Channel551 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand Down Expand Up @@ -412,7 +412,7 @@ interface Port-Channel501
mlag 501
!
interface Port-Channel551
description MLAG_PEER_SPINE2_Po551
description MLAG_SPINE2_Port-Channel551
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
12 changes: 6 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 @@ -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 | *- | *- | *MLAG | 551 |
| Ethernet56/1 | MLAG_PEER_SPINE1_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |
| Ethernet55/1 | MLAG_SPINE1_Ethernet55/1 | *trunk | *- | *- | *MLAG | 551 |
| Ethernet56/1 | MLAG_SPINE1_Ethernet56/1 | *trunk | *- | *- | *MLAG | 551 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -360,12 +360,12 @@ interface Ethernet52/1
ip ospf area 0.0.0.0
!
interface Ethernet55/1
description MLAG_PEER_SPINE1_Ethernet55/1
description MLAG_SPINE1_Ethernet55/1
no shutdown
channel-group 551 mode active
!
interface Ethernet56/1
description MLAG_PEER_SPINE1_Ethernet56/1
description MLAG_SPINE1_Ethernet56/1
no shutdown
channel-group 551 mode active
```
Expand All @@ -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 | - | - | MLAG | - | - | - | - |
| Port-Channel551 | MLAG_SPINE1_Port-Channel551 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand Down Expand Up @@ -412,7 +412,7 @@ interface Port-Channel501
mlag 501
!
interface Port-Channel551
description MLAG_PEER_SPINE1_Po551
description MLAG_SPINE1_Port-Channel551
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down
6 changes: 3 additions & 3 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1B_Po53
description MLAG_LEAF1B_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down Expand Up @@ -1026,12 +1026,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1B_Ethernet53
description MLAG_LEAF1B_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1B_Ethernet54
description MLAG_LEAF1B_Ethernet54
no shutdown
channel-group 53 mode active
!
Expand Down
6 changes: 3 additions & 3 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1A_Po53
description MLAG_LEAF1A_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down Expand Up @@ -1026,12 +1026,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1A_Ethernet53
description MLAG_LEAF1A_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1A_Ethernet54
description MLAG_LEAF1A_Ethernet54
no shutdown
channel-group 53 mode active
!
Expand Down
6 changes: 3 additions & 3 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ interface Port-Channel981
mlag 981
!
interface Port-Channel983
description MLAG_PEER_LEAF3B_Po983
description MLAG_LEAF3B_Port-Channel983
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down Expand Up @@ -2030,12 +2030,12 @@ interface Ethernet98/1
channel-group 981 mode active
!
interface Ethernet98/3
description MLAG_PEER_LEAF3B_Ethernet98/3
description MLAG_LEAF3B_Ethernet98/3
no shutdown
channel-group 983 mode active
!
interface Ethernet98/4
description MLAG_PEER_LEAF3B_Ethernet98/4
description MLAG_LEAF3B_Ethernet98/4
no shutdown
channel-group 983 mode active
!
Expand Down
6 changes: 3 additions & 3 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ interface Port-Channel981
mlag 981
!
interface Port-Channel983
description MLAG_PEER_LEAF3A_Po983
description MLAG_LEAF3A_Port-Channel983
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand Down Expand Up @@ -2030,12 +2030,12 @@ interface Ethernet98/1
channel-group 981 mode active
!
interface Ethernet98/3
description MLAG_PEER_LEAF3A_Ethernet98/3
description MLAG_LEAF3A_Ethernet98/3
no shutdown
channel-group 983 mode active
!
interface Ethernet98/4
description MLAG_PEER_LEAF3A_Ethernet98/4
description MLAG_LEAF3A_Ethernet98/4
no shutdown
channel-group 983 mode active
!
Expand Down
Loading
Loading