fixing bug

aristanetworks · Sep 23, 2024 · f71818f · f71818f
1 parent 1377f45
commit f71818f
Show file tree

Hide file tree

Showing 31 changed files with 311 additions and 95 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
@@ -134,6 +134,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
@@ -147,6 +150,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
@@ -212,6 +220,6 @@ 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
 !
 end
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
@@ -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_PYTHON_MODULES_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
@@ -195,6 +203,6 @@ router bgp 65101
       update wait-install
       neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER
       neighbor 10.255.240.10 description CUSTOM-PYTHON_MODULES-L3LEAF1A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end
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
@@ -147,6 +147,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
@@ -160,6 +163,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
@@ -219,6 +227,6 @@ router bgp 65101
       update wait-install
       neighbor 10.255.240.11 peer group MLAG-IPv4-UNDERLAY-PEER
       neighbor 10.255.240.11 description CUSTOM-TEMPLATES-L3LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end
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
@@ -157,6 +157,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
@@ -170,6 +173,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
@@ -229,6 +237,6 @@ router bgp 65101
       update wait-install
       neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER
       neighbor 10.255.240.10 description CUSTOM-TEMPLATES-L3LEAF1A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end
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
@@ -872,7 +872,6 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
 ip prefix-list PL-MLAG-PEER-VRFS
    seq 10 permit 10.255.251.6/31
-   seq 20 permit 172.31.11.6/31
 !
 monitor session MonitoringSessionServer18WithDest source Ethernet25 rx ip access-group MyIpACL priority 5
 monitor session MonitoringSessionServer18WithDest source Ethernet28 tx mac access-group MyMacACL priority 5
@@ -1052,7 +1051,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 65103:13
@@ -1062,7 +1061,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_OP_Zone
       rd 65103:9
@@ -1072,7 +1071,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 65103:14
@@ -1084,7 +1083,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_WEB_Zone
       rd 65103:11
@@ -1094,7 +1093,7 @@ router bgp 65103
       update wait-install
       neighbor 172.31.11.7 peer group MLAG-PEERS
       neighbor 172.31.11.7 description DC1-SVC3B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_B_OP_Zone
       rd 65103:20
@@ -1104,7 +1103,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 65103:21
@@ -1114,7 +1113,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 65103:30
@@ -1124,7 +1123,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 65103:31
@@ -1134,6 +1133,6 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end
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
@@ -838,7 +838,6 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
 ip prefix-list PL-MLAG-PEER-VRFS
    seq 10 permit 10.255.251.6/31
-   seq 20 permit 172.31.11.6/31
 !
 monitor session MonitoringSessionServer18WithDest source Ethernet25 rx ip access-group MyIpACL priority 5
 monitor session MonitoringSessionServer18WithDest source Port-Channel27 tx mac access-group MyMacACL priority 5
@@ -1017,7 +1016,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 65103:13
@@ -1027,7 +1026,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_OP_Zone
       rd 65103:9
@@ -1037,7 +1036,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 65103:14
@@ -1049,7 +1048,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_WEB_Zone
       rd 65103:11
@@ -1059,7 +1058,7 @@ router bgp 65103
       update wait-install
       neighbor 172.31.11.6 peer group MLAG-PEERS
       neighbor 172.31.11.6 description DC1-SVC3A
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_B_OP_Zone
       rd 65103:20
@@ -1069,7 +1068,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 65103:21
@@ -1079,7 +1078,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 65103:30
@@ -1089,7 +1088,7 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 65103:31
@@ -1099,6 +1098,6 @@ router bgp 65103
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end
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
@@ -494,7 +494,6 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
 ip prefix-list PL-MLAG-PEER-VRFS
    seq 10 permit 10.255.251.24/31
-   seq 20 permit 172.31.11.24/31
 !
 mlag configuration
    domain-id DC1_UNDEPLOYED_LEAF1
@@ -661,7 +660,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 192.168.255.21:13
@@ -671,7 +670,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_OP_Zone
       rd 192.168.255.21:9
@@ -681,7 +680,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WAN_Zone
       rd 192.168.255.21:14
@@ -693,7 +692,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_A_WEB_Zone
       rd 192.168.255.21:11
@@ -703,7 +702,7 @@ router bgp 65110
       update wait-install
       neighbor 172.31.11.25 peer group MLAG-PEERS
       neighbor 172.31.11.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
    !
    vrf Tenant_B_OP_Zone
       rd 192.168.255.21:20
@@ -713,7 +712,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_B_WAN_Zone
       rd 192.168.255.21:21
@@ -723,7 +722,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_OP_Zone
       rd 192.168.255.21:30
@@ -733,7 +732,7 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_C_WAN_Zone
       rd 192.168.255.21:31
@@ -743,6 +742,6 @@ router bgp 65110
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
-      redistribute connected
+      redistribute connected route-map RM-CONN-2-BGP-VRFS
 !
 end