Skip to content

Commit 9c89950

Browse files
ClausHolbechAristagmuloccarl-baillargeon
authored
Fix(eos_designs): EVPN gateway with overlay_routing_protocol ibgp (#6738)
Co-authored-by: Guillaume Mulocher <gmulocher@arista.com> Co-authored-by: Carl Baillargeon <carl.baillargeon@arista.com>
1 parent 78ff6bd commit 9c89950

9 files changed

Lines changed: 215 additions & 67 deletions

File tree

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/inventory/group_vars/BGP_PEER_GROUPS.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ l3leaf:
116116
mlag_peer_l3_vlan_structured_config:
117117
description: "Description from mlag_peer_l3_vlan_structured_config."
118118
uplink_switch_interfaces: [Ethernet1]
119-
evpn_gateway:
120-
evpn_l3:
121-
enabled: true
122119
- name: bgp-peer-groups-2
123120
id: 104
124121
# bgp_as: 104

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,17 @@ ASN Notation: asplain
646646

647647
#### Router BGP Peer Groups
648648

649+
##### EVPN-OVERLAY-CORE
650+
651+
| Settings | Value |
652+
| -------- | ----- |
653+
| Address Family | evpn |
654+
| Source | Loopback0 |
655+
| BFD | True |
656+
| Ebgp multihop | 15 |
657+
| Send community | all |
658+
| Maximum routes | 0 (no limit) |
659+
649660
##### OVERLAY-PEERS
650661

651662
| Settings | Value |
@@ -661,6 +672,7 @@ ASN Notation: asplain
661672

662673
| Neighbor | Remote AS | VRF | Shutdown | Send-community | Maximum-routes | Allowas-in | BFD | RIB Pre-Policy Retain | Route-Reflector Client | Passive | TTL Max Hops |
663674
| -------- | --------- | --- | -------- | -------------- | -------------- | ---------- | --- | --------------------- | ---------------------- | ------- | ------------ |
675+
| 172.30.22.21 | 65200 | default | - | Inherited from peer group EVPN-OVERLAY-CORE | Inherited from peer group EVPN-OVERLAY-CORE | - | Inherited from peer group EVPN-OVERLAY-CORE | - | - | - | - |
664676
| 192.168.255.1 | Inherited from peer group OVERLAY-PEERS | default | - | Inherited from peer group OVERLAY-PEERS | Inherited from peer group OVERLAY-PEERS | - | Inherited from peer group OVERLAY-PEERS | - | - | - | - |
665677
| 192.168.255.4 | Inherited from peer group OVERLAY-PEERS | default | - | Inherited from peer group OVERLAY-PEERS | Inherited from peer group OVERLAY-PEERS | - | Inherited from peer group OVERLAY-PEERS | - | - | - | - |
666678

@@ -670,8 +682,17 @@ ASN Notation: asplain
670682

671683
| Peer Group | Activate | Route-map In | Route-map Out | Peer-tag In | Peer-tag Out | Encapsulation | Next-hop-self Source Interface |
672684
| ---------- | -------- | ------------ | ------------- | ----------- | ------------ | ------------- | ------------------------------ |
685+
| EVPN-OVERLAY-CORE | True | - | - | - | - | default | - |
673686
| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | - | - | default | - |
674687

688+
##### EVPN DCI Gateway Summary
689+
690+
| Settings | Value |
691+
| -------- | ----- |
692+
| Remote Domain Peer Groups | EVPN-OVERLAY-CORE |
693+
| L3 Gateway Configured | True |
694+
| L3 Gateway Inter-domain | True |
695+
675696
#### Router BGP Device Configuration
676697

677698
```eos
@@ -682,24 +703,37 @@ router bgp 65000
682703
no bgp default ipv4-unicast
683704
maximum-paths 4
684705
distance bgp 20 200 200
706+
neighbor EVPN-OVERLAY-CORE peer group
707+
neighbor EVPN-OVERLAY-CORE update-source Loopback0
708+
neighbor EVPN-OVERLAY-CORE bfd
709+
neighbor EVPN-OVERLAY-CORE ebgp-multihop 15
710+
neighbor EVPN-OVERLAY-CORE send-community
711+
neighbor EVPN-OVERLAY-CORE maximum-routes 0
685712
neighbor OVERLAY-PEERS peer group
686713
neighbor OVERLAY-PEERS remote-as 65000
687714
neighbor OVERLAY-PEERS update-source Loopback0
688715
neighbor OVERLAY-PEERS bfd
689716
neighbor OVERLAY-PEERS password 7 <removed>
690717
neighbor OVERLAY-PEERS send-community
691718
neighbor OVERLAY-PEERS maximum-routes 0
719+
neighbor 172.30.22.21 peer group EVPN-OVERLAY-CORE
720+
neighbor 172.30.22.21 remote-as 65200
721+
neighbor 172.30.22.21 description dc2-leaf2a
692722
neighbor 192.168.255.1 peer group OVERLAY-PEERS
693723
neighbor 192.168.255.1 description DC1-SPINE1_Loopback0
694724
neighbor 192.168.255.4 peer group OVERLAY-PEERS
695725
neighbor 192.168.255.4 description DC1-SPINE4_Loopback0
696726
!
697727
address-family evpn
728+
neighbor EVPN-OVERLAY-CORE activate
729+
neighbor EVPN-OVERLAY-CORE domain remote
698730
neighbor OVERLAY-PEERS activate
699731
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in
700732
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out
733+
neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain
701734
!
702735
address-family ipv4
736+
no neighbor EVPN-OVERLAY-CORE activate
703737
no neighbor OVERLAY-PEERS activate
704738
```
705739

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,17 @@ ASN Notation: asplain
630630

631631
#### Router BGP Peer Groups
632632

633+
##### EVPN-OVERLAY-CORE
634+
635+
| Settings | Value |
636+
| -------- | ----- |
637+
| Address Family | evpn |
638+
| Source | Loopback0 |
639+
| BFD | True |
640+
| Ebgp multihop | 15 |
641+
| Send community | all |
642+
| Maximum routes | 0 (no limit) |
643+
633644
##### OVERLAY-PEERS
634645

635646
| Settings | Value |
@@ -645,6 +656,7 @@ ASN Notation: asplain
645656

646657
| Neighbor | Remote AS | VRF | Shutdown | Send-community | Maximum-routes | Allowas-in | BFD | RIB Pre-Policy Retain | Route-Reflector Client | Passive | TTL Max Hops |
647658
| -------- | --------- | --- | -------- | -------------- | -------------- | ---------- | --- | --------------------- | ---------------------- | ------- | ------------ |
659+
| 172.30.22.22 | 65200 | default | - | Inherited from peer group EVPN-OVERLAY-CORE | Inherited from peer group EVPN-OVERLAY-CORE | - | Inherited from peer group EVPN-OVERLAY-CORE | - | - | - | - |
648660
| 192.168.255.1 | Inherited from peer group OVERLAY-PEERS | default | - | Inherited from peer group OVERLAY-PEERS | Inherited from peer group OVERLAY-PEERS | - | Inherited from peer group OVERLAY-PEERS | - | - | - | - |
649661
| 192.168.255.4 | Inherited from peer group OVERLAY-PEERS | default | - | Inherited from peer group OVERLAY-PEERS | Inherited from peer group OVERLAY-PEERS | - | Inherited from peer group OVERLAY-PEERS | - | - | - | - |
650662

@@ -654,8 +666,17 @@ ASN Notation: asplain
654666

655667
| Peer Group | Activate | Route-map In | Route-map Out | Peer-tag In | Peer-tag Out | Encapsulation | Next-hop-self Source Interface |
656668
| ---------- | -------- | ------------ | ------------- | ----------- | ------------ | ------------- | ------------------------------ |
669+
| EVPN-OVERLAY-CORE | True | - | - | - | - | default | - |
657670
| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | - | - | default | - |
658671

672+
##### EVPN DCI Gateway Summary
673+
674+
| Settings | Value |
675+
| -------- | ----- |
676+
| Remote Domain Peer Groups | EVPN-OVERLAY-CORE |
677+
| L3 Gateway Configured | True |
678+
| L3 Gateway Inter-domain | True |
679+
659680
#### Router BGP Device Configuration
660681

661682
```eos
@@ -666,24 +687,37 @@ router bgp 65000
666687
no bgp default ipv4-unicast
667688
maximum-paths 4
668689
distance bgp 20 200 200
690+
neighbor EVPN-OVERLAY-CORE peer group
691+
neighbor EVPN-OVERLAY-CORE update-source Loopback0
692+
neighbor EVPN-OVERLAY-CORE bfd
693+
neighbor EVPN-OVERLAY-CORE ebgp-multihop 15
694+
neighbor EVPN-OVERLAY-CORE send-community
695+
neighbor EVPN-OVERLAY-CORE maximum-routes 0
669696
neighbor OVERLAY-PEERS peer group
670697
neighbor OVERLAY-PEERS remote-as 65000
671698
neighbor OVERLAY-PEERS update-source Loopback0
672699
neighbor OVERLAY-PEERS bfd
673700
neighbor OVERLAY-PEERS password 7 <removed>
674701
neighbor OVERLAY-PEERS send-community
675702
neighbor OVERLAY-PEERS maximum-routes 0
703+
neighbor 172.30.22.22 peer group EVPN-OVERLAY-CORE
704+
neighbor 172.30.22.22 remote-as 65200
705+
neighbor 172.30.22.22 description dc2-leaf2b
676706
neighbor 192.168.255.1 peer group OVERLAY-PEERS
677707
neighbor 192.168.255.1 description DC1-SPINE1_Loopback0
678708
neighbor 192.168.255.4 peer group OVERLAY-PEERS
679709
neighbor 192.168.255.4 description DC1-SPINE4_Loopback0
680710
!
681711
address-family evpn
712+
neighbor EVPN-OVERLAY-CORE activate
713+
neighbor EVPN-OVERLAY-CORE domain remote
682714
neighbor OVERLAY-PEERS activate
683715
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in
684716
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out
717+
neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain
685718
!
686719
address-family ipv4
720+
no neighbor EVPN-OVERLAY-CORE activate
687721
no neighbor OVERLAY-PEERS activate
688722
```
689723

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1A.cfg

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,24 +198,37 @@ router bgp 65000
198198
no bgp default ipv4-unicast
199199
maximum-paths 4
200200
distance bgp 20 200 200
201+
neighbor EVPN-OVERLAY-CORE peer group
202+
neighbor EVPN-OVERLAY-CORE update-source Loopback0
203+
neighbor EVPN-OVERLAY-CORE bfd
204+
neighbor EVPN-OVERLAY-CORE ebgp-multihop 15
205+
neighbor EVPN-OVERLAY-CORE send-community
206+
neighbor EVPN-OVERLAY-CORE maximum-routes 0
201207
neighbor OVERLAY-PEERS peer group
202208
neighbor OVERLAY-PEERS remote-as 65000
203209
neighbor OVERLAY-PEERS update-source Loopback0
204210
neighbor OVERLAY-PEERS bfd
205211
neighbor OVERLAY-PEERS password 7 64fqSH5CFUNLRHErezMrRg==
206212
neighbor OVERLAY-PEERS send-community
207213
neighbor OVERLAY-PEERS maximum-routes 0
214+
neighbor 172.30.22.21 peer group EVPN-OVERLAY-CORE
215+
neighbor 172.30.22.21 remote-as 65200
216+
neighbor 172.30.22.21 description dc2-leaf2a
208217
neighbor 192.168.255.1 peer group OVERLAY-PEERS
209218
neighbor 192.168.255.1 description DC1-SPINE1_Loopback0
210219
neighbor 192.168.255.4 peer group OVERLAY-PEERS
211220
neighbor 192.168.255.4 description DC1-SPINE4_Loopback0
212221
!
213222
address-family evpn
223+
neighbor EVPN-OVERLAY-CORE activate
224+
neighbor EVPN-OVERLAY-CORE domain remote
214225
neighbor OVERLAY-PEERS activate
215226
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in
216227
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out
228+
neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain
217229
!
218230
address-family ipv4
231+
no neighbor EVPN-OVERLAY-CORE activate
219232
no neighbor OVERLAY-PEERS activate
220233
!
221234
router isis EVPN_UNDERLAY

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1B.cfg

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,24 +185,37 @@ router bgp 65000
185185
no bgp default ipv4-unicast
186186
maximum-paths 4
187187
distance bgp 20 200 200
188+
neighbor EVPN-OVERLAY-CORE peer group
189+
neighbor EVPN-OVERLAY-CORE update-source Loopback0
190+
neighbor EVPN-OVERLAY-CORE bfd
191+
neighbor EVPN-OVERLAY-CORE ebgp-multihop 15
192+
neighbor EVPN-OVERLAY-CORE send-community
193+
neighbor EVPN-OVERLAY-CORE maximum-routes 0
188194
neighbor OVERLAY-PEERS peer group
189195
neighbor OVERLAY-PEERS remote-as 65000
190196
neighbor OVERLAY-PEERS update-source Loopback0
191197
neighbor OVERLAY-PEERS bfd
192198
neighbor OVERLAY-PEERS password 7 64fqSH5CFUNLRHErezMrRg==
193199
neighbor OVERLAY-PEERS send-community
194200
neighbor OVERLAY-PEERS maximum-routes 0
201+
neighbor 172.30.22.22 peer group EVPN-OVERLAY-CORE
202+
neighbor 172.30.22.22 remote-as 65200
203+
neighbor 172.30.22.22 description dc2-leaf2b
195204
neighbor 192.168.255.1 peer group OVERLAY-PEERS
196205
neighbor 192.168.255.1 description DC1-SPINE1_Loopback0
197206
neighbor 192.168.255.4 peer group OVERLAY-PEERS
198207
neighbor 192.168.255.4 description DC1-SPINE4_Loopback0
199208
!
200209
address-family evpn
210+
neighbor EVPN-OVERLAY-CORE activate
211+
neighbor EVPN-OVERLAY-CORE domain remote
201212
neighbor OVERLAY-PEERS activate
202213
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in
203214
neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out
215+
neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain
204216
!
205217
address-family ipv4
218+
no neighbor EVPN-OVERLAY-CORE activate
206219
no neighbor OVERLAY-PEERS activate
207220
!
208221
router isis EVPN_UNDERLAY

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1A.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,14 @@ router_bgp:
227227
default:
228228
ipv4_unicast: false
229229
peer_groups:
230+
- name: EVPN-OVERLAY-CORE
231+
metadata:
232+
type: evpn
233+
update_source: Loopback0
234+
bfd: true
235+
ebgp_multihop: 15
236+
send_community: all
237+
maximum_routes: 0
230238
- name: OVERLAY-PEERS
231239
metadata:
232240
type: evpn
@@ -237,6 +245,12 @@ router_bgp:
237245
send_community: all
238246
maximum_routes: 0
239247
neighbors:
248+
- ip_address: 172.30.22.21
249+
peer_group: EVPN-OVERLAY-CORE
250+
remote_as: '65200'
251+
metadata:
252+
peer: dc2-leaf2a
253+
description: dc2-leaf2a
240254
- ip_address: 192.168.255.1
241255
peer_group: OVERLAY-PEERS
242256
metadata:
@@ -248,13 +262,22 @@ router_bgp:
248262
peer: DC1-SPINE4
249263
description: DC1-SPINE4_Loopback0
250264
address_family_evpn:
265+
neighbor_default:
266+
next_hop_self_received_evpn_routes:
267+
enable: true
268+
inter_domain: true
251269
peer_groups:
270+
- name: EVPN-OVERLAY-CORE
271+
activate: true
272+
domain_remote: true
252273
- name: OVERLAY-PEERS
253274
activate: true
254275
route_map_in: RM-EVPN-SOO-IN
255276
route_map_out: RM-EVPN-SOO-OUT
256277
address_family_ipv4:
257278
peer_groups:
279+
- name: EVPN-OVERLAY-CORE
280+
activate: false
258281
- name: OVERLAY-PEERS
259282
activate: false
260283
router_isis:

ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1B.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,14 @@ router_bgp:
210210
default:
211211
ipv4_unicast: false
212212
peer_groups:
213+
- name: EVPN-OVERLAY-CORE
214+
metadata:
215+
type: evpn
216+
update_source: Loopback0
217+
bfd: true
218+
ebgp_multihop: 15
219+
send_community: all
220+
maximum_routes: 0
213221
- name: OVERLAY-PEERS
214222
metadata:
215223
type: evpn
@@ -220,6 +228,12 @@ router_bgp:
220228
send_community: all
221229
maximum_routes: 0
222230
neighbors:
231+
- ip_address: 172.30.22.22
232+
peer_group: EVPN-OVERLAY-CORE
233+
remote_as: '65200'
234+
metadata:
235+
peer: dc2-leaf2b
236+
description: dc2-leaf2b
223237
- ip_address: 192.168.255.1
224238
peer_group: OVERLAY-PEERS
225239
metadata:
@@ -231,13 +245,22 @@ router_bgp:
231245
peer: DC1-SPINE4
232246
description: DC1-SPINE4_Loopback0
233247
address_family_evpn:
248+
neighbor_default:
249+
next_hop_self_received_evpn_routes:
250+
enable: true
251+
inter_domain: true
234252
peer_groups:
253+
- name: EVPN-OVERLAY-CORE
254+
activate: true
255+
domain_remote: true
235256
- name: OVERLAY-PEERS
236257
activate: true
237258
route_map_in: RM-EVPN-SOO-IN
238259
route_map_out: RM-EVPN-SOO-OUT
239260
address_family_ipv4:
240261
peer_groups:
262+
- name: EVPN-OVERLAY-CORE
263+
activate: false
241264
- name: OVERLAY-PEERS
242265
activate: false
243266
router_isis:

0 commit comments

Comments
 (0)