From f71818f4775ae26569984d6da2224f79753b4c25 Mon Sep 17 00:00:00 2001 From: Vibhu-gslab Date: Mon, 23 Sep 2024 16:54:57 +0530 Subject: [PATCH] fixing bug --- .../CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg | 10 ++++- .../CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg | 10 ++++- .../configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg | 10 ++++- .../configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg | 10 ++++- .../intended/configs/DC1-SVC3A.cfg | 19 +++++----- .../intended/configs/DC1-SVC3B.cfg | 19 +++++----- .../configs/DC1_UNDEPLOYED_LEAF1A.cfg | 19 +++++----- .../configs/DC1_UNDEPLOYED_LEAF1B.cfg | 19 +++++----- .../configs/EVPN-MULTICAST-L3LEAF1A.cfg | 38 +++++++++++-------- .../configs/EVPN-MULTICAST-L3LEAF1B.cfg | 38 +++++++++++-------- .../configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg | 10 ++++- .../configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg | 10 ++++- .../configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg | 10 ++++- .../configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg | 10 ++++- .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg | 8 ++++ .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg | 8 ++++ .../configs/bgp-from-network-services-1.cfg | 9 +++++ .../configs/flow-tracking-tests-leaf3.cfg | 10 ++++- .../configs/flow-tracking-tests-leaf4.cfg | 10 ++++- .../configs/inband-mgmt-parent-dualstack1.cfg | 10 ++++- .../configs/inband-mgmt-parent-dualstack2.cfg | 10 ++++- .../intended/configs/ptp-tests-leaf1.cfg | 10 ++++- .../intended/configs/ptp-tests-leaf2.cfg | 10 ++++- .../intended/configs/sflow-tests-leaf3.cfg | 10 ++++- .../intended/configs/sflow-tests-leaf4.cfg | 10 ++++- .../configs/trunk-group-tests-l3leaf1a.cfg | 14 +++++-- .../configs/trunk-group-tests-l3leaf1b.cfg | 14 +++++-- .../configs/trunk-group-tests-l3leaf2a.cfg | 10 ++++- .../configs/trunk-group-tests-l3leaf2b.cfg | 10 ++++- .../bgp-from-network-services-1.yml | 16 ++++++++ .../network_services/router_bgp.py | 5 ++- 31 files changed, 311 insertions(+), 95 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg index 16a3af832e6..725b19ac1a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg index 9680a0c9445..a796c546b34 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg index b81021f322b..f421aa13a69 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg +++ b/ansible_collections/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg index 2fccfcb8573..7f0fd246525 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg +++ b/ansible_collections/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg index 65d8a607922..acfffe54489 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg +++ b/ansible_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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg index 5d36c1a2536..43db7d25ee5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg +++ b/ansible_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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg index 5568651af99..1c12862949e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg +++ b/ansible_collections/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 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg index f7d5fb1fc95..3c97afb6f28 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.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 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected route-map RM-CONN-2-BGP-VRFS + redistribute connected ! vrf Tenant_A_DB_Zone rd 192.168.255.22:13 @@ -671,7 +670,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected route-map RM-CONN-2-BGP-VRFS + redistribute connected ! vrf Tenant_A_OP_Zone rd 192.168.255.22:9 @@ -681,7 +680,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf Tenant_A_WAN_Zone rd 192.168.255.22:14 @@ -693,7 +692,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected route-map RM-CONN-2-BGP-VRFS + redistribute connected ! vrf Tenant_A_WEB_Zone rd 192.168.255.22:11 @@ -703,7 +702,7 @@ router bgp 65111 update wait-install neighbor 172.31.11.24 peer group MLAG-PEERS neighbor 172.31.11.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected route-map RM-CONN-2-BGP-VRFS + redistribute connected ! vrf Tenant_B_OP_Zone rd 192.168.255.22:20 @@ -713,7 +712,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf Tenant_B_WAN_Zone rd 192.168.255.22:21 @@ -723,7 +722,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf Tenant_C_OP_Zone rd 192.168.255.22:30 @@ -733,7 +732,7 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf Tenant_C_WAN_Zone rd 192.168.255.22:31 @@ -743,6 +742,6 @@ router bgp 65111 update wait-install neighbor 10.255.251.24 peer group MLAG-PEERS neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg index 5198f7961d1..e871da0b919 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg @@ -854,6 +854,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.251.0/31 +! mlag configuration domain-id EVPN_MULTICAST_L3LEAF1 local-interface Vlan4094 @@ -867,6 +870,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 @@ -1069,7 +1077,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_DISABLED_310_311 rd 192.168.255.3:13 @@ -1079,7 +1087,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_1_2 rd 192.168.255.3:21 @@ -1089,7 +1097,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_3_DISABLED_4 rd 192.168.255.3:22 @@ -1099,7 +1107,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_110_111 rd 192.168.255.3:11 @@ -1109,7 +1117,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_210_DISABLED_211 rd 192.168.255.3:12 @@ -1119,7 +1127,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 rd 192.168.255.3:33 @@ -1129,7 +1137,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 rd 192.168.255.3:66 @@ -1140,7 +1148,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 rd 192.168.255.3:32 @@ -1151,7 +1159,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 rd 192.168.255.3:42 @@ -1161,7 +1169,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 rd 192.168.255.3:41 @@ -1172,7 +1180,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE rd 192.168.255.3:55 @@ -1183,7 +1191,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES rd 192.168.255.3:60 @@ -1196,7 +1204,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_TRANSIT rd 192.168.255.3:52 @@ -1209,7 +1217,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED rd 192.168.255.3:51 @@ -1220,7 +1228,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! router multicast ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg index 1d3d80de4f7..b9977cc09b4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg @@ -854,6 +854,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.251.0/31 +! mlag configuration domain-id EVPN_MULTICAST_L3LEAF1 local-interface Vlan4094 @@ -867,6 +870,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 @@ -1069,7 +1077,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_DISABLED_310_311 rd 192.168.255.4:13 @@ -1079,7 +1087,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_1_2 rd 192.168.255.4:21 @@ -1089,7 +1097,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_3_DISABLED_4 rd 192.168.255.4:22 @@ -1099,7 +1107,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_110_111 rd 192.168.255.4:11 @@ -1109,7 +1117,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf MULTICAST_ENABLED_210_DISABLED_211 rd 192.168.255.4:12 @@ -1119,7 +1127,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 rd 192.168.255.4:33 @@ -1129,7 +1137,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 rd 192.168.255.4:66 @@ -1140,7 +1148,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 rd 192.168.255.4:32 @@ -1151,7 +1159,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 rd 192.168.255.4:42 @@ -1161,7 +1169,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 rd 192.168.255.4:41 @@ -1172,7 +1180,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE rd 192.168.255.4:55 @@ -1183,7 +1191,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES rd 192.168.255.4:60 @@ -1196,7 +1204,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_L3_MULTICAST_TRANSIT rd 192.168.255.4:52 @@ -1209,7 +1217,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED rd 192.168.255.4:51 @@ -1220,7 +1228,7 @@ router bgp 65101 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! router multicast ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg index 5c4f730b68d..983eb628663 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg @@ -116,6 +116,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.10.224.0/30 +! mlag configuration domain-id MLAG_SAME_SUBNET_L3LEAF1 local-interface Vlan4094 @@ -127,6 +130,11 @@ mlag configuration 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 @@ -180,6 +188,6 @@ router bgp 923 update wait-install neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF1B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg index 507ebdcfd75..e0a77b65bfa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg @@ -116,6 +116,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.10.224.0/30 +! mlag configuration domain-id MLAG_SAME_SUBNET_L3LEAF1 local-interface Vlan4094 @@ -127,6 +130,11 @@ mlag configuration 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 @@ -180,6 +188,6 @@ router bgp 923 update wait-install neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF1A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg index 1dbb462344a..dc623a43e40 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg @@ -116,6 +116,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.10.224.0/30 +! mlag configuration domain-id MLAG_SAME_SUBNET_L3LEAF2 local-interface Vlan4094 @@ -127,6 +130,11 @@ mlag configuration 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 @@ -180,6 +188,6 @@ router bgp 923 update wait-install neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF2B - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg index 7c751d5067b..f9238f4ce0c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg @@ -116,6 +116,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.10.224.0/30 +! mlag configuration domain-id MLAG_SAME_SUBNET_L3LEAF2 local-interface Vlan4094 @@ -127,6 +130,11 @@ mlag configuration 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 @@ -180,6 +188,6 @@ router bgp 923 update wait-install neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF2A - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg index bd84a8c2c92..ca4bd393c5b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg @@ -126,6 +126,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.254.0/24 eq 32 seq 20 permit 192.168.253.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 192.168.253.4/31 +! mlag configuration domain-id OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3 local-interface Vlan4094 @@ -137,6 +140,11 @@ mlag configuration 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 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg index fe633fbd56c..8270326cb84 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg @@ -126,6 +126,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.254.0/24 eq 32 seq 20 permit 192.168.253.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 192.168.253.4/31 +! mlag configuration domain-id OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3 local-interface Vlan4094 @@ -137,6 +140,11 @@ mlag configuration 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 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg index 0e4628c1721..fd8dce06038 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg @@ -76,6 +76,9 @@ interface Vlan4094 ip routing no ip routing vrf MGMT ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.10.20.0/31 +! mlag configuration domain-id GROUP1 local-interface Vlan4094 @@ -86,6 +89,11 @@ mlag configuration ! ip route 0.0.0.0 10.10.1.1 ! +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 @@ -109,6 +117,7 @@ router bgp 65001 neighbor 10.10.1.2 peer group MYPEERGROUP neighbor 10.10.20.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.10.20.1 description bgp-from-network-services-2 + redistribute connected route-map RM-CONN-2-BGP-VRFS ! address-family ipv4 neighbor MLAG-IPv4-UNDERLAY-PEER activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg index bed02257ce6..5b364274f65 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg @@ -236,6 +236,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.104/31 +! mlag configuration domain-id flow-tracking-tests-leaf-mlag local-interface Vlan4094 @@ -252,6 +255,11 @@ route-map RM-CONN-2-BGP permit 10 route-map RM-CONN-2-BGP permit 20 match ip address prefix-list PL-L2LEAF-INBAND-MGMT ! +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 @@ -316,6 +324,6 @@ router bgp 65105 router-id 10.254.1.5 neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.105 description flow-tracking-tests-leaf4 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg index 8b601c45819..e5e02a5ad1a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg @@ -236,6 +236,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.104/31 +! mlag configuration domain-id flow-tracking-tests-leaf-mlag local-interface Vlan4094 @@ -252,6 +255,11 @@ route-map RM-CONN-2-BGP permit 10 route-map RM-CONN-2-BGP permit 20 match ip address prefix-list PL-L2LEAF-INBAND-MGMT ! +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 @@ -316,6 +324,6 @@ router bgp 65105 router-id 10.254.1.6 neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.104 description flow-tracking-tests-leaf3 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg index e04a3488592..4b93c1c28d9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg @@ -207,6 +207,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.0.255.0/24 eq 32 seq 20 permit 10.0.254.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 100.64.1.4/31 +! ipv6 prefix-list IPv6-PL-L2LEAF-INBAND-MGMT seq 10 permit 2a00:104::/64 ! @@ -229,6 +232,11 @@ route-map RM-CONN-2-BGP permit 20 route-map RM-CONN-2-BGP permit 60 match ipv6 address prefix-list IPv6-PL-L2LEAF-INBAND-MGMT ! +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 @@ -278,6 +286,6 @@ router bgp 65002 update wait-install neighbor 100.64.1.5 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 100.64.1.5 description inband-mgmt-parent-dualstack2 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg index 09e99df30b7..4fff10e9996 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg @@ -207,6 +207,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.0.255.0/24 eq 32 seq 20 permit 10.0.254.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 100.64.1.4/31 +! ipv6 prefix-list IPv6-PL-L2LEAF-INBAND-MGMT seq 10 permit 2a00:104::/64 ! @@ -229,6 +232,11 @@ route-map RM-CONN-2-BGP permit 20 route-map RM-CONN-2-BGP permit 60 match ipv6 address prefix-list IPv6-PL-L2LEAF-INBAND-MGMT ! +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 @@ -278,6 +286,6 @@ router bgp 65002 update wait-install neighbor 100.64.1.4 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 100.64.1.4 description inband-mgmt-parent-dualstack1 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg index c31e4f452a4..5853d5aec2d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg @@ -269,6 +269,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.96/31 +! mlag configuration domain-id ptp-test-leaf local-interface Vlan4094 @@ -282,6 +285,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.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 @@ -342,6 +350,6 @@ router bgp 65101 router-id 10.254.1.1 neighbor 10.254.1.97 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.97 description ptp-tests-leaf2 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg index c3602c3a878..94e2d272546 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg @@ -249,6 +249,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.96/31 +! mlag configuration domain-id ptp-test-leaf local-interface Vlan4094 @@ -262,6 +265,11 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.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 @@ -322,6 +330,6 @@ router bgp 65102 router-id 10.254.1.2 neighbor 10.254.1.96 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.96 description ptp-tests-leaf1 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg index dcac8fbf2fd..a3447d51615 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg @@ -216,6 +216,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.104/31 +! mlag configuration domain-id sflow-tests-leaf-mlag local-interface Vlan4094 @@ -232,6 +235,11 @@ route-map RM-CONN-2-BGP permit 10 route-map RM-CONN-2-BGP permit 20 match ip address prefix-list PL-L2LEAF-INBAND-MGMT ! +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 @@ -293,6 +301,6 @@ router bgp 65105 router-id 10.254.1.5 neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.105 description sflow-tests-leaf4 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg index ca61b094f69..a5ee228539f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg @@ -216,6 +216,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 10.254.1.0/27 eq 32 seq 20 permit 10.254.11.0/27 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.254.1.104/31 +! mlag configuration domain-id sflow-tests-leaf-mlag local-interface Vlan4094 @@ -232,6 +235,11 @@ route-map RM-CONN-2-BGP permit 10 route-map RM-CONN-2-BGP permit 20 match ip address prefix-list PL-L2LEAF-INBAND-MGMT ! +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 @@ -293,6 +301,6 @@ router bgp 65105 router-id 10.254.1.6 neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.254.1.104 description sflow-tests-leaf3 - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg index 48f193265ee..8f8a435fed2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg @@ -289,6 +289,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.250.0/24 eq 32 seq 20 permit 192.168.249.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.255.247.0/31 +! mlag configuration domain-id TRUNK_GROUP_TESTS_L3LEAF1 local-interface Vlan4094 @@ -302,6 +305,11 @@ ip route vrf MGMT 0.0.0.0/0 1.1.1.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 @@ -400,7 +408,7 @@ router bgp 65001 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TG_200 rd 192.168.250.9:200 @@ -410,7 +418,7 @@ router bgp 65001 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TG_300 rd 192.168.250.9:300 @@ -420,6 +428,6 @@ router bgp 65001 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg index e89ad14e58a..57b1c013941 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg @@ -269,6 +269,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.250.0/24 eq 32 seq 20 permit 192.168.249.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.255.247.0/31 +! mlag configuration domain-id TRUNK_GROUP_TESTS_L3LEAF1 local-interface Vlan4094 @@ -282,6 +285,11 @@ ip route vrf MGMT 0.0.0.0/0 1.1.1.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 @@ -380,7 +388,7 @@ router bgp 65001 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TG_200 rd 192.168.250.10:200 @@ -390,7 +398,7 @@ router bgp 65001 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! vrf TG_300 rd 192.168.250.10:300 @@ -400,6 +408,6 @@ router bgp 65001 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg index 7013ad111bb..1efacb38779 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg @@ -135,6 +135,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.250.0/24 eq 32 seq 20 permit 192.168.249.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.255.247.4/31 +! mlag configuration domain-id TRUNK_GROUP_TESTS_L3LEAF2 local-interface Vlan4094 @@ -148,6 +151,11 @@ ip route vrf MGMT 0.0.0.0/0 1.1.1.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 @@ -206,6 +214,6 @@ router bgp 65002 update wait-install neighbor 10.255.247.5 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.5 description trunk-group-tests-l3leaf2b - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg index 8cb536854f6..fb2b4ea4d90 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg @@ -130,6 +130,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.250.0/24 eq 32 seq 20 permit 192.168.249.0/24 eq 32 ! +ip prefix-list PL-MLAG-PEER-VRFS + seq 10 permit 10.255.247.4/31 +! mlag configuration domain-id TRUNK_GROUP_TESTS_L3LEAF2 local-interface Vlan4094 @@ -143,6 +146,11 @@ ip route vrf MGMT 0.0.0.0/0 1.1.1.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 @@ -201,6 +209,6 @@ router bgp 65002 update wait-install neighbor 10.255.247.4 peer group MLAG-IPv4-UNDERLAY-PEER neighbor 10.255.247.4 description trunk-group-tests-l3leaf2a - redistribute connected + redistribute connected route-map RM-CONN-2-BGP-VRFS ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml index 640202024f1..c35d3ed4ffa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml @@ -24,6 +24,9 @@ router_bgp: maximum_routes: 12000 send_community: all route_map_in: RM-MLAG-PEER-IN + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP-VRFS neighbors: - ip_address: 10.10.20.1 peer_group: MLAG-IPv4-UNDERLAY-PEER @@ -143,7 +146,20 @@ route_maps: set: - origin incomplete description: Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing +- name: RM-CONN-2-BGP-VRFS + sequence_numbers: + - sequence: 10 + type: deny + match: + - ip address prefix-list PL-MLAG-PEER-VRFS + - sequence: 20 + type: permit static_routes: - destination_address_prefix: 0.0.0.0 gateway: 10.10.1.1 vrf: default +prefix_lists: +- name: PL-MLAG-PEER-VRFS + sequence_numbers: + - sequence: 10 + action: permit 10.10.20.0/31 diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py index 54c78e7987f..f5e91213d9d 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py @@ -318,7 +318,10 @@ def _update_router_bgp_vrf_evpn_or_mpls_cfg(self: AvdStructuredConfigNetworkServ def _update_router_bgp_vrf_mlag_neighbor_cfg(self: AvdStructuredConfigNetworkServices, bgp_vrf: dict, vrf: dict, tenant: dict, vlan_id: int) -> None: """In-place update MLAG neighbor part of structured config for *one* VRF under router_bgp.vrfs.""" if not self._mlag_ibgp_peering_redistribute(vrf, tenant): - bgp_vrf["redistribute_routes"][0]["route_map"] = "RM-CONN-2-BGP-VRFS" + try: + bgp_vrf["redistribute_routes"][0]["route_map"] = "RM-CONN-2-BGP-VRFS" + except KeyError: + bgp_vrf.setdefault("redistribute_routes", []).append({"source_protocol": "connected", "route_map": "RM-CONN-2-BGP-VRFS"}) if self.shared_utils.underlay_rfc5549 and self.shared_utils.overlay_mlag_rfc5549: interface_name = f"Vlan{vlan_id}"