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

Feat(eos_designs): Add option to disable default 'redistribute connected' in VRF. #4220

Merged
merged 31 commits into from
Oct 30, 2024
+847 −25
Merged

Feat(eos_designs): Add option to disable default 'redistribute connected' in VRF. #4220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
085e4cb
Feat(eos_designs): Add option to disable default 'redistribute connec…
Jul 16, 2024
ad4e34f
Address comments.
Jul 18, 2024
567a748
Reverting the change for redistribute to ospf.
Jul 26, 2024
9129556
Update as per the comment.
Jul 26, 2024
b0fb3f2
Fix.
Jul 29, 2024
1fd98b8
fix CI
Aug 5, 2024
f8c58de
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 5, 2024
2579b6b
fix CI,
Aug 5, 2024
718251a
Removing changes from past tests, added new tests and address comment…
Aug 12, 2024
dba8f57
Update docstring.
Aug 12, 2024
501bebc
Fix CI.
Aug 13, 2024
5a625c3
Fix CI.
Aug 28, 2024
0f82c9e
Address comment.
Aug 29, 2024
d7b70cf
Rebase
Sep 10, 2024
0924c2e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 19, 2024
6503098
FIx CI.
Sep 19, 2024
b9e744d
Update python-avd/pyavd/_eos_designs/structured_config/network_servic…
laxmikantchintakindi Sep 20, 2024
48b14bd
Update python-avd/pyavd/_eos_designs/structured_config/network_servic…
laxmikantchintakindi Sep 20, 2024
1c10046
Merge branch 'devel' into issue4091
Sep 20, 2024
b6d09cf
Fix CI.
Sep 20, 2024
bfbee2d
Merge branch 'devel' into issue4091
Oct 8, 2024
7f01494
Adding changes as redistribute_mlag_ibgp_peering_vrfs is now False by…
Oct 8, 2024
f7767aa
Ignore CI.
Oct 8, 2024
aff3a9b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 8, 2024
a5946ce
Merge branch 'devel' into issue4091
gmuloc Oct 10, 2024
08f5bcd
Merge branch 'devel' into issue4091
Oct 14, 2024
201de00
Merge branch 'devel' into issue4091
laxmikantchintakindi Oct 21, 2024
fd7ab77
Merge branch 'devel' into issue4091
laxmikantchintakindi Oct 25, 2024
b82c59e
Merge branch 'devel' into issue4091
gmuloc Oct 28, 2024
51734e8
Merge branch 'devel' into issue4091
carlbuchmann Oct 28, 2024
48c2dce
Merge branch 'devel' into issue4091
bjmeuer Oct 29, 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
30 changes: 30 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ vlan 250
vlan 350
name Tenant_C_WAN_Zone_1
!
vlan 453
name Tenant_D_WAN_Zone_1
!
vrf instance MGMT
!
vrf instance Tenant_A_L3_VRF_Zone
Expand All @@ -68,6 +71,8 @@ vrf instance Tenant_B_WAN_Zone
!
vrf instance Tenant_C_WAN_Zone
!
vrf instance TENANT_D_WAN_ZONE
!
management api http-commands
protocol https
no default-services
Expand Down Expand Up @@ -224,18 +229,27 @@ interface Vlan350
vrf Tenant_C_WAN_Zone
ip address virtual 10.3.50.1/24
!
interface Vlan453
description Tenant_D_WAN_Zone_1
no shutdown
vrf TENANT_D_WAN_ZONE
ipv6 enable
ipv6 address virtual 10.0.10.1/24
!
interface Vxlan1
description DC1-BL1A_VTEP
vxlan source-interface Loopback1
vxlan udp-port 4789
vxlan vlan 150 vni 10150
vxlan vlan 250 vni 20250
vxlan vlan 350 vni 30350
vxlan vlan 453 vni 40453
vxlan vrf Tenant_A_L3_VRF_Zone vni 15
vxlan vrf Tenant_A_WAN_Zone vni 14
vxlan vrf Tenant_B_OP_Zone vni 20
vxlan vrf Tenant_B_WAN_Zone vni 21
vxlan vrf Tenant_C_WAN_Zone vni 31
vxlan vrf TENANT_D_WAN_ZONE vni 42
!
hardware tcam
system profile vxlan-routing
Expand Down Expand Up @@ -272,11 +286,13 @@ ip routing vrf Tenant_A_WAN_Zone
ip routing vrf Tenant_B_OP_Zone
ip routing vrf Tenant_B_WAN_Zone
ip routing vrf Tenant_C_WAN_Zone
ip routing vrf TENANT_D_WAN_ZONE
!
ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
seq 10 permit 192.168.255.0/24 eq 32
seq 20 permit 192.168.254.0/24 eq 32
seq 30 permit 192.168.255.255/32
ipv6 unicast-routing vrf TENANT_D_WAN_ZONE
!
mac address-table notification host-flap logging
!
Expand Down Expand Up @@ -370,6 +386,14 @@ router bgp 65104
redistribute learned
vlan 350
!
vlan-aware-bundle TENANT_D_WAN_ZONE
rd 192.168.254.14:42
rd evpn domain remote 192.168.254.14:42
route-target both 65104:42
route-target import export evpn domain remote 65104:42
redistribute learned
vlan 453
!
address-family evpn
neighbor EVPN-OVERLAY-CORE activate
neighbor EVPN-OVERLAY-CORE domain remote
Expand Down Expand Up @@ -467,6 +491,12 @@ router bgp 65104
route-target export evpn 65104:31
router-id 192.168.255.14
redistribute connected
!
vrf TENANT_D_WAN_ZONE
rd 192.168.254.14:42
route-target import evpn 65104:42
route-target export evpn 65104:42
router-id 192.168.255.14
!
router ospf 14 vrf Tenant_A_WAN_Zone
router-id 192.168.255.14
Expand Down
30 changes: 30 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ vlan 250
vlan 350
name Tenant_C_WAN_Zone_1
!
vlan 453
name Tenant_D_WAN_Zone_1
!
vrf instance MGMT
!
vrf instance Tenant_A_L3_VRF_Zone
Expand All @@ -65,6 +68,8 @@ vrf instance Tenant_B_WAN_Zone
!
vrf instance Tenant_C_WAN_Zone
!
vrf instance TENANT_D_WAN_ZONE
!
management api http-commands
protocol https
no default-services
Expand Down Expand Up @@ -214,18 +219,27 @@ interface Vlan350
vrf Tenant_C_WAN_Zone
ip address virtual 10.3.50.1/24
!
interface Vlan453
description Tenant_D_WAN_Zone_1
no shutdown
vrf TENANT_D_WAN_ZONE
ipv6 enable
ipv6 address virtual 10.0.10.1/24
!
interface Vxlan1
description DC1-BL1B_VTEP
vxlan source-interface Loopback1
vxlan udp-port 4789
vxlan vlan 150 vni 10150
vxlan vlan 250 vni 20250
vxlan vlan 350 vni 30350
vxlan vlan 453 vni 40453
vxlan vrf Tenant_A_L3_VRF_Zone vni 15
vxlan vrf Tenant_A_WAN_Zone vni 14
vxlan vrf Tenant_B_OP_Zone vni 20
vxlan vrf Tenant_B_WAN_Zone vni 21
vxlan vrf Tenant_C_WAN_Zone vni 31
vxlan vrf TENANT_D_WAN_ZONE vni 42
!
hardware tcam
system profile vxlan-routing
Expand Down Expand Up @@ -253,10 +267,12 @@ ip routing vrf Tenant_A_WAN_Zone
ip routing vrf Tenant_B_OP_Zone
ip routing vrf Tenant_B_WAN_Zone
ip routing vrf Tenant_C_WAN_Zone
ip routing vrf TENANT_D_WAN_ZONE
!
ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
seq 10 permit 192.168.255.0/24 eq 32
seq 20 permit 192.168.254.0/24 eq 32
ipv6 unicast-routing vrf TENANT_D_WAN_ZONE
!
ip route vrf MGMT 0.0.0.0/0 192.168.200.5
ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
Expand Down Expand Up @@ -348,6 +364,14 @@ router bgp 65105
redistribute learned
vlan 350
!
vlan-aware-bundle TENANT_D_WAN_ZONE
rd 192.168.254.15:42
rd evpn domain remote 192.168.254.15:42
route-target both 65105:42
route-target import export evpn domain remote 65105:42
redistribute learned
vlan 453
!
address-family evpn
neighbor EVPN-OVERLAY-CORE activate
neighbor EVPN-OVERLAY-CORE domain remote
Expand Down Expand Up @@ -445,6 +469,12 @@ router bgp 65105
route-target export evpn 65105:31
router-id 192.168.255.15
redistribute connected
!
vrf TENANT_D_WAN_ZONE
rd 192.168.254.15:42
route-target import evpn 65105:42
route-target export evpn 65105:42
router-id 192.168.255.15
!
router ospf 14 vrf Tenant_A_WAN_Zone
router-id 192.168.255.15
Expand Down
28 changes: 28 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ vlan 250
vlan 350
name Tenant_C_WAN_Zone_1
!
vlan 453
name Tenant_D_WAN_Zone_1
!
vrf instance MGMT
!
vrf instance Tenant_A_WAN_Zone
Expand All @@ -53,6 +56,8 @@ vrf instance Tenant_B_WAN_Zone
!
vrf instance Tenant_C_WAN_Zone
!
vrf instance TENANT_D_WAN_ZONE
!
management api http-commands
protocol https
no default-services
Expand Down Expand Up @@ -131,17 +136,26 @@ interface Vlan350
vrf Tenant_C_WAN_Zone
ip address virtual 10.3.50.1/24
!
interface Vlan453
description Tenant_D_WAN_Zone_1
no shutdown
vrf TENANT_D_WAN_ZONE
ipv6 enable
ipv6 address virtual 10.0.10.1/24
!
interface Vxlan1
description DC1-BL2A_VTEP
vxlan source-interface Loopback1
vxlan udp-port 4789
vxlan vlan 150 vni 10150
vxlan vlan 250 vni 20250
vxlan vlan 350 vni 30350
vxlan vlan 453 vni 40453
vxlan vrf Tenant_A_WAN_Zone vni 14
vxlan vrf Tenant_B_OP_Zone vni 20
vxlan vrf Tenant_B_WAN_Zone vni 21
vxlan vrf Tenant_C_WAN_Zone vni 31
vxlan vrf TENANT_D_WAN_ZONE vni 42
!
hardware tcam
system profile vxlan-routing
Expand All @@ -154,10 +168,12 @@ ip routing vrf Tenant_A_WAN_Zone
ip routing vrf Tenant_B_OP_Zone
ip routing vrf Tenant_B_WAN_Zone
ip routing vrf Tenant_C_WAN_Zone
ip routing vrf TENANT_D_WAN_ZONE
!
ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
seq 10 permit 192.168.255.0/24 eq 32
seq 20 permit 192.168.254.0/24 eq 32
ipv6 unicast-routing vrf TENANT_D_WAN_ZONE
!
ip route vrf MGMT 0.0.0.0/0 192.168.200.5
!
Expand Down Expand Up @@ -264,6 +280,12 @@ router bgp 65106
redistribute learned
vlan 350
!
vlan-aware-bundle TENANT_D_WAN_ZONE
rd 192.168.255.16:42
route-target both 42:42
redistribute learned
vlan 453
!
address-family evpn
neighbor EVPN-OVERLAY-PEERS activate
domain identifier 65000:3
Expand Down Expand Up @@ -333,5 +355,11 @@ router bgp 65106
address-family ipv4
neighbor 2.2.2.2 activate
neighbor 2.2.2.3 activate
!
vrf TENANT_D_WAN_ZONE
rd 192.168.255.16:42
route-target import evpn 42:42
route-target export evpn 42:42
router-id 192.168.255.16
!
end
28 changes: 28 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ vlan 250
vlan 350
name Tenant_C_WAN_Zone_1
!
vlan 453
name Tenant_D_WAN_Zone_1
!
vrf instance MGMT
!
vrf instance Tenant_A_WAN_Zone
Expand All @@ -51,6 +54,8 @@ vrf instance Tenant_B_WAN_Zone
!
vrf instance Tenant_C_WAN_Zone
!
vrf instance TENANT_D_WAN_ZONE
!
management api http-commands
protocol https
no default-services
Expand Down Expand Up @@ -129,17 +134,26 @@ interface Vlan350
vrf Tenant_C_WAN_Zone
ip address virtual 10.3.50.1/24
!
interface Vlan453
description Tenant_D_WAN_Zone_1
no shutdown
vrf TENANT_D_WAN_ZONE
ipv6 enable
ipv6 address virtual 10.0.10.1/24
!
interface Vxlan1
description DC1-BL2B_VTEP
vxlan source-interface Loopback1
vxlan udp-port 4789
vxlan vlan 150 vni 10150
vxlan vlan 250 vni 20250
vxlan vlan 350 vni 30350
vxlan vlan 453 vni 40453
vxlan vrf Tenant_A_WAN_Zone vni 14
vxlan vrf Tenant_B_OP_Zone vni 20
vxlan vrf Tenant_B_WAN_Zone vni 21
vxlan vrf Tenant_C_WAN_Zone vni 31
vxlan vrf TENANT_D_WAN_ZONE vni 42
!
hardware tcam
system profile vxlan-routing
Expand All @@ -152,10 +166,12 @@ ip routing vrf Tenant_A_WAN_Zone
ip routing vrf Tenant_B_OP_Zone
ip routing vrf Tenant_B_WAN_Zone
ip routing vrf Tenant_C_WAN_Zone
ip routing vrf TENANT_D_WAN_ZONE
!
ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
seq 10 permit 192.168.255.0/24 eq 32
seq 20 permit 192.168.254.0/24 eq 32
ipv6 unicast-routing vrf TENANT_D_WAN_ZONE
!
ip route vrf MGMT 0.0.0.0/0 192.168.200.5
!
Expand Down Expand Up @@ -261,6 +277,12 @@ router bgp 65107
redistribute learned
vlan 350
!
vlan-aware-bundle TENANT_D_WAN_ZONE
rd 192.168.255.17:42
route-target both 42:42
redistribute learned
vlan 453
!
address-family evpn
neighbor EVPN-OVERLAY-PEERS activate
domain identifier 65000:3
Expand Down Expand Up @@ -331,5 +353,11 @@ router bgp 65107
!
address-family ipv6
neighbor BEBA::C0CA:C07A activate
!
vrf TENANT_D_WAN_ZONE
rd 192.168.255.17:42
route-target import evpn 42:42
route-target export evpn 42:42
router-id 192.168.255.17
!
end
6 changes: 5 additions & 1 deletion ..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-L2LEAF2A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ daemon TerminAttr
vlan internal order ascending range 1006 1199
!
no ip igmp snooping vlan 120
no ip igmp snooping vlan 122
!
transceiver qsfp default-mode 4x10G
!
Expand Down Expand Up @@ -49,6 +50,9 @@ vlan 120
vlan 121
name Tenant_A_WEBZone_2
!
vlan 122
name Tenant_A_ERP_Zone_1
!
vlan 130
name Tenant_A_APP_Zone_1
!
Expand Down Expand Up @@ -112,7 +116,7 @@ interface Port-Channel3
interface Port-Channel1001
description DC1_SVC3_Po1007
no shutdown
switchport trunk allowed vlan 110-112,120-121,130-131,140-141,150,160-161,210-211,250,310-311,350
switchport trunk allowed vlan 110-112,120-122,130-131,140-141,150,160-161,210-211,250,310-311,350
switchport mode trunk
switchport
mlag 1001
Expand Down
6 changes: 5 additions & 1 deletion ..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-L2LEAF2B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ daemon TerminAttr
vlan internal order ascending range 1006 1199
!
no ip igmp snooping vlan 120
no ip igmp snooping vlan 122
!
transceiver qsfp default-mode 4x10G
!
Expand Down Expand Up @@ -49,6 +50,9 @@ vlan 120
vlan 121
name Tenant_A_WEBZone_2
!
vlan 122
name Tenant_A_ERP_Zone_1
!
vlan 130
name Tenant_A_APP_Zone_1
!
Expand Down Expand Up @@ -112,7 +116,7 @@ interface Port-Channel3
interface Port-Channel1001
description DC1_SVC3_Po1007
no shutdown
switchport trunk allowed vlan 110-112,120-121,130-131,140-141,150,160-161,210-211,250,310-311,350
switchport trunk allowed vlan 110-112,120-122,130-131,140-141,150,160-161,210-211,250,310-311,350
switchport mode trunk
switchport
mlag 1001
Expand Down
Loading
Loading