changing logic and schema as asked in the comment

aristanetworks · Jan 21, 2025 · bdfb890 · bdfb890
1 parent 235077a
commit bdfb890
Show file tree

Hide file tree

Showing 28 changed files with 79 additions and 195 deletions.
diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg
@@ -533,13 +533,6 @@ router bgp 65106
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65106
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor 172.31.255.10 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.10 remote-as 65001
    neighbor 172.31.255.10 description EVPN-MULTICAST-SPINE1_Ethernet6
@@ -734,7 +727,6 @@ router bgp 65106
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.8:23

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
@@ -898,9 +898,8 @@ router bgp 65101
    neighbor MLAG-IPv4-OVERLAY-PEER peer group
    neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65101
    neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
+   neighbor MLAG-IPv4-OVERLAY-PEER description EVPN-MULTICAST-L3LEAF1B
    neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
    neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor MLAG-IPv4-UNDERLAY-PEER peer group
    neighbor MLAG-IPv4-UNDERLAY-PEER remote-as 65101
@@ -1073,7 +1072,6 @@ router bgp 65101
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6

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
@@ -898,9 +898,8 @@ router bgp 65101
    neighbor MLAG-IPv4-OVERLAY-PEER peer group
    neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65101
    neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
+   neighbor MLAG-IPv4-OVERLAY-PEER description EVPN-MULTICAST-L3LEAF1A
    neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
    neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor MLAG-IPv4-UNDERLAY-PEER peer group
    neighbor MLAG-IPv4-UNDERLAY-PEER remote-as 65101
@@ -1073,7 +1072,6 @@ router bgp 65101
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg
@@ -614,13 +614,6 @@ router bgp 65103
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65103
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor 172.31.255.4 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.4 remote-as 65001
    neighbor 172.31.255.4 description EVPN-MULTICAST-SPINE1_Ethernet3
@@ -827,7 +820,6 @@ router bgp 65103
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.5:23

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg
@@ -642,13 +642,6 @@ router bgp 65104
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65104
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor 172.31.255.6 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.6 remote-as 65001
    neighbor 172.31.255.6 description EVPN-MULTICAST-SPINE1_Ethernet4
@@ -855,7 +848,6 @@ router bgp 65104
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.6:23

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg
@@ -642,13 +642,6 @@ router bgp 65105
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65105
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor 172.31.255.8 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.8 remote-as 65001
    neighbor 172.31.255.8 description EVPN-MULTICAST-SPINE1_Ethernet5
@@ -855,7 +848,6 @@ router bgp 65105
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
    !
    vrf MULTICAST_DISABLED_5_6
       rd 192.168.255.7:23

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg
@@ -109,13 +109,6 @@ router bgp 65001
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65001
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor 172.31.255.1 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.1 remote-as 65101
    neighbor 172.31.255.1 description EVPN-MULTICAST-L3LEAF1A_Ethernet1
@@ -160,7 +153,6 @@ router bgp 65001
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
 !
 router multicast
    ipv4

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
@@ -116,9 +116,8 @@ router bgp 65001
    neighbor MLAG-IPv4-OVERLAY-PEER peer group
    neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65001
    neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
+   neighbor MLAG-IPv4-OVERLAY-PEER description Description for mlag_ipv4_vrfs_peer via structured_config
    neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
    neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor MLAG-IPv4-UNDERLAY-PEER peer group
    neighbor MLAG-IPv4-UNDERLAY-PEER remote-as 65001
@@ -142,7 +141,6 @@ router bgp 65001
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
 !
 end
diff --git a/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg b/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg
@@ -108,9 +108,8 @@ router bgp 65001
    neighbor MLAG-IPv4-OVERLAY-PEER peer group
    neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65001
    neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
+   neighbor MLAG-IPv4-OVERLAY-PEER description Description for mlag_ipv4_vrfs_peer via structured_config
    neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
    neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor MLAG-IPv4-UNDERLAY-PEER peer group
    neighbor MLAG-IPv4-UNDERLAY-PEER remote-as 65001
@@ -138,7 +137,6 @@ router bgp 65001
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
       neighbor MLAG-IPv4-UNDERLAY-PEER activate
       no neighbor RR-OVERLAY-PEERS activate
    !

