Merge branch 'devel' into relax-wan-default-requirements

aristanetworks · Jan 29, 2025 · 007dc5a · 007dc5a
2 parents 49a7c22 + 829f6ef
commit 007dc5a
Show file tree

Hide file tree

Showing 57 changed files with 2,594 additions and 605 deletions.
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1,6 +1,6 @@
 # Python version
 sonar.python.version=3.10, 3.11, 3.12, 3.13
 # Exclude generated classes
-sonar.exclusions=python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py,python-avd/pyavd/_eos_designs/schema/__init__.py
+sonar.exclusions=python-avd/tests/**,python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py,python-avd/pyavd/_eos_designs/schema/__init__.py
 # Path to tests
 sonar.tests=python-avd/tests/
diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg
@@ -201,10 +201,6 @@ vlan 3041
    name MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241
    trunk group MLAG
 !
-vlan 3050
-   name MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED
-   trunk group MLAG
-!
 vlan 3051
    name MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT
    trunk group MLAG
@@ -682,13 +678,6 @@ interface Vlan3041
    vrf TEN_D_L3_MULTICAST_DISABLED_240_241
    ip address 10.255.251.0/31
 !
-interface Vlan3050
-   description MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED
-   no shutdown
-   mtu 9214
-   vrf TEN_E_PEG_L3_MULTICAST_ENABLED
-   ip address 10.255.251.0/31
-!
 interface Vlan3051
    description MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT
    no shutdown
@@ -902,6 +891,13 @@ router bgp 65101
    neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
    neighbor MLAG-IPv4-UNDERLAY-PEER send-community
    neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000
+   neighbor MLAG-IPv4-VRFS-PEER peer group
+   neighbor MLAG-IPv4-VRFS-PEER remote-as 65101
+   neighbor MLAG-IPv4-VRFS-PEER next-hop-self
+   neighbor MLAG-IPv4-VRFS-PEER description EVPN-MULTICAST-L3LEAF1B
+   neighbor MLAG-IPv4-VRFS-PEER route-map RM-MLAG-PEER-IN in
+   neighbor MLAG-IPv4-VRFS-PEER send-community
+   neighbor MLAG-IPv4-VRFS-PEER maximum-routes 12000
    neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
    neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan4093
    neighbor 172.31.255.0 peer group IPv4-UNDERLAY-PEERS
@@ -1067,14 +1063,15 @@ router bgp 65101
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
+      neighbor MLAG-IPv4-VRFS-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.3:23
       route-target import evpn 23:23
       route-target export evpn 23:23
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3022
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1084,7 +1081,7 @@ router bgp 65101
       route-target export evpn 13:13
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3012
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1094,7 +1091,7 @@ router bgp 65101
       route-target export evpn 21:21
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3020
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1104,7 +1101,7 @@ router bgp 65101
       route-target export evpn 22:22
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3021
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1114,7 +1111,7 @@ router bgp 65101
       route-target export evpn 11:11
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3010
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1124,7 +1121,7 @@ router bgp 65101
       route-target export evpn 12:12
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3011
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1134,7 +1131,7 @@ router bgp 65101
       route-target export evpn 33:33
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3032
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1144,7 +1141,7 @@ router bgp 65101
       route-target export evpn 66:66
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3065
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1155,7 +1152,7 @@ router bgp 65101
       route-target export evpn 32:32
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3031
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1166,7 +1163,7 @@ router bgp 65101
       route-target export evpn 42:42
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3041
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1176,7 +1173,7 @@ router bgp 65101
       route-target export evpn 41:41
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3040
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1187,7 +1184,7 @@ router bgp 65101
       route-target export evpn 55:55
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3054
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1198,7 +1195,7 @@ router bgp 65101
       route-target export evpn 60:60
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3059
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1211,7 +1208,7 @@ router bgp 65101
       route-target export evpn 52:52
       router-id 192.168.255.3
       update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.1 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3051
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1223,10 +1220,7 @@ router bgp 65101
       route-target import evpn 51:51
       route-target export evpn 51:51
       router-id 192.168.255.3
-      update wait-install
-      neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER
-      neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3050
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
       evpn multicast
 !
 router multicast

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg
@@ -201,10 +201,6 @@ vlan 3041
    name MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241
    trunk group MLAG
 !
-vlan 3050
-   name MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED
-   trunk group MLAG
-!
 vlan 3051
    name MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT
    trunk group MLAG
@@ -682,13 +678,6 @@ interface Vlan3041
    vrf TEN_D_L3_MULTICAST_DISABLED_240_241
    ip address 10.255.251.1/31
 !
-interface Vlan3050
-   description MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED
-   no shutdown
-   mtu 9214
-   vrf TEN_E_PEG_L3_MULTICAST_ENABLED
-   ip address 10.255.251.1/31
-!
 interface Vlan3051
    description MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT
    no shutdown
@@ -902,6 +891,13 @@ router bgp 65101
    neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
    neighbor MLAG-IPv4-UNDERLAY-PEER send-community
    neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000
+   neighbor MLAG-IPv4-VRFS-PEER peer group
+   neighbor MLAG-IPv4-VRFS-PEER remote-as 65101
+   neighbor MLAG-IPv4-VRFS-PEER next-hop-self
+   neighbor MLAG-IPv4-VRFS-PEER description EVPN-MULTICAST-L3LEAF1A
+   neighbor MLAG-IPv4-VRFS-PEER route-map RM-MLAG-PEER-IN in
+   neighbor MLAG-IPv4-VRFS-PEER send-community
+   neighbor MLAG-IPv4-VRFS-PEER maximum-routes 12000
    neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
    neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan4093
    neighbor 172.31.255.2 peer group IPv4-UNDERLAY-PEERS
@@ -1067,14 +1063,15 @@ router bgp 65101
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
+      neighbor MLAG-IPv4-VRFS-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.4:23
       route-target import evpn 23:23
       route-target export evpn 23:23
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3022
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1084,7 +1081,7 @@ router bgp 65101
       route-target export evpn 13:13
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3012
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1094,7 +1091,7 @@ router bgp 65101
       route-target export evpn 21:21
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3020
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1104,7 +1101,7 @@ router bgp 65101
       route-target export evpn 22:22
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3021
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1114,7 +1111,7 @@ router bgp 65101
       route-target export evpn 11:11
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3010
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1124,7 +1121,7 @@ router bgp 65101
       route-target export evpn 12:12
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3011
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1134,7 +1131,7 @@ router bgp 65101
       route-target export evpn 33:33
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3032
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1144,7 +1141,7 @@ router bgp 65101
       route-target export evpn 66:66
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3065
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1155,7 +1152,7 @@ router bgp 65101
       route-target export evpn 32:32
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3031
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1166,7 +1163,7 @@ router bgp 65101
       route-target export evpn 42:42
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3041
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
@@ -1176,7 +1173,7 @@ router bgp 65101
       route-target export evpn 41:41
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3040
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1187,7 +1184,7 @@ router bgp 65101
       route-target export evpn 55:55
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3054
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1198,7 +1195,7 @@ router bgp 65101
       route-target export evpn 60:60
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3059
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1211,7 +1208,7 @@ router bgp 65101
       route-target export evpn 52:52
       router-id 192.168.255.4
       update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
+      neighbor 10.255.251.0 peer group MLAG-IPv4-VRFS-PEER
       neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3051
       redistribute connected route-map RM-CONN-2-BGP-VRFS
       evpn multicast
@@ -1223,10 +1220,7 @@ router bgp 65101
       route-target import evpn 51:51
       route-target export evpn 51:51
       router-id 192.168.255.4
-      update wait-install
-      neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER
-      neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3050
-      redistribute connected route-map RM-CONN-2-BGP-VRFS
+      redistribute connected
       evpn multicast
 !
 router multicast

diff --git a/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg b/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg
@@ -121,6 +121,13 @@ router bgp 65001
    neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in
    neighbor MLAG-IPv4-UNDERLAY-PEER send-community
    neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000
+   neighbor MLAG-IPv4-VRFS-PEER peer group
+   neighbor MLAG-IPv4-VRFS-PEER remote-as 65001
+   neighbor MLAG-IPv4-VRFS-PEER next-hop-self
+   neighbor MLAG-IPv4-VRFS-PEER description Description for mlag_ipv4_vrfs_peer via structured_config
+   neighbor MLAG-IPv4-VRFS-PEER route-map RM-MLAG-PEER-IN in
+   neighbor MLAG-IPv4-VRFS-PEER send-community
+   neighbor MLAG-IPv4-VRFS-PEER maximum-routes 12000
    neighbor 192.168.253.205 peer group MLAG-IPv4-UNDERLAY-PEER
    neighbor 192.168.253.205 description bgp-peer-groups-2_Vlan4094
    neighbor 192.168.255.112 peer group EVPN-OVERLAY-PEERS
@@ -136,5 +143,6 @@ router bgp 65001
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
+      neighbor MLAG-IPv4-VRFS-PEER activate
 !
 end