Skip to content

Commit

Permalink
Refactor(eos_designs)!: Change default BGP peer descriptions (#4517)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausHolbechArista authored Sep 27, 2024
1 parent abfe124 commit a784bf5
Show file tree
Hide file tree
Showing 554 changed files with 3,052 additions and 2,779 deletions.
26 changes: 26 additions & 0 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,32 @@ The name can be reverted manually if needed:

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

### Default BGP peer descriptions are changed for more consistency

#### MLAG L3 peering

The description of the MLAG L3 BGP peers, including those in VRFs, changes to `{mlag_peer}_{peer_interface}`. Previously the description was `{mlag_peer}`.

The description can be reverted manually if needed:

```diff
+mlag_bgp_peer_description: "{mlag_peer}"
```

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

#### Overlay peerings

The description of the overlay BGP peers (EVPN, MPLS, WAN) changes to `{peer}{peer_interface?<_}`. Previously the description was `{peer}`.

The description can be reverted manually if needed:

```diff
+overlay_bgp_peer_description: "{peer}"
```

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
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,12 @@ router bgp 65101
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.1 remote-as 65100
neighbor 10.255.0.1 description dc1-spine1
neighbor 10.255.0.1 description dc1-spine1_Loopback0
neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.2 remote-as 65100
neighbor 10.255.0.2 description dc1-spine2
neighbor 10.255.0.2 description dc1-spine2_Loopback0
neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.97 description dc1-leaf1b
neighbor 10.255.1.97 description dc1-leaf1b_Vlan4093
neighbor 10.255.255.0 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.0 remote-as 65100
neighbor 10.255.255.0 description dc1-spine1_Ethernet1
Expand Down Expand Up @@ -771,7 +771,7 @@ router bgp 65101
route-target export evpn 10:10
router-id 10.255.0.3
neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.97 description dc1-leaf1b
neighbor 10.255.1.97 description dc1-leaf1b_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -780,7 +780,7 @@ router bgp 65101
route-target export evpn 11:11
router-id 10.255.0.3
neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.97 description dc1-leaf1b
neighbor 10.255.1.97 description dc1-leaf1b_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,12 @@ router bgp 65101
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.1 remote-as 65100
neighbor 10.255.0.1 description dc1-spine1
neighbor 10.255.0.1 description dc1-spine1_Loopback0
neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.2 remote-as 65100
neighbor 10.255.0.2 description dc1-spine2
neighbor 10.255.0.2 description dc1-spine2_Loopback0
neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.96 description dc1-leaf1a
neighbor 10.255.1.96 description dc1-leaf1a_Vlan4093
neighbor 10.255.255.4 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.4 remote-as 65100
neighbor 10.255.255.4 description dc1-spine1_Ethernet2
Expand Down Expand Up @@ -771,7 +771,7 @@ router bgp 65101
route-target export evpn 10:10
router-id 10.255.0.4
neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.96 description dc1-leaf1a
neighbor 10.255.1.96 description dc1-leaf1a_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -780,7 +780,7 @@ router bgp 65101
route-target export evpn 11:11
router-id 10.255.0.4
neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.96 description dc1-leaf1a
neighbor 10.255.1.96 description dc1-leaf1a_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -749,15 +749,15 @@ router bgp 65102
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.1 remote-as 65100
neighbor 10.255.0.1 description dc1-spine1
neighbor 10.255.0.1 description dc1-spine1_Loopback0
neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.2 remote-as 65100
neighbor 10.255.0.2 description dc1-spine2
neighbor 10.255.0.2 description dc1-spine2_Loopback0
neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.101 description dc1-leaf2b
neighbor 10.255.1.101 description dc1-leaf2b_Vlan4093
neighbor 10.255.128.15 peer group EVPN-OVERLAY-CORE
neighbor 10.255.128.15 remote-as 65202
neighbor 10.255.128.15 description dc2-leaf2a
neighbor 10.255.128.15 description dc2-leaf2a_Loopback0
neighbor 10.255.255.8 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.8 remote-as 65100
neighbor 10.255.255.8 description dc1-spine1_Ethernet3
Expand Down Expand Up @@ -829,7 +829,7 @@ router bgp 65102
route-target export evpn 10:10
router-id 10.255.0.5
neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.101 description dc1-leaf2b
neighbor 10.255.1.101 description dc1-leaf2b_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -838,7 +838,7 @@ router bgp 65102
route-target export evpn 11:11
router-id 10.255.0.5
neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.101 description dc1-leaf2b
neighbor 10.255.1.101 description dc1-leaf2b_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -749,15 +749,15 @@ router bgp 65102
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.1 remote-as 65100
neighbor 10.255.0.1 description dc1-spine1
neighbor 10.255.0.1 description dc1-spine1_Loopback0
neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.2 remote-as 65100
neighbor 10.255.0.2 description dc1-spine2
neighbor 10.255.0.2 description dc1-spine2_Loopback0
neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.100 description dc1-leaf2a
neighbor 10.255.1.100 description dc1-leaf2a_Vlan4093
neighbor 10.255.128.16 peer group EVPN-OVERLAY-CORE
neighbor 10.255.128.16 remote-as 65202
neighbor 10.255.128.16 description dc2-leaf2b
neighbor 10.255.128.16 description dc2-leaf2b_Loopback0
neighbor 10.255.255.12 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.12 remote-as 65100
neighbor 10.255.255.12 description dc1-spine1_Ethernet4
Expand Down Expand Up @@ -829,7 +829,7 @@ router bgp 65102
route-target export evpn 10:10
router-id 10.255.0.6
neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.100 description dc1-leaf2a
neighbor 10.255.1.100 description dc1-leaf2a_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -838,7 +838,7 @@ router bgp 65102
route-target export evpn 11:11
router-id 10.255.0.6
neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.1.100 description dc1-leaf2a
neighbor 10.255.1.100 description dc1-leaf2a_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,16 +351,16 @@ router bgp 65100
neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.3 remote-as 65101
neighbor 10.255.0.3 description dc1-leaf1a
neighbor 10.255.0.3 description dc1-leaf1a_Loopback0
neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.4 remote-as 65101
neighbor 10.255.0.4 description dc1-leaf1b
neighbor 10.255.0.4 description dc1-leaf1b_Loopback0
neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.5 remote-as 65102
neighbor 10.255.0.5 description dc1-leaf2a
neighbor 10.255.0.5 description dc1-leaf2a_Loopback0
neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.6 remote-as 65102
neighbor 10.255.0.6 description dc1-leaf2b
neighbor 10.255.0.6 description dc1-leaf2b_Loopback0
neighbor 10.255.255.1 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.1 remote-as 65101
neighbor 10.255.255.1 description dc1-leaf1a_Ethernet1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,16 +351,16 @@ router bgp 65100
neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.3 remote-as 65101
neighbor 10.255.0.3 description dc1-leaf1a
neighbor 10.255.0.3 description dc1-leaf1a_Loopback0
neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.4 remote-as 65101
neighbor 10.255.0.4 description dc1-leaf1b
neighbor 10.255.0.4 description dc1-leaf1b_Loopback0
neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.5 remote-as 65102
neighbor 10.255.0.5 description dc1-leaf2a
neighbor 10.255.0.5 description dc1-leaf2a_Loopback0
neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.0.6 remote-as 65102
neighbor 10.255.0.6 description dc1-leaf2b
neighbor 10.255.0.6 description dc1-leaf2b_Loopback0
neighbor 10.255.255.3 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.3 remote-as 65101
neighbor 10.255.255.3 description dc1-leaf1a_Ethernet2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,12 @@ router bgp 65201
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.11 remote-as 65200
neighbor 10.255.128.11 description dc2-spine1
neighbor 10.255.128.11 description dc2-spine1_Loopback0
neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.12 remote-as 65200
neighbor 10.255.128.12 description dc2-spine2
neighbor 10.255.128.12 description dc2-spine2_Loopback0
neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.117 description dc2-leaf1b
neighbor 10.255.129.117 description dc2-leaf1b_Vlan4093
neighbor 10.255.255.104 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.104 remote-as 65200
neighbor 10.255.255.104 description dc2-spine1_Ethernet1
Expand Down Expand Up @@ -771,7 +771,7 @@ router bgp 65201
route-target export evpn 10:10
router-id 10.255.128.13
neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.117 description dc2-leaf1b
neighbor 10.255.129.117 description dc2-leaf1b_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -780,7 +780,7 @@ router bgp 65201
route-target export evpn 11:11
router-id 10.255.128.13
neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.117 description dc2-leaf1b
neighbor 10.255.129.117 description dc2-leaf1b_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,12 @@ router bgp 65201
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.11 remote-as 65200
neighbor 10.255.128.11 description dc2-spine1
neighbor 10.255.128.11 description dc2-spine1_Loopback0
neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.12 remote-as 65200
neighbor 10.255.128.12 description dc2-spine2
neighbor 10.255.128.12 description dc2-spine2_Loopback0
neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.116 description dc2-leaf1a
neighbor 10.255.129.116 description dc2-leaf1a_Vlan4093
neighbor 10.255.255.108 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.108 remote-as 65200
neighbor 10.255.255.108 description dc2-spine1_Ethernet2
Expand Down Expand Up @@ -771,7 +771,7 @@ router bgp 65201
route-target export evpn 10:10
router-id 10.255.128.14
neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.116 description dc2-leaf1a
neighbor 10.255.129.116 description dc2-leaf1a_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -780,7 +780,7 @@ router bgp 65201
route-target export evpn 11:11
router-id 10.255.128.14
neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.116 description dc2-leaf1a
neighbor 10.255.129.116 description dc2-leaf1a_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -749,15 +749,15 @@ router bgp 65202
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.5 peer group EVPN-OVERLAY-CORE
neighbor 10.255.0.5 remote-as 65102
neighbor 10.255.0.5 description dc1-leaf2a
neighbor 10.255.0.5 description dc1-leaf2a_Loopback0
neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.11 remote-as 65200
neighbor 10.255.128.11 description dc2-spine1
neighbor 10.255.128.11 description dc2-spine1_Loopback0
neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.12 remote-as 65200
neighbor 10.255.128.12 description dc2-spine2
neighbor 10.255.128.12 description dc2-spine2_Loopback0
neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.121 description dc2-leaf2b
neighbor 10.255.129.121 description dc2-leaf2b_Vlan4093
neighbor 10.255.255.112 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.112 remote-as 65200
neighbor 10.255.255.112 description dc2-spine1_Ethernet3
Expand Down Expand Up @@ -829,7 +829,7 @@ router bgp 65202
route-target export evpn 10:10
router-id 10.255.128.15
neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.121 description dc2-leaf2b
neighbor 10.255.129.121 description dc2-leaf2b_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -838,7 +838,7 @@ router bgp 65202
route-target export evpn 11:11
router-id 10.255.128.15
neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.121 description dc2-leaf2b
neighbor 10.255.129.121 description dc2-leaf2b_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -749,15 +749,15 @@ router bgp 65202
neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
neighbor 10.255.0.6 peer group EVPN-OVERLAY-CORE
neighbor 10.255.0.6 remote-as 65102
neighbor 10.255.0.6 description dc1-leaf2b
neighbor 10.255.0.6 description dc1-leaf2b_Loopback0
neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.11 remote-as 65200
neighbor 10.255.128.11 description dc2-spine1
neighbor 10.255.128.11 description dc2-spine1_Loopback0
neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.12 remote-as 65200
neighbor 10.255.128.12 description dc2-spine2
neighbor 10.255.128.12 description dc2-spine2_Loopback0
neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.120 description dc2-leaf2a
neighbor 10.255.129.120 description dc2-leaf2a_Vlan4093
neighbor 10.255.255.116 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.116 remote-as 65200
neighbor 10.255.255.116 description dc2-spine1_Ethernet4
Expand Down Expand Up @@ -829,7 +829,7 @@ router bgp 65202
route-target export evpn 10:10
router-id 10.255.128.16
neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.120 description dc2-leaf2a
neighbor 10.255.129.120 description dc2-leaf2a_Vlan3009
redistribute connected
!
vrf VRF11
Expand All @@ -838,7 +838,7 @@ router bgp 65202
route-target export evpn 11:11
router-id 10.255.128.16
neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER
neighbor 10.255.129.120 description dc2-leaf2a
neighbor 10.255.129.120 description dc2-leaf2a_Vlan3010
redistribute connected
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,16 +351,16 @@ router bgp 65200
neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
neighbor 10.255.128.13 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.13 remote-as 65201
neighbor 10.255.128.13 description dc2-leaf1a
neighbor 10.255.128.13 description dc2-leaf1a_Loopback0
neighbor 10.255.128.14 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.14 remote-as 65201
neighbor 10.255.128.14 description dc2-leaf1b
neighbor 10.255.128.14 description dc2-leaf1b_Loopback0
neighbor 10.255.128.15 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.15 remote-as 65202
neighbor 10.255.128.15 description dc2-leaf2a
neighbor 10.255.128.15 description dc2-leaf2a_Loopback0
neighbor 10.255.128.16 peer group EVPN-OVERLAY-PEERS
neighbor 10.255.128.16 remote-as 65202
neighbor 10.255.128.16 description dc2-leaf2b
neighbor 10.255.128.16 description dc2-leaf2b_Loopback0
neighbor 10.255.255.105 peer group IPv4-UNDERLAY-PEERS
neighbor 10.255.255.105 remote-as 65201
neighbor 10.255.255.105 description dc2-leaf1a_Ethernet1
Expand Down
Loading

0 comments on commit a784bf5

Please sign in to comment.