diff --git a/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-3.cfg b/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-3.cfg
@@ -48,13 +48,6 @@ router bgp 65001
    neighbor IPVPN-GATEWAY-PEERS description Description for ipvpn_gateway_peers via structured_config
    neighbor IPVPN-GATEWAY-PEERS send-community
    neighbor IPVPN-GATEWAY-PEERS maximum-routes 0
-   neighbor MLAG-IPv4-OVERLAY-PEER peer group
-   neighbor MLAG-IPv4-OVERLAY-PEER remote-as 65001
-   neighbor MLAG-IPv4-OVERLAY-PEER next-hop-self
-   neighbor MLAG-IPv4-OVERLAY-PEER update-source Loopback0
-   neighbor MLAG-IPv4-OVERLAY-PEER route-map RM-MLAG-PEER-IN in
-   neighbor MLAG-IPv4-OVERLAY-PEER send-community
-   neighbor MLAG-IPv4-OVERLAY-PEER maximum-routes 12000
    neighbor MPLS-OVERLAY-PEERS peer group
    neighbor MPLS-OVERLAY-PEERS remote-as 65001
    neighbor MPLS-OVERLAY-PEERS update-source Loopback0
@@ -69,7 +62,6 @@ router bgp 65001
    !
    address-family ipv4
       no neighbor IPVPN-GATEWAY-PEERS activate
-      neighbor MLAG-IPv4-OVERLAY-PEER activate
       no neighbor MPLS-OVERLAY-PEERS activate
    !
    address-family vpn-ipv4

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml
@@ -139,15 +139,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65106'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 172.31.255.10
     peer_group: IPv4-UNDERLAY-PEERS
@@ -462,8 +453,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.8:13

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml
@@ -320,6 +320,13 @@ router_bgp:
     send_community: all
     maximum_routes: 12000
     route_map_in: RM-MLAG-PEER-IN
+  - name: MLAG-IPv4-OVERLAY-PEER
+    type: ipv4
+    remote_as: '65101'
+    description: EVPN-MULTICAST-L3LEAF1B
+    next_hop_self: true
+    maximum_routes: 12000
+    route_map_in: RM-MLAG-PEER-IN
   - name: IPv4-UNDERLAY-PEERS
     type: ipv4
     send_community: all
@@ -331,15 +338,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65101'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 10.255.251.1
     peer_group: MLAG-IPv4-UNDERLAY-PEER
@@ -574,8 +572,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.3:13

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml
@@ -320,6 +320,13 @@ router_bgp:
     send_community: all
     maximum_routes: 12000
     route_map_in: RM-MLAG-PEER-IN
+  - name: MLAG-IPv4-OVERLAY-PEER
+    type: ipv4
+    remote_as: '65101'
+    description: EVPN-MULTICAST-L3LEAF1A
+    next_hop_self: true
+    maximum_routes: 12000
+    route_map_in: RM-MLAG-PEER-IN
   - name: IPv4-UNDERLAY-PEERS
     type: ipv4
     send_community: all
@@ -331,15 +338,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65101'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 10.255.251.0
     peer_group: MLAG-IPv4-UNDERLAY-PEER
@@ -574,8 +572,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.4:13

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml
@@ -206,15 +206,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65103'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 172.31.255.4
     peer_group: IPv4-UNDERLAY-PEERS
@@ -541,8 +532,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.5:13

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml
@@ -241,15 +241,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65104'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 172.31.255.6
     peer_group: IPv4-UNDERLAY-PEERS
@@ -576,8 +567,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.6:13

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml
@@ -241,15 +241,6 @@ router_bgp:
     ebgp_multihop: 3
     send_community: all
     maximum_routes: 0
-  - name: MLAG-IPv4-OVERLAY-PEER
-    type: ipv4
-    remote_as: '65105'
-    update_source: Loopback0
-    bfd: false
-    next_hop_self: true
-    send_community: all
-    maximum_routes: 12000
-    route_map_in: RM-MLAG-PEER-IN
   neighbors:
   - ip_address: 172.31.255.8
     peer_group: IPv4-UNDERLAY-PEERS
@@ -576,8 +567,6 @@ router_bgp:
       activate: true
     - name: EVPN-OVERLAY-PEERS
       activate: false
-    - name: MLAG-IPv4-OVERLAY-PEER
-      activate: true
   vrfs:
   - name: MULTICAST_DISABLED_310_311
     rd: 192.168.255.7:13