Fix.

aristanetworks · Jul 29, 2024 · 1bb67dd · 1bb67dd
1 parent 25c3197
commit 1bb67dd
Show file tree

Hide file tree

Showing 59 changed files with 636 additions and 79 deletions.
diff --git a/...a/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg b/...a/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg
@@ -128,6 +128,9 @@ 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
 !
+ip prefix-list PL-MLAG-PEER-VRFS
+   seq 10 permit 10.255.240.10/31
+!
 mlag configuration
    domain-id CUSTOM_PYTHON_MODULES_L3LEAF1
    local-interface Vlan4094
@@ -141,6 +144,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.1
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
+route-map RM-CONN-2-BGP-VRFS deny 10
+   match ip address prefix-list PL-MLAG-PEER-VRFS
+!
+route-map RM-CONN-2-BGP-VRFS permit 20
+!
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing
    set origin incomplete
@@ -205,7 +213,7 @@ router bgp 65101
       neighbor 172.16.0.25 remote-as 65103
       neighbor 172.16.0.25 peer group IPv4-UNDERLAY-PEERS
       neighbor 172.16.0.25 description CUSTOM-PYTHON_MODULES-L3LEAF2_Ethernet1.1_vrf_TEST_VRF
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...a/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg b/...a/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg
@@ -117,6 +117,9 @@ 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
 !
+ip prefix-list PL-MLAG-PEER-VRFS
+   seq 10 permit 10.255.240.10/31
+!
 mlag configuration
    domain-id CUSTOM_PYTHON_MODULES_L3LEAF1
    local-interface Vlan4094
@@ -130,6 +133,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.1
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
+route-map RM-CONN-2-BGP-VRFS deny 10
+   match ip address prefix-list PL-MLAG-PEER-VRFS
+!
+route-map RM-CONN-2-BGP-VRFS permit 20
+!
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing
    set origin incomplete
@@ -188,7 +196,7 @@ router bgp 65101
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg
@@ -123,6 +123,9 @@ 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
 !
+ip prefix-list PL-MLAG-PEER-VRFS
+   seq 10 permit 10.255.240.10/31
+!
 mlag configuration
    domain-id CUSTOM_TEMPLATES_L3LEAF1
    local-interface Vlan4094
@@ -136,6 +139,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.1
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
+route-map RM-CONN-2-BGP-VRFS deny 10
+   match ip address prefix-list PL-MLAG-PEER-VRFS
+!
+route-map RM-CONN-2-BGP-VRFS permit 20
+!
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing
    set origin incomplete
@@ -194,7 +202,7 @@ router bgp 65101
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.240.11 peer group MLAG-IPv4-UNDERLAY-PEER
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg
@@ -133,6 +133,9 @@ 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
 !
+ip prefix-list PL-MLAG-PEER-VRFS
+   seq 10 permit 10.255.240.10/31
+!
 mlag configuration
    domain-id CUSTOM_TEMPLATES_L3LEAF1
    local-interface Vlan4094
@@ -146,6 +149,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.1
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
+route-map RM-CONN-2-BGP-VRFS deny 10
+   match ip address prefix-list PL-MLAG-PEER-VRFS
+!
+route-map RM-CONN-2-BGP-VRFS permit 20
+!
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing
    set origin incomplete
@@ -204,7 +212,7 @@ router bgp 65101
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg
@@ -1056,7 +1056,7 @@ router bgp 65103
       router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 65103:14
@@ -1085,7 +1085,7 @@ router bgp 65103
       router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 65103:21
@@ -1094,7 +1094,7 @@ router bgp 65103
       router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 65103:30
@@ -1103,7 +1103,7 @@ router bgp 65103
       router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 65103:31
@@ -1112,7 +1112,7 @@ router bgp 65103
       router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg
@@ -1021,7 +1021,7 @@ router bgp 65103
       router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 65103:14
@@ -1050,7 +1050,7 @@ router bgp 65103
       router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 65103:21
@@ -1059,7 +1059,7 @@ router bgp 65103
       router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 65103:30
@@ -1068,7 +1068,7 @@ router bgp 65103
       router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 65103:31
@@ -1077,7 +1077,7 @@ router bgp 65103
       router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg
@@ -671,7 +671,7 @@ router bgp 65110
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 192.168.255.21:14
@@ -700,7 +700,7 @@ router bgp 65110
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 192.168.255.21:21
@@ -709,7 +709,7 @@ router bgp 65110
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 192.168.255.21:30
@@ -718,7 +718,7 @@ router bgp 65110
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 192.168.255.21:31
@@ -727,7 +727,7 @@ router bgp 65110
       router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg
@@ -671,7 +671,7 @@ router bgp 65111
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 192.168.255.22:14
@@ -700,7 +700,7 @@ router bgp 65111
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 192.168.255.22:21
@@ -709,7 +709,7 @@ router bgp 65111
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 192.168.255.22:30
@@ -718,7 +718,7 @@ router bgp 65111
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 192.168.255.22:31
@@ -727,7 +727,7 @@ router bgp 65111
       router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 management api http-commands
    protocol https