Feat(eos_designs): Add support to use router general for router id

aristanetworks · Nov 6, 2024 · a60d675 · a60d675
1 parent 0ab8c82
commit a60d675
Show file tree

Hide file tree

Showing 41 changed files with 224 additions and 57 deletions.
diff --git a/.../eos_designs_negative_unit_tests/inventory/host_vars/use-router-general-for-router-id.yml b/.../eos_designs_negative_unit_tests/inventory/host_vars/use-router-general-for-router-id.yml
@@ -0,0 +1,17 @@
+use_router_general_for_router_id: true
+
+type: spine
+
+spine:
+  defaults:
+    bgp_as: 65001
+    loopback_ipv4_pool: 192.168.255.0/24
+  nodes:
+    - name: use-router-general-for-router-id
+      id: 1
+      mgmt_ip: 192.168.200.101/24
+      mac_address: '0c:1d:c0:1d:62:01'
+
+expected_error_message: >-
+  'use_router_general_for_router_id' is set true but 'router_general_settings'
+  is not defined for 'use-router-general-for-router-id'
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml
@@ -135,6 +135,7 @@ all:
             source-interfaces-tacacs-missing-inband-mgmt-interface:
             source-interfaces-tacacs-missing-mgmt-ip:
             ul-filter-evpn-default-vrf-services:
+            use-router-general-for-router-id:
             sflow-settings-missing-destinations:
             sflow-settings-missing-inband-mgmt-interface:
             sflow-settings-missing-mgmt-ip:

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg
@@ -334,6 +334,9 @@ router bgp 65104
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 172.31.254.160 peer group UNDERLAY-PEERS
    neighbor 172.31.254.160 remote-as 65001
    neighbor 172.31.254.160 description DC1-SPINE1_Ethernet22
@@ -358,9 +361,6 @@ router bgp 65104
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    neighbor 192.168.255.16 peer group EVPN-OVERLAY-CORE
    neighbor 192.168.255.16 remote-as 65106
    neighbor 192.168.255.16 description DC1-BL2A

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg
@@ -318,6 +318,9 @@ router bgp 65105
    neighbor 2.2.2.2 peer group EVPN-OVERLAY-CORE
    neighbor 2.2.2.2 remote-as 65555
    neighbor 2.2.2.2 description MY_EVPN_GW2_USER_DEFINED
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 172.31.254.192 peer group UNDERLAY-PEERS
    neighbor 172.31.254.192 remote-as 65001
    neighbor 172.31.254.192 description DC1-SPINE1_Ethernet23
@@ -339,9 +342,6 @@ router bgp 65105
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_WAN_Zone

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg
@@ -228,6 +228,9 @@ router bgp 65106
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 100.70.0.1 peer group IPVPN-INTERWORKING-PEERS
    neighbor 100.70.0.1 remote-as 64512
    neighbor 100.70.0.1 description rr1
@@ -257,9 +260,6 @@ router bgp 65106
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_WAN_Zone

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg
@@ -225,6 +225,9 @@ router bgp 65107
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 100.70.0.1 peer group IPVPN-INTERWORKING-PEERS
    neighbor 100.70.0.1 remote-as 64512
    neighbor 100.70.0.1 description rr1
@@ -254,9 +257,6 @@ router bgp 65107
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_WAN_Zone

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg
@@ -263,6 +263,9 @@ router bgp 65108
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 10.255.251.19 peer group MLAG-PEERS
    neighbor 10.255.251.19 description DC1-CL1B
    neighbor 172.31.255.32 peer group UNDERLAY-PEERS
@@ -286,9 +289,6 @@ router bgp 65108
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg
@@ -268,6 +268,9 @@ router bgp 65109
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 10.255.251.18 peer group MLAG-PEERS
    neighbor 10.255.251.18 description DC1-CL1A
    neighbor 172.31.255.64 peer group UNDERLAY-PEERS
