Feat(eos_designs): Add keys to set mlag_peer_ipv4 and mlag_peer_l3_ip…

…v4 directly
jmussmann · Jul 4, 2024 · b6d177f · b6d177f
1 parent a771b12
commit b6d177f
Show file tree

Hide file tree

Showing 11 changed files with 220 additions and 90 deletions.
diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg
@@ -622,7 +622,7 @@ interface Vlan2
    no shutdown
    mtu 1500
    vrf Tenant_C_OP_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan110
    description Tenant_A_OP_Zone_1
@@ -737,7 +737,7 @@ interface Vlan3008
    no shutdown
    mtu 1500
    vrf Tenant_A_OP_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3010
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone
@@ -751,55 +751,55 @@ interface Vlan3011
    no shutdown
    mtu 1500
    vrf Tenant_A_APP_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3012
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone
    no shutdown
    mtu 1500
    vrf Tenant_A_DB_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3013
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_A_WAN_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3019
    description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone
    no shutdown
    mtu 1500
    vrf Tenant_B_OP_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3020
    description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_B_WAN_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan3030
    description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_C_WAN_Zone
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan4090
    description MLAG_PEER_L3_PEERING
    no shutdown
    mtu 1500
-   ip address 10.255.251.6/31
+   ip address 192.168.44.41/31
 !
 interface Vlan4092
    description MLAG_PEER
    no shutdown
    mtu 1500
    no autostate
-   ip address 10.255.252.6/31
+   ip address 192.168.44.41/31
 !
 interface Vxlan1
    description DC1-SVC3A_VTEP
@@ -875,13 +875,13 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 20 permit 192.168.254.0/24 eq 32
 !
 ip prefix-list PL-MLAG-PEER-VRFS
-   seq 10 permit 10.255.251.6/31
-   seq 20 permit 172.31.11.6/31
+   seq 10 permit 172.31.11.6/31
+   seq 20 permit 192.168.44.40/31
 !
 mlag configuration
    domain-id custom_mlag_domain_id
    local-interface Vlan4092
-   peer-address 10.255.252.7
+   peer-address 192.168.44.42
    peer-link Port-Channel2000
    reload-delay mlag 300
    reload-delay non-mlag 330
@@ -928,8 +928,6 @@ router bgp 65103
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
-   neighbor 10.255.251.7 peer group MLAG-PEERS
-   neighbor 10.255.251.7 description DC1-SVC3B
    neighbor 172.31.254.96 peer group UNDERLAY-PEERS
    neighbor 172.31.254.96 remote-as 65001
    neighbor 172.31.254.96 description DC1-SPINE1_Ethernet7/1
@@ -942,6 +940,8 @@ router bgp 65103
    neighbor 172.31.254.102 peer group UNDERLAY-PEERS
    neighbor 172.31.254.102 remote-as 65001
    neighbor 172.31.254.102 description DC1-SPINE4_Ethernet7/1
+   neighbor 192.168.44.42 peer group MLAG-PEERS
+   neighbor 192.168.44.42 description DC1-SVC3B
    neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.1 remote-as 65001
    neighbor 192.168.255.1 description DC1-SPINE1
@@ -1037,7 +1037,7 @@ router bgp 65103
       route-target export evpn 12:12
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_DB_Zone
@@ -1046,7 +1046,7 @@ router bgp 65103
       route-target export evpn 13:13
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_OP_Zone
@@ -1055,7 +1055,7 @@ router bgp 65103
       route-target export evpn 9:9
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_A_WAN_Zone
@@ -1066,7 +1066,7 @@ router bgp 65103
       route-target export evpn 65000:789
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WEB_Zone
@@ -1084,7 +1084,7 @@ router bgp 65103
       route-target export evpn 20:20
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_B_WAN_Zone
@@ -1093,7 +1093,7 @@ router bgp 65103
       route-target export evpn 21:21
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_C_OP_Zone
@@ -1102,7 +1102,7 @@ router bgp 65103
       route-target export evpn 30:30
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_C_WAN_Zone
@@ -1111,7 +1111,7 @@ router bgp 65103
       route-target export evpn 31:31
       router-id 192.168.255.12
       update wait-install