@@ -291,9 +294,6 @@ router bgp 65109
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg
@@ -306,6 +306,9 @@ router bgp 65101
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 172.31.254.0 peer group UNDERLAY-PEERS
    neighbor 172.31.254.0 remote-as 65001
    neighbor 172.31.254.0 description DC1-SPINE1_Ethernet1/1
@@ -327,9 +330,6 @@ router bgp 65101
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle 12345678

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg
@@ -705,6 +705,9 @@ router bgp 65102
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 172.31.254.32 peer group UNDERLAY-PEERS
    neighbor 172.31.254.32 remote-as 65001
    neighbor 172.31.254.32 description DC1-SPINE1_Ethernet3/1
@@ -738,9 +741,6 @@ router bgp 65102
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle 12345678

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg
@@ -669,6 +669,9 @@ router bgp 65102
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 172.31.254.64 peer group UNDERLAY-PEERS
    neighbor 172.31.254.64 remote-as 65001
    neighbor 172.31.254.64 description DC1-SPINE1_Ethernet5/1
@@ -702,9 +705,6 @@ router bgp 65102
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle 12345678

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg
@@ -163,7 +163,7 @@ interface Ethernet29
 interface Loopback0
    description ROUTER_ID
    no shutdown
-   ip address 192.168.255.4/32
+   ip address 10.10.10.10/32
 !
 interface Management1
    description OOB_MANAGEMENT
@@ -190,7 +190,7 @@ router bfd
    multihop interval 1200 min-rx 1200 multiplier 3
 !
 router bgp 65001
-   router-id 192.168.255.4
+   router-id 10.10.10.10
    update wait-install
    no bgp default ipv4-unicast
    maximum-paths 4 ecmp 4
@@ -300,4 +300,9 @@ router bgp 65001
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor UNDERLAY-PEERS activate
 !
+router general
+   router-id ipv4 10.10.10.10
+   router-id ipv6 10::ab
+   exit
+!
 end
diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg
@@ -985,6 +985,9 @@ router bgp 65103
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    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
@@ -1008,9 +1011,6 @@ router bgp 65103
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

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
@@ -949,6 +949,9 @@ router bgp 65103
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    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
@@ -972,9 +975,6 @@ router bgp 65103
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg
@@ -549,6 +549,9 @@ router bgp 65110
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 10.255.251.25 peer group MLAG-PEERS
    neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
    neighbor 172.31.255.128 peer group UNDERLAY-PEERS
@@ -572,9 +575,6 @@ router bgp 65110
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg
@@ -549,6 +549,9 @@ router bgp 65111
    neighbor UNDERLAY-PEERS password 7 0nsCUm70mvSTxVO0ldytrg==
    neighbor UNDERLAY-PEERS send-community
    neighbor UNDERLAY-PEERS maximum-routes 12000
+   neighbor 10.10.10.10 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.10 remote-as 65001
+   neighbor 10.10.10.10 description DC1-SPINE4
    neighbor 10.255.251.24 peer group MLAG-PEERS
    neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A
    neighbor 172.31.255.160 peer group UNDERLAY-PEERS
@@ -572,9 +575,6 @@ router bgp 65111
    neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.3 remote-as 65001
    neighbor 192.168.255.3 description DC1-SPINE3
-   neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS
-   neighbor 192.168.255.4 remote-as 65001
-   neighbor 192.168.255.4 description DC1-SPINE4
    redistribute connected route-map RM-CONN-2-BGP
    !
    vlan-aware-bundle Tenant_A_APP_Zone

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml
@@ -82,7 +82,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml
@@ -82,7 +82,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml
@@ -112,7 +112,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml
@@ -102,7 +102,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml
@@ -87,7 +87,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml
@@ -88,7 +88,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml
@@ -74,7 +74,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
@@ -94,7 +94,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
@@ -94,7 +94,7 @@ router_bgp:
     peer: DC1-SPINE3
     description: DC1-SPINE3
     remote_as: '65001'
-  - ip_address: 192.168.255.4
+  - ip_address: 10.10.10.10
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SPINE4
     description: DC1-SPINE4