-      neighbor 10.255.251.7 peer group MLAG-PEERS
+      neighbor 192.168.44.42 peer group MLAG-PEERS
       redistribute connected
 !
 management api http-commands

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg
@@ -588,7 +588,7 @@ interface Vlan2
    no shutdown
    mtu 1500
    vrf Tenant_C_OP_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan110
    description Tenant_A_OP_Zone_1
@@ -703,7 +703,7 @@ interface Vlan3008
    no shutdown
    mtu 1500
    vrf Tenant_A_OP_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3010
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone
@@ -717,55 +717,55 @@ interface Vlan3011
    no shutdown
    mtu 1500
    vrf Tenant_A_APP_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3012
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone
    no shutdown
    mtu 1500
    vrf Tenant_A_DB_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3013
    description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_A_WAN_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3019
    description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone
    no shutdown
    mtu 1500
    vrf Tenant_B_OP_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3020
    description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_B_WAN_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan3030
    description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone
    no shutdown
    mtu 1500
    vrf Tenant_C_WAN_Zone
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan4090
    description MLAG_PEER_L3_PEERING
    no shutdown
    mtu 1500
-   ip address 10.255.251.7/31
+   ip address 192.168.44.42/31
 !
 interface Vlan4092
    description MLAG_PEER
    no shutdown
    mtu 1500
    no autostate
-   ip address 10.255.252.7/31
+   ip address 192.168.44.42/31
 !
 interface Vxlan1
    description DC1-SVC3B_VTEP
@@ -840,13 +840,13 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 20 permit 192.168.254.0/24 eq 32
 !
 ip prefix-list PL-MLAG-PEER-VRFS
-   seq 10 permit 10.255.251.6/31
-   seq 20 permit 172.31.11.6/31
+   seq 10 permit 172.31.11.6/31
+   seq 20 permit 192.168.44.42/31
 !
 mlag configuration
    domain-id custom_mlag_domain_id
    local-interface Vlan4092
-   peer-address 10.255.252.6
+   peer-address 192.168.44.41
    peer-link Port-Channel2000
    reload-delay mlag 300
    reload-delay non-mlag 330
@@ -893,8 +893,6 @@ router bgp 65103
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
-   neighbor 10.255.251.6 peer group MLAG-PEERS
-   neighbor 10.255.251.6 description DC1-SVC3A
    neighbor 172.31.254.128 peer group UNDERLAY-PEERS
    neighbor 172.31.254.128 remote-as 65001
    neighbor 172.31.254.128 description DC1-SPINE1_Ethernet9/1
@@ -907,6 +905,8 @@ router bgp 65103
    neighbor 172.31.254.134 peer group UNDERLAY-PEERS
    neighbor 172.31.254.134 remote-as 65001
    neighbor 172.31.254.134 description DC1-SPINE4_Ethernet9/1
+   neighbor 192.168.44.41 peer group MLAG-PEERS
+   neighbor 192.168.44.41 description DC1-SVC3A
    neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.1 remote-as 65001
    neighbor 192.168.255.1 description DC1-SPINE1
@@ -1002,7 +1002,7 @@ router bgp 65103
       route-target export evpn 12:12
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_DB_Zone
@@ -1011,7 +1011,7 @@ router bgp 65103
       route-target export evpn 13:13
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_OP_Zone
@@ -1020,7 +1020,7 @@ router bgp 65103
       route-target export evpn 9:9
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_A_WAN_Zone
@@ -1031,7 +1031,7 @@ router bgp 65103
       route-target export evpn 65000:789
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected route-map RM-CONN-2-BGP-VRFS
    !
    vrf Tenant_A_WEB_Zone
@@ -1049,7 +1049,7 @@ router bgp 65103
       route-target export evpn 20:20
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_B_WAN_Zone
@@ -1058,7 +1058,7 @@ router bgp 65103
       route-target export evpn 21:21
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_C_OP_Zone
@@ -1067,7 +1067,7 @@ router bgp 65103
       route-target export evpn 30:30
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected
    !
    vrf Tenant_C_WAN_Zone
@@ -1076,7 +1076,7 @@ router bgp 65103
       route-target export evpn 31:31
       router-id 192.168.255.13
       update wait-install
-      neighbor 10.255.251.6 peer group MLAG-PEERS
+      neighbor 192.168.44.41 peer group MLAG-PEERS
       redistribute connected
 !
 management api http-commands