From 27f0a0f8e4ebbfc07610a7538ab512280b0f658e Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Mon, 4 Nov 2024 22:22:41 +0530 Subject: [PATCH] Feat(eos_designs): Add support to use router general for router id --- .../intended/configs/DC1-SPINE4.cfg | 5 ++- .../intended/configs/core-1-isis-sr-ldp.cfg | 7 +++- .../intended/configs/core-2-ospf-ldp.cfg | 7 +++- .../structured_configs/7010TX-LEAF1.yml | 2 +- .../structured_configs/7010TX-LEAF2.yml | 2 +- .../AUTO_BGP_ASN_LEAF1A.yml | 2 +- .../AUTO_BGP_ASN_LEAF1B.yml | 2 +- .../structured_configs/AUTO_BGP_ASN_LEAF2.yml | 2 +- .../AUTO_BGP_ASN_LEAF3A.yml | 2 +- .../AUTO_BGP_ASN_LEAF3B.yml | 2 +- .../AUTO_BGP_ASN_LEAF4A.yml | 2 +- .../AUTO_BGP_ASN_LEAF4B.yml | 2 +- .../AUTO_BGP_ASN_LEAF5A.yml | 2 +- .../AUTO_BGP_ASN_LEAF7A.yml | 2 +- .../AUTO_BGP_ASN_LEAF7B.yml | 2 +- .../AUTO_BGP_ASN_LEAF8A.yml | 2 +- .../AUTO_BGP_ASN_LEAF8B.yml | 2 +- .../AUTO_BGP_UNGROUPED_LEAF6.yml | 2 +- .../AUTO_NODE_TYPE_LEAF01.yml | 2 +- .../AUTO_NODE_TYPE_SPINE01.yml | 2 +- .../AUTO_NODE_TYPE_SPINE02.yml | 2 +- .../AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml | 2 +- .../CUSTOM-PYTHON_MODULES-L3LEAF1A.yml | 2 +- .../CUSTOM-PYTHON_MODULES-L3LEAF1B.yml | 2 +- .../CUSTOM-PYTHON_MODULES-L3LEAF2.yml | 2 +- .../CUSTOM-PYTHON_MODULES-SPINE1.yml | 2 +- .../CUSTOM-TEMPLATES-L3LEAF1A.yml | 2 +- .../CUSTOM-TEMPLATES-L3LEAF1B.yml | 2 +- .../CUSTOM-TEMPLATES-SPINE1.yml | 2 +- .../intended/structured_configs/DC1-BL1A.yml | 6 +-- .../intended/structured_configs/DC1-BL1B.yml | 6 +-- .../intended/structured_configs/DC1-BL2A.yml | 2 +- .../intended/structured_configs/DC1-BL2B.yml | 2 +- .../intended/structured_configs/DC1-CL1A.yml | 2 +- .../intended/structured_configs/DC1-CL1B.yml | 2 +- .../structured_configs/DC1-LEAF1A.yml | 6 +-- .../structured_configs/DC1-LEAF2A.yml | 6 +-- .../structured_configs/DC1-LEAF2B.yml | 6 +-- .../structured_configs/DC1-SPINE1.yml | 2 +- .../structured_configs/DC1-SPINE2.yml | 2 +- .../structured_configs/DC1-SPINE3.yml | 2 +- .../structured_configs/DC1-SPINE4.yml | 5 ++- .../intended/structured_configs/DC1-SVC3A.yml | 2 +- .../intended/structured_configs/DC1-SVC3B.yml | 2 +- .../DC1_UNDEPLOYED_LEAF1A.yml | 2 +- .../DC1_UNDEPLOYED_LEAF1B.yml | 2 +- .../intended/structured_configs/DUP-LEAF1.yml | 2 +- .../intended/structured_configs/DUP-LEAF2.yml | 2 +- .../EVPN-MULTICAST-DISABLED.yml | 2 +- .../EVPN-MULTICAST-L3LEAF1A.yml | 2 +- .../EVPN-MULTICAST-L3LEAF1B.yml | 2 +- .../EVPN-MULTICAST-L3LEAF2A.yml | 2 +- .../EVPN-MULTICAST-L3LEAF3A.yml | 2 +- .../EVPN-MULTICAST-L3LEAF3B.yml | 2 +- .../EVPN-MULTICAST-SPINE1.yml | 2 +- .../IGMP-QUERIER-L3LEAF1A.yml | 2 +- .../intended/structured_configs/MH-LEAF1A.yml | 2 +- .../intended/structured_configs/MH-LEAF1B.yml | 2 +- .../intended/structured_configs/MH-LEAF2A.yml | 2 +- .../structured_configs/MLAG-OSPF-L3LEAF1A.yml | 6 +-- .../structured_configs/MLAG-OSPF-L3LEAF1B.yml | 6 +-- .../structured_configs/MLAG_IPV6_L3LEAF1A.yml | 2 +- .../structured_configs/MLAG_IPV6_L3LEAF1B.yml | 2 +- .../MLAG_ODD_ID_L3LEAF1A.yml | 2 +- .../MLAG_ODD_ID_L3LEAF1B.yml | 2 +- .../MLAG_SAME_SUBNET_L3LEAF1A.yml | 2 +- .../MLAG_SAME_SUBNET_L3LEAF1B.yml | 2 +- .../MLAG_SAME_SUBNET_L3LEAF2A.yml | 2 +- .../MLAG_SAME_SUBNET_L3LEAF2B.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml | 2 +- .../OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml | 2 +- .../OVERRIDE_VTEP_L3LEAF1A.yml | 2 +- .../OVERRIDE_VTEP_L3LEAF1B.yml | 2 +- .../P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml | 2 +- .../RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml | 2 +- .../structured_configs/SVI_PROFILE_NODE_1.yml | 6 +-- .../structured_configs/SVI_PROFILE_NODE_2.yml | 6 +-- .../UNDERLAY-MULTICAST-L3LEAF1A.yml | 2 +- .../UNDERLAY-MULTICAST-L3LEAF1B.yml | 2 +- .../UNDERLAY-MULTICAST-L3LEAF2A.yml | 2 +- .../UNDERLAY-MULTICAST-L3LEAF2B.yml | 2 +- .../UNDERLAY-MULTICAST-SPINE1.yml | 2 +- .../UNDERLAY-MULTICAST-SPINE2.yml | 2 +- .../UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml | 2 +- .../UNDERLAY_FILTER_PEER_AS_SPINE1.yml | 2 +- .../UNDERLAY_FILTER_PEER_AS_SPINE2.yml | 2 +- ...UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml | 2 +- ...UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml | 2 +- .../UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml | 2 +- .../UPLINK_P2P_VRFS_TESTS_LEAF1.yml | 2 +- .../UPLINK_P2P_VRFS_TESTS_SPINE1.yml | 2 +- .../UPLINK_P2P_VRFS_TESTS_SPINE2.yml | 2 +- .../autovpn-edge-no-default-policy.yml | 2 +- .../structured_configs/autovpn-edge.yml | 2 +- .../structured_configs/autovpn-rr1.yml | 2 +- .../structured_configs/autovpn-rr2.yml | 2 +- .../bgp-from-network-services-1.yml | 2 +- .../structured_configs/bgp-options.yml | 2 +- .../structured_configs/bgp-peer-groups-1.yml | 2 +- .../structured_configs/bgp-peer-groups-2.yml | 2 +- .../structured_configs/bgp-peer-groups-3.yml | 4 +- .../structured_configs/core-1-isis-sr-ldp.yml | 6 ++- .../structured_configs/core-2-ospf-ldp.yml | 6 ++- .../structured_configs/core-3-isis-sr-ldp.yml | 4 +- .../structured_configs/core-4-multicast.yml | 2 +- .../structured_configs/custom-ptp-profile.yml | 2 +- ...der-custom-control-plane-policy-edge-1.yml | 2 +- ...der-custom-control-plane-policy-edge-2.yml | 2 +- ...der-custom-control-plane-policy-edge-3.yml | 2 +- ...stom-control-plane-policy-pathfinder-1.yml | 2 +- ...-pathfinder-edge-custom-default-policy.yml | 2 +- .../cv-pathfinder-edge-no-default-policy.yml | 2 +- .../structured_configs/cv-pathfinder-edge.yml | 2 +- .../cv-pathfinder-edge1.yml | 2 +- .../cv-pathfinder-edge2A.yml | 2 +- .../cv-pathfinder-edge2B.yml | 2 +- .../cv-pathfinder-edge3A.yml | 2 +- .../cv-pathfinder-edge3B.yml | 2 +- .../cv-pathfinder-edge4A.yml | 2 +- .../cv-pathfinder-edge4B.yml | 2 +- .../cv-pathfinder-pathfinder.yml | 2 +- .../cv-pathfinder-pathfinder1.yml | 2 +- .../cv-pathfinder-pathfinder2.yml | 2 +- .../cv-pathfinder-transit1A.yml | 2 +- .../cv-pathfinder-transit1B.yml | 2 +- .../cvp-instance-ips-cvaas.yml | 2 +- .../default_overlay_protocol_cvx.yml | 2 +- .../default_overlay_protocol_her.yml | 2 +- .../device.with.dots.in.hostname.yml | 2 +- .../downlink-pools-l3leaf1.yml | 2 +- .../downlink-pools-l3leaf2.yml | 2 +- .../downlink-pools-l3leaf3.yml | 2 +- .../downlink-pools-l3leaf4.yml | 2 +- .../downlink-pools-spine1.yml | 2 +- .../downlink-pools-spine2.yml | 2 +- .../structured_configs/duplicate-vrfs.yml | 2 +- .../evpn-to-ipvpn-gateway.yml | 2 +- .../evpn-vtep-with-default-vrf-not-evpn.yml | 2 +- .../evpn_services_l2_only_false.yml | 6 +-- .../evpn_services_l2_only_true.yml | 2 +- .../structured_configs/evpn_vlan_bundle.yml | 2 +- .../evpn_vlan_bundle_svi_l2vlan.yml | 2 +- .../structured_configs/filter.vrfs.yml | 2 +- .../flow-tracking-tests-leaf1.yml | 2 +- .../flow-tracking-tests-leaf2.yml | 2 +- .../flow-tracking-tests-leaf3.yml | 2 +- .../flow-tracking-tests-leaf4.yml | 2 +- .../flow-tracking-tests-spine1.yml | 2 +- .../flow-tracking-tests-spine2.yml | 2 +- .../structured_configs/generate-cv-tags-1.yml | 2 +- .../structured_configs/generate-cv-tags-2.yml | 2 +- .../inband-mgmt-parent-dualstack1.yml | 2 +- .../inband-mgmt-parent-dualstack2.yml | 2 +- .../inband-mgmt-parent-ipv6-1.yml | 2 +- .../inband-mgmt-parent-ipv6-2.yml | 2 +- .../inband-mgmt-parent-vrf.yml | 2 +- .../structured_configs/inband-mgmt-parent.yml | 2 +- .../intended/structured_configs/ipv4-acls.yml | 2 +- .../isis-system-id-format-using-node-id.yml | 4 +- ...stem-id-format-using-underlay-loopback.yml | 4 +- .../structured_configs/l3_edge_bgp.yml | 2 +- .../structured_configs/l3_edge_isis.yml | 2 +- .../structured_configs/l3_edge_multicast.yml | 4 +- .../structured_configs/l3_edge_ospf.yml | 4 +- .../node-type-l3-interfaces-bgp.yml | 2 +- .../node-type-l3-interfaces.yml | 2 +- .../override_uplink_type-u.yml | 2 +- .../structured_configs/ptp-tests-leaf1.yml | 2 +- .../structured_configs/ptp-tests-leaf2.yml | 2 +- .../structured_configs/ptp-tests-spine1.yml | 2 +- .../structured_configs/ptp-tests-spine2.yml | 2 +- .../structured_configs/ptp-tests-spine3.yml | 2 +- .../structured_configs/sflow-tests-leaf1.yml | 2 +- .../structured_configs/sflow-tests-leaf2.yml | 2 +- .../structured_configs/sflow-tests-leaf3.yml | 2 +- .../structured_configs/sflow-tests-leaf4.yml | 2 +- .../structured_configs/sflow-tests-spine1.yml | 2 +- .../structured_configs/sflow-tests-spine2.yml | 2 +- .../site-ha-disabled-leaf.yml | 2 +- .../site-ha-enabled-leaf1.yml | 2 +- .../site-ha-enabled-leaf2A.yml | 2 +- .../site-ha-enabled-leaf2B.yml | 2 +- .../trunk-group-tests-l3leaf1a.yml | 2 +- .../trunk-group-tests-l3leaf1b.yml | 2 +- .../trunk-group-tests-l3leaf2a.yml | 2 +- .../trunk-group-tests-l3leaf2b.yml | 2 +- .../underlay_filter_peer_as_evpn_1.yml | 2 +- .../underlay_filter_peer_as_evpn_2.yml | 2 +- .../underlay_filter_peer_as_evpn_3.yml | 2 +- .../uplink_lan_wan_router1.yml | 2 +- .../uplink_lan_wan_router2.yml | 2 +- .../intended/structured_configs/varpv6.yml | 2 +- .../vrfs_rd_rt_override.yml | 2 +- .../inventory/host_vars/DC1-SPINE4.yml | 2 + .../host_vars/core-1-isis-sr-ldp.yml | 2 + .../inventory/host_vars/core-2-ospf-ldp.yml | 1 + .../docs/tables/router-general-settings.md | 22 +++++++++++ .../use-router-general-for-router-id.md | 17 +++++++++ .../schema/eos_designs.schema.yml | 15 ++++++++ .../router_general.schema.yml | 18 +++++++++ ...se_router_general_for_router_id.schema.yml | 12 ++++++ .../pyavd/_eos_designs/shared_utils/misc.py | 4 ++ .../structured_config/base/__init__.py | 9 +++-- .../structured_config/base/router_general.py | 37 +++++++++++++++++++ .../network_services/router_bgp.py | 4 +- .../network_services/router_ospf.py | 9 ++++- .../structured_config/underlay/mpls.py | 6 ++- .../structured_config/underlay/router_isis.py | 9 ++++- .../structured_config/underlay/router_ospf.py | 9 ++++- .../pyavd/api/ip_addressing/__init__.py | 4 +- 220 files changed, 416 insertions(+), 246 deletions(-) create mode 100644 ansible_collections/arista/avd/roles/eos_designs/docs/tables/router-general-settings.md create mode 100644 ansible_collections/arista/avd/roles/eos_designs/docs/tables/use-router-general-for-router-id.md create mode 100644 python-avd/pyavd/_eos_designs/schema/schema_fragments/router_general.schema.yml create mode 100644 python-avd/pyavd/_eos_designs/schema/schema_fragments/use_router_general_for_router_id.schema.yml create mode 100644 python-avd/pyavd/_eos_designs/structured_config/base/router_general.py diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg index a87fc69811b..b2aebcd562d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg @@ -190,7 +190,6 @@ router bfd multihop interval 1200 min-rx 1200 multiplier 3 ! router bgp 65001 - router-id 192.168.255.4 update wait-install no bgp default ipv4-unicast maximum-paths 4 ecmp 4 @@ -300,4 +299,8 @@ router bgp 65001 no neighbor EVPN-OVERLAY-PEERS activate neighbor UNDERLAY-PEERS activate ! +router general + router-id ipv4 192.168.255.4 + exit +! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg index b3c315ff1e7..40e4f472a21 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg @@ -300,14 +300,17 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.1 mpls ip ! mpls ldp - router-id 10.0.0.1 transport-address interface Loopback0 interface disabled default no shutdown ! +router general + router-id ipv4 10.0.0.1 + router-id ipv6 2000:1234:ffff:ffff::1 + exit +! router isis CORE net 49.0001.0100.0000.0001.00 - router-id ipv4 10.0.0.1 is-type level-2 log-adjacency-changes mpls ldp sync default diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg index a831dbaa5f1..1114402b5d6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg @@ -207,13 +207,16 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.1 mpls ip ! mpls ldp - router-id 10.0.0.2 transport-address interface Loopback0 interface disabled default no shutdown ! +router general + router-id ipv4 10.0.0.2 + router-id ipv6 2000:1234:ffff:ffff::2 + exit +! router ospf 101 - router-id 10.0.0.2 bfd default passive-interface default no passive-interface Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml index a38290de382..b12f431640d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml @@ -2,7 +2,6 @@ hostname: 7010TX-LEAF1 is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml index 89b7e8a89d3..6018f257ee2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml @@ -2,7 +2,6 @@ hostname: 7010TX-LEAF2 is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.36 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.36 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml index 4b29b8054e6..f65db2fc0bd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.3 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml index 28c2c13c1b4..d10503debf4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF1B is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.4 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml index 0ab874a5856..ac19e565b93 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF2 is_deployed: true router_bgp: as: '65103' - router_id: 192.168.255.5 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.5 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml index 2c7144223d2..0625d19a292 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF3A is_deployed: true router_bgp: as: '65105' - router_id: 192.168.255.7 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.7 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml index 58fedca6a0e..012f811f2c8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF3B is_deployed: true router_bgp: as: '65105' - router_id: 192.168.255.8 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.8 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml index 179dcddb729..10d0e038528 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF4A is_deployed: true router_bgp: as: '65222' - router_id: 192.168.255.9 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.9 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml index c50755914cd..c6c0c0e8de6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF4B is_deployed: true router_bgp: as: '65222' - router_id: 192.168.255.10 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.10 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml index 29fea485d4e..65ffc8e4a07 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF5A is_deployed: true router_bgp: as: '65333' - router_id: 192.168.255.11 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.11 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml index 2d2405d0056..e8c626588a2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF7A is_deployed: true router_bgp: as: '65222.0' - router_id: 192.168.255.13 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.13 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml index 731de8da28a..565a2712a59 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF7B is_deployed: true router_bgp: as: '65222.0' - router_id: 192.168.255.14 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.14 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml index 7bb57015475..5371498298f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF8A is_deployed: true router_bgp: as: '65222.12' - router_id: 192.168.255.15 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.15 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml index 796759f4d22..e62514ec64e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_ASN_LEAF8B is_deployed: true router_bgp: as: '65222.13' - router_id: 192.168.255.16 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.16 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml index aa4c157447a..178e6917465 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml @@ -2,7 +2,6 @@ hostname: AUTO_BGP_UNGROUPED_LEAF6 is_deployed: true router_bgp: as: '65110' - router_id: 192.168.255.12 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.12 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml index 2004f33d0a1..d4dc539590b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml @@ -2,7 +2,6 @@ hostname: AUTO_NODE_TYPE_LEAF01 is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.3 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml index e2f798063b5..6112d4cb72e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml @@ -2,7 +2,6 @@ hostname: AUTO_NODE_TYPE_SPINE01 is_deployed: true router_bgp: as: '65100' - router_id: 192.168.255.1 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml index dc1c8773a34..9705730bfa5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml @@ -2,7 +2,6 @@ hostname: AUTO_NODE_TYPE_SPINE02 is_deployed: true router_bgp: as: '65100' - router_id: 192.168.255.2 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml index 908988e11a2..1e9704c3421 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml @@ -2,7 +2,6 @@ hostname: AUTO_NODE_TYPE_UNGROUPED_LEAF02 is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.4 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml index bbfec4e24c8..220be9572c3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-PYTHON_MODULES-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.21 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.21 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml index 53e30e79cc2..6734ea33d6f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-PYTHON_MODULES-L3LEAF1B is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.22 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.22 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF2.yml index f25fbd25408..b7eba925a1b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF2.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-PYTHON_MODULES-L3LEAF2 is_deployed: true router_bgp: as: '65103' - router_id: 192.168.255.23 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.23 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml index 43f46123913..27a2865bcc2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-PYTHON_MODULES-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml index 88ce471721f..2b0b117ed9b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-TEMPLATES-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.21 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.21 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml index 786b5ad5ed1..f81386f9fb7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-TEMPLATES-L3LEAF1B is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.22 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.22 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml index 6acec3076f4..a26765608ec 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml @@ -2,7 +2,6 @@ hostname: CUSTOM-TEMPLATES-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml index 0f70c4438b4..2b813ab3d9b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml @@ -2,7 +2,6 @@ hostname: DC1-BL1A is_deployed: true router_bgp: as: '65104' - router_id: 192.168.255.14 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.14 updates: wait_install: true peer_groups: @@ -721,10 +721,10 @@ vlan_interfaces: vrf: TENANT_D_WAN_ZONE router_ospf: process_ids: - - id: 14 + - router_id: 192.168.255.14 + id: 14 vrf: Tenant_A_WAN_Zone passive_interface_default: true - router_id: 192.168.255.14 no_passive_interfaces: - Ethernet7 - Vlan150 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml index 9e85a6ee2f4..40eeb3febe9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml @@ -2,7 +2,6 @@ hostname: DC1-BL1B is_deployed: true router_bgp: as: '65105' - router_id: 192.168.255.15 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.15 updates: wait_install: true peer_groups: @@ -689,10 +689,10 @@ vlan_interfaces: vrf: TENANT_D_WAN_ZONE router_ospf: process_ids: - - id: 14 + - router_id: 192.168.255.15 + id: 14 vrf: Tenant_A_WAN_Zone passive_interface_default: true - router_id: 192.168.255.15 no_passive_interfaces: - Vlan150 max_lsa: 15000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml index 63f815026a2..feae335773a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml @@ -2,7 +2,6 @@ hostname: DC1-BL2A is_deployed: true router_bgp: as: '65106' - router_id: 192.168.255.16 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -17,6 +16,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.16 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml index 86f93838b74..55e5174a7dc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml @@ -2,7 +2,6 @@ hostname: DC1-BL2B is_deployed: true router_bgp: as: '65107' - router_id: 192.168.255.17 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -17,6 +16,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.17 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml index 829f1603149..2e7f3777f1a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml @@ -2,7 +2,6 @@ hostname: DC1-CL1A is_deployed: true router_bgp: as: '65108' - router_id: 192.168.255.18 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.18 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml index d2953141b57..b656789c4e8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml @@ -2,7 +2,6 @@ hostname: DC1-CL1B is_deployed: true router_bgp: as: '65109' - router_id: 192.168.255.19 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.19 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml index c5c3f276075..6090c8e9c67 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml @@ -2,7 +2,6 @@ hostname: DC1-LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.42.42 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.42 graceful_restart: enabled: true restart_time: 500 @@ -566,10 +566,10 @@ vlan_interfaces: vrf: '12345678' router_ospf: process_ids: - - id: 9 + - router_id: 192.168.42.42 + id: 9 vrf: Tenant_A_OP_Zone passive_interface_default: true - router_id: 192.168.42.42 no_passive_interfaces: - Vlan113 redistribute: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml index ba424019f4e..f76bc6c8e1c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml @@ -2,7 +2,6 @@ hostname: DC1-LEAF2A is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.10 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.10 updates: wait_for_convergence: true wait_install: true @@ -1223,10 +1223,10 @@ ipv6_static_routes: vrf: Tenant_D_OP_Zone router_ospf: process_ids: - - id: 16 + - router_id: 192.168.255.10 + id: 16 vrf: Tenant_A_OSPF passive_interface_default: true - router_id: 192.168.255.10 no_passive_interfaces: - Ethernet22 - Ethernet23 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml index 943e4430946..b20664444dc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml @@ -2,7 +2,6 @@ hostname: DC1-LEAF2B is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.11 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.11 updates: wait_for_convergence: true wait_install: true @@ -1163,10 +1163,10 @@ ipv6_static_routes: vrf: Tenant_D_OP_Zone router_ospf: process_ids: - - id: 16 + - router_id: 192.168.255.11 + id: 16 vrf: Tenant_A_OSPF passive_interface_default: true - router_id: 192.168.255.11 no_passive_interfaces: - Ethernet24 redistribute: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE1.yml index 2afd23f7e15..04843d574ff 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE1.yml @@ -2,7 +2,6 @@ hostname: DC1-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE2.yml index 095e6b5b9f4..438af50ee36 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE2.yml @@ -2,7 +2,6 @@ hostname: DC1-SPINE2 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.2 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE3.yml index 821abba925d..71c0c975f39 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE3.yml @@ -2,7 +2,6 @@ hostname: DC1-SPINE3 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.3 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml index e53c627383e..5d747376a36 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml @@ -2,7 +2,6 @@ hostname: DC1-SPINE4 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.4 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -264,6 +263,10 @@ ntp: snmp_server: contact: example@example.com location: EOS_DESIGNS_UNIT_TESTS DC1-SPINE4 +router_general: + router_id: + ipv4: 192.168.255.4 + ipv6: null ethernet_interfaces: - name: Ethernet1/1 peer: DC1-LEAF1A diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml index 3cfe854346c..7a78bb2ec9c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml @@ -2,7 +2,6 @@ hostname: DC1-SVC3A is_deployed: true router_bgp: as: '65103' - router_id: 192.168.255.12 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.12 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml index 552f4f9aaba..5dbff3affef 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml @@ -2,7 +2,6 @@ hostname: DC1-SVC3B is_deployed: true router_bgp: as: '65103' - router_id: 192.168.255.13 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.13 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml index d73f5a5d68b..06ccdb06f66 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml @@ -2,7 +2,6 @@ hostname: DC1_UNDEPLOYED_LEAF1A is_deployed: false router_bgp: as: '65110' - router_id: 192.168.255.21 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.21 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml index 454390c9b91..7995b32326b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml @@ -2,7 +2,6 @@ hostname: DC1_UNDEPLOYED_LEAF1B is_deployed: false router_bgp: as: '65111' - router_id: 192.168.255.22 bgp_defaults: - distance bgp 20 200 200 bgp: @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.22 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml index 330ffc8a93a..26494a63b6d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml @@ -2,7 +2,6 @@ hostname: DUP-LEAF1 is_deployed: true router_bgp: as: '65000' - router_id: 10.0.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml index 5c597dbebf2..43f03914e84 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml @@ -2,7 +2,6 @@ hostname: DUP-LEAF2 is_deployed: true router_bgp: as: '65000' - router_id: 10.0.0.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.0.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml index 6163568f284..be45003f31f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-DISABLED is_deployed: true router_bgp: as: '65106' - router_id: 192.168.255.8 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.8 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml index 293ca63b06c..1e479799311 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml index 93fc68e2b3f..a9b73ae9cf8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-L3LEAF1B is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml index 7b88830b10d..9b374d3173b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-L3LEAF2A is_deployed: true router_bgp: as: '65103' - router_id: 192.168.255.5 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.5 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml index e6f159f77fc..507a65a018a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-L3LEAF3A is_deployed: true router_bgp: as: '65104' - router_id: 192.168.255.6 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.6 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml index 9c9af4e239a..18acf2d26af 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-L3LEAF3B is_deployed: true router_bgp: as: '65105' - router_id: 192.168.255.7 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.7 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml index 474b895c599..30a0a172a64 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml @@ -2,7 +2,6 @@ hostname: EVPN-MULTICAST-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml index a48072a3f94..2746de8ac2f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: IGMP-QUERIER-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml index 14e1182cd7c..b3bc1ce61c3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml @@ -2,7 +2,6 @@ hostname: MH-LEAF1A is_deployed: true router_bgp: as: '65151' - router_id: 192.168.255.33 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.33 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml index c1779d969dc..eacccb0e2ee 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml @@ -2,7 +2,6 @@ hostname: MH-LEAF1B is_deployed: true router_bgp: as: '65152' - router_id: 192.168.255.34 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.34 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml index bcbc75d63be..d934885b0fc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml @@ -2,7 +2,6 @@ hostname: MH-LEAF2A is_deployed: true router_bgp: as: '65153' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP static: enabled: true + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml index fc6ce92b662..ba657bc88d2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml @@ -2,13 +2,13 @@ hostname: MLAG-OSPF-L3LEAF1A is_deployed: true router_bgp: as: '65161' - router_id: 192.168.255.36 bgp: default: ipv4_unicast: false maximum_paths: paths: 4 ecmp: 4 + router_id: 192.168.255.36 updates: wait_install: true peer_groups: @@ -205,9 +205,9 @@ loopback_interfaces: ospf_area: 0.0.0.0 router_ospf: process_ids: - - id: 100 + - router_id: 192.168.255.36 + id: 100 passive_interface_default: true - router_id: 192.168.255.36 max_lsa: 12000 no_passive_interfaces: - Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml index cc9ba24abe7..ad652fa46ea 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml @@ -2,13 +2,13 @@ hostname: MLAG-OSPF-L3LEAF1B is_deployed: true router_bgp: as: '65161' - router_id: 192.168.255.37 bgp: default: ipv4_unicast: false maximum_paths: paths: 4 ecmp: 4 + router_id: 192.168.255.37 updates: wait_install: true peer_groups: @@ -205,9 +205,9 @@ loopback_interfaces: ospf_area: 0.0.0.0 router_ospf: process_ids: - - id: 100 + - router_id: 192.168.255.37 + id: 100 passive_interface_default: true - router_id: 192.168.255.37 max_lsa: 12000 no_passive_interfaces: - Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml index 4ec4212b041..b303e9090ce 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: MLAG_IPV6_L3LEAF1A is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml index 604933a3d37..81efc9939d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: MLAG_IPV6_L3LEAF1B is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.36 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.36 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml index f6cede56418..ff211b9cfb5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: MLAG_ODD_ID_L3LEAF1A is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml index cb33b2b9168..b6b9d661664 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: MLAG_ODD_ID_L3LEAF1B is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.36 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.36 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml index a0c692ce56b..aae505241bf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: MLAG_SAME_SUBNET_L3LEAF1A is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.32 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.32 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml index c4af6de9089..216ecf9c687 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: MLAG_SAME_SUBNET_L3LEAF1B is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.33 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.33 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml index 2f15d3d2da0..55830d85e1c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml @@ -2,7 +2,6 @@ hostname: MLAG_SAME_SUBNET_L3LEAF2A is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.34 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.34 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml index 95acbd88f78..3215ff3308f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml @@ -2,7 +2,6 @@ hostname: MLAG_SAME_SUBNET_L3LEAF2B is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml index 2f77e6e2d11..fba17b28506 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.254.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml index 8ae9d61fb85..15bd3c03bc9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2 is_deployed: true router_bgp: as: '65002' - router_id: 192.168.254.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml index 5365723f375..83f6157ef78 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.254.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml index 2070b405265..c95c151f9b7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2 is_deployed: true router_bgp: as: '65002' - router_id: 192.168.254.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml index a9a35c3989f..cc5e85c57b6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A is_deployed: true router_bgp: as: '65003' - router_id: 192.168.254.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml index 3205504c3a9..c887ad15bec 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml @@ -2,7 +2,6 @@ hostname: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B is_deployed: true router_bgp: as: '65003' - router_id: 192.168.254.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.254.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml index c8767437ba5..c807ef09ec5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: OVERRIDE_VTEP_L3LEAF1A is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.35 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.35 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml index 5efeeeb72a0..ef332a711f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: OVERRIDE_VTEP_L3LEAF1B is_deployed: true router_bgp: as: '923' - router_id: 192.168.255.36 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.36 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml index 6e220c69419..7577c9c4b73 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml @@ -2,7 +2,6 @@ hostname: P2P-UPLINKS-IPV4-PREFIX-LENGTH is_deployed: true router_bgp: as: '65123' - router_id: 10.254.254.32 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.254.32 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml index a3301982aae..8fbeed9ce42 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml index 3c9fda5649e..abc1652ac54 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF2 is_deployed: true router_bgp: as: '65002' - router_id: 192.168.255.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml index cd7bf3a0a49..264ac1b37f9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF3 is_deployed: true router_bgp: as: '65003' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml index 0233ec04826..815148fe8b1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF4 is_deployed: true router_bgp: as: '65004' - router_id: 192.168.255.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml index e2e32e5b9be..d3a0938f614 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF5 is_deployed: true router_bgp: as: '65005' - router_id: 192.168.255.5 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.5 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml index 36360d2d60f..21e5bd0cd40 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF6 is_deployed: true router_bgp: as: '65006' - router_id: 192.168.255.6 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.6 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml index c9a4984079c..4533367a5a1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml @@ -2,7 +2,6 @@ hostname: RD-RT-ADMIN-SUBFIELD-L3LEAF7 is_deployed: true router_bgp: as: '65007' - router_id: 192.168.255.7 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.7 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml index 25306ea8169..0a9f99d7d0c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml @@ -2,7 +2,6 @@ hostname: SVI_PROFILE_NODE_1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: @@ -469,10 +469,10 @@ vlan_interfaces: ospf_network_point_to_point: false router_ospf: process_ids: - - id: 1 + - router_id: 192.168.255.1 + id: 1 vrf: svi_profile_tests_vrf passive_interface_default: true - router_id: 192.168.255.1 no_passive_interfaces: - Vlan510 - Vlan511 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml index 3f10f469faf..79a748a9ce9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml @@ -2,7 +2,6 @@ hostname: SVI_PROFILE_NODE_2 is_deployed: true router_bgp: as: '65002' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: @@ -341,10 +341,10 @@ vlan_interfaces: ospf_network_point_to_point: false router_ospf: process_ids: - - id: 1 + - router_id: 192.168.255.1 + id: 1 vrf: svi_profile_tests_vrf passive_interface_default: true - router_id: 192.168.255.1 no_passive_interfaces: - Vlan510 - Vlan511 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml index 6b4f1a56f9e..32bc171c0cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml index e1eacb97f84..0d769a80f43 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-L3LEAF1B is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml index 914461ab807..6ee00eb85b3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-L3LEAF2A is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.5 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.5 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml index d9b35022561..38c3737a4fb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-L3LEAF2B is_deployed: true router_bgp: as: '65102' - router_id: 192.168.255.6 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.6 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml index 082a6cf7d23..b577318449e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml index aa2e7b76f57..66f2b2edf42 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY-MULTICAST-SPINE2 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml index 78bfa16f5e5..655f7c689f9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY_FILTER_PEER_AS_L3LEAF1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: redistribute: connected: enabled: true + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml index 5f3927c2536..fa0b5732bd1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY_FILTER_PEER_AS_SPINE1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml index ace041fc062..de6dc676c20 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml @@ -2,7 +2,6 @@ hostname: UNDERLAY_FILTER_PEER_AS_SPINE2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.255.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml index c0e14c72d9a..5414a85aa8c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml @@ -2,7 +2,6 @@ hostname: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml index 384882fc8d1..8b6b624dbbe 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml @@ -2,7 +2,6 @@ hostname: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B is_deployed: true router_bgp: as: '65101' - router_id: 192.168.255.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml index 614bdf036d8..0b49a313564 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml @@ -2,7 +2,6 @@ hostname: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml index c8074dda18f..5670228301a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml @@ -2,7 +2,6 @@ hostname: UPLINK_P2P_VRFS_TESTS_LEAF1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.3 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: redistribute: connected: enabled: true + router_id: 192.168.42.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml index c1181f57228..69e148027f1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml @@ -2,7 +2,6 @@ hostname: UPLINK_P2P_VRFS_TESTS_SPINE1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: redistribute: connected: enabled: true + router_id: 192.168.42.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml index 68ff22ddb9b..d8bb4274b0c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml @@ -2,7 +2,6 @@ hostname: UPLINK_P2P_VRFS_TESTS_SPINE2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: redistribute: connected: enabled: true + router_id: 192.168.42.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml index 57701703d26..eae1617e5f1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml @@ -2,7 +2,6 @@ hostname: autovpn-edge-no-default-policy is_deployed: true router_bgp: as: '65000' - router_id: 192.168.30.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.30.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml index a7408923011..c7ccc7cc174 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml @@ -2,7 +2,6 @@ hostname: autovpn-edge is_deployed: true router_bgp: as: '65000' - router_id: 192.168.30.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.30.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml index 089fa5a660f..a0dd145b163 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml @@ -2,7 +2,6 @@ hostname: autovpn-rr1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.31.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.31.1 updates: wait_install: true bgp_cluster_id: 192.168.31.1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml index 776241bf0ed..7b3ad0d7327 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml @@ -2,7 +2,6 @@ hostname: autovpn-rr2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.31.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.31.2 updates: wait_install: true bgp_cluster_id: 192.168.31.2 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 68c6025a437..3c28c385638 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 @@ -2,13 +2,13 @@ hostname: bgp-from-network-services-1 is_deployed: true router_bgp: as: '65001' - router_id: 192.0.255.1 bgp: default: ipv4_unicast: false maximum_paths: paths: 4 ecmp: 4 + router_id: 192.0.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-options.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-options.yml index 68efdb701f8..dbb3bf07714 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-options.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-options.yml @@ -2,7 +2,6 @@ hostname: bgp-options is_deployed: true router_bgp: as: '65000' - router_id: 10.10.10.1 distance: external_routes: 20 internal_routes: 200 @@ -17,6 +16,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.10.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml index 4d0def75321..2b2a2412be4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml @@ -2,7 +2,6 @@ hostname: bgp-peer-groups-1 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.111 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.111 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml index 011adb93bfa..594b171c0d0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml @@ -2,7 +2,6 @@ hostname: bgp-peer-groups-2 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.112 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.112 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-3.yml index 2815a65d6b9..ebdd816b1e8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-3.yml @@ -2,7 +2,6 @@ hostname: bgp-peer-groups-3 is_deployed: true router_bgp: as: '65001' - router_id: 192.168.255.114 bgp: default: ipv4_unicast: false @@ -11,6 +10,7 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + router_id: 192.168.255.114 updates: wait_install: true peer_groups: @@ -86,10 +86,10 @@ loopback_interfaces: node_segment: ipv4_index: 206 router_isis: + router_id: 192.168.255.114 instance: CORE log_adjacency_changes: true net: 49.0001.1921.6825.5114.00 - router_id: 192.168.255.114 is_type: level-1-2 address_family_ipv4: enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml index 4fe06f03eb9..70d1d4a409c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml @@ -27,6 +27,10 @@ management_api_http: enable_vrfs: - name: MGMT enable_https: true +router_general: + router_id: + ipv4: 10.0.0.1 + ipv6: 2000:1234:ffff:ffff::1 loopback_interfaces: - name: Loopback0 description: ROUTER_ID @@ -45,7 +49,6 @@ router_isis: instance: CORE log_adjacency_changes: true net: 49.0001.0100.0000.0001.00 - router_id: 10.0.0.1 is_type: level-2 address_family_ipv4: enabled: true @@ -71,7 +74,6 @@ mpls: ip: true ldp: interface_disabled_default: true - router_id: 10.0.0.1 shutdown: false transport_address_interface: Loopback0 ethernet_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml index 74b528f7788..2d5a037c490 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml @@ -27,6 +27,10 @@ management_api_http: enable_vrfs: - name: MGMT enable_https: true +router_general: + router_id: + ipv4: 10.0.0.2 + ipv6: 2000:1234:ffff:ffff::2 loopback_interfaces: - name: Loopback0 description: ROUTER_ID @@ -41,7 +45,6 @@ router_ospf: process_ids: - id: 101 passive_interface_default: true - router_id: 10.0.0.2 max_lsa: 12000 no_passive_interfaces: - Ethernet1 @@ -59,7 +62,6 @@ mpls: ip: true ldp: interface_disabled_default: true - router_id: 10.0.0.2 shutdown: false transport_address_interface: Loopback0 ethernet_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-3-isis-sr-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-3-isis-sr-ldp.yml index f48a212d8cf..f6a991ab3bc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-3-isis-sr-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-3-isis-sr-ldp.yml @@ -42,10 +42,10 @@ loopback_interfaces: ipv4_index: 203 ipv6_index: 203 router_isis: + router_id: 10.0.0.3 instance: CORE log_adjacency_changes: true net: 49.0001.0100.0000.0003.00 - router_id: 10.0.0.3 is_type: level-2 address_family_ipv4: enabled: true @@ -71,6 +71,6 @@ mpls: ip: true ldp: interface_disabled_default: true - router_id: 10.0.0.3 shutdown: false transport_address_interface: Loopback0 + router_id: 10.0.0.3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml index d8d9b673eb8..0040d408f85 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml @@ -2,7 +2,6 @@ hostname: core-4-multicast is_deployed: true router_bgp: as: '65000' - router_id: 10.0.0.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.0.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml index 9daa77e0615..cd95e8c29c9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml @@ -2,7 +2,6 @@ hostname: custom-ptp-profile is_deployed: true router_bgp: as: '65042' - router_id: 10.42.42.42/32 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.42.42.42/32 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml index acc6fa6354f..4378d3e627d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-custom-control-plane-policy-edge-1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml index a1742aa1b9d..84f4bc0f19b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-custom-control-plane-policy-edge-2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml index a2e8b731d92..1283f8d1421 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-custom-control-plane-policy-edge-3 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.3 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml index fc00bd2545b..9206742a653 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-custom-control-plane-policy-pathfinder-1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.44.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.44.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml index b5c24a7f6b8..05fe61ec863 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge-custom-default-policy is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml index fa97bd07f65..62a086314f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge-no-default-policy is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml index 40363598406..bd4d1be42bb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: static: enabled: true route_map: RM-STATIC-2-BGP + router_id: 192.168.42.1 updates: wait_install: true neighbors: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml index 66555b3d964..875e84f8b83 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.2 updates: wait_install: true neighbors: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml index bde66170a15..1cd3a653a96 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge2A is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml index e610465e0a2..7ea2a8cec6d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge2B is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.3 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml index ab8a15b0eca..d56129db5cd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge3A is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.6 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.6 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml index 96ee839e258..aa42bc29c0a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge3B is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.7 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.7 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml index 4ffc3cacbfa..67f0eeb2ad0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge4A is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.8 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.8 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml index 8a3981ab1ff..6af74b78cac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-edge4B is_deployed: true router_bgp: as: '65000' - router_id: 192.168.42.9 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.9 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml index 1954c6e0ea3..8a2a6dbdfa5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-pathfinder is_deployed: true router_bgp: as: '65000' - router_id: 192.168.44.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.44.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml index d4bad054aba..e35f88fcc3d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-pathfinder1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.44.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.44.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml index 70ec794a682..481ed7bc20c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-pathfinder2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.44.3 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.44.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml index a5ea38924a4..db9637bf4ae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-transit1A is_deployed: true router_bgp: as: '65000' - router_id: 192.168.43.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.43.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml index 56a2ed5ddad..e55ba58d9b6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml @@ -2,7 +2,6 @@ hostname: cv-pathfinder-transit1B is_deployed: true router_bgp: as: '65000' - router_id: 192.168.43.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.43.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cvp-instance-ips-cvaas.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cvp-instance-ips-cvaas.yml index 5622e4a459e..cce846e009a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cvp-instance-ips-cvaas.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cvp-instance-ips-cvaas.yml @@ -2,7 +2,6 @@ hostname: cvp-instance-ips-cvaas is_deployed: true router_bgp: as: '1234' - router_id: 1.2.3.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 1.2.3.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_cvx.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_cvx.yml index 45200471d43..ae9da933bb4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_cvx.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_cvx.yml @@ -2,7 +2,6 @@ hostname: default_overlay_protocol_cvx is_deployed: true router_bgp: as: '65000' - router_id: 192.168.0.42 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.0.42 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_her.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_her.yml index 8bc305cfe4b..04916ad24d8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_her.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/default_overlay_protocol_her.yml @@ -2,7 +2,6 @@ hostname: default_overlay_protocol_her is_deployed: true router_bgp: as: '65000' - router_id: 192.168.0.42 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.0.42 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/device.with.dots.in.hostname.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/device.with.dots.in.hostname.yml index 6783f1abce3..3e8d35b5d51 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/device.with.dots.in.hostname.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/device.with.dots.in.hostname.yml @@ -2,7 +2,6 @@ hostname: device.with.dots.in.hostname is_deployed: true router_bgp: as: '1234' - router_id: 1.2.3.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 1.2.3.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml index cf745fa728e..1759653461a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-l3leaf1 is_deployed: true router_bgp: as: '65009' - router_id: 192.168.1.10 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.10 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml index d5d15a8493b..22a06038f7e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-l3leaf2 is_deployed: true router_bgp: as: '65019' - router_id: 192.168.1.20 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.20 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml index e80e9b488a3..b04efd0008d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-l3leaf3 is_deployed: true router_bgp: as: '65029' - router_id: 192.168.1.30 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.30 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml index ecf4b69e59b..36fdb03528e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-l3leaf4 is_deployed: true router_bgp: as: '65039' - router_id: 192.168.1.40 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.40 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml index 18f62d48388..dccf6e4723e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-spine1 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.0.10 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.0.10 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml index cf577e2d601..70abc16af03 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml @@ -2,7 +2,6 @@ hostname: downlink-pools-spine2 is_deployed: true router_bgp: as: '65000' - router_id: 192.168.0.20 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.0.20 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml index 2f805c83450..908295fcf1b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml @@ -2,7 +2,6 @@ hostname: duplicate-vrfs is_deployed: true router_bgp: as: '101' - router_id: 192.168.255.101 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.101 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml index 5fe3d3faafb..ff281cdc857 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml @@ -2,7 +2,6 @@ hostname: evpn-to-ipvpn-gateway is_deployed: true router_bgp: as: '65100.100' - router_id: 10.10.0.1 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml index 58aea21242c..0dd754c24d5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml @@ -2,7 +2,6 @@ hostname: evpn-vtep-with-default-vrf-not-evpn is_deployed: true router_bgp: as: '101' - router_id: 192.168.255.109 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.109 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml index 2055b251e79..108df07d8d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml @@ -2,7 +2,6 @@ hostname: evpn_services_l2_only_false is_deployed: true router_bgp: as: '101' - router_id: 192.168.255.109 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP ospf: enabled: true + router_id: 192.168.255.109 updates: wait_install: true peer_groups: @@ -993,9 +993,9 @@ vlan_interfaces: vrf: TENANT_D_WAN_ZONE router_ospf: process_ids: - - id: 123 + - router_id: 192.168.255.109 + id: 123 passive_interface_default: true - router_id: 192.168.255.109 no_passive_interfaces: - Vlan1234 redistribute: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml index 5477946732f..d919cf4747f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml @@ -2,7 +2,6 @@ hostname: evpn_services_l2_only_true is_deployed: true router_bgp: as: '101' - router_id: 192.168.255.109 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.109 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml index a88c44fa260..d4883332ce0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml @@ -2,7 +2,6 @@ hostname: evpn_vlan_bundle is_deployed: true router_bgp: as: '65101' - router_id: 10.10.0.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.0.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml index b8e2fd5ea06..62b3a08891e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml @@ -2,7 +2,6 @@ hostname: evpn_vlan_bundle_svi_l2vlan is_deployed: true router_bgp: as: '65101' - router_id: 10.10.0.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.0.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/filter.vrfs.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/filter.vrfs.yml index c7ccfc8459d..4161083f286 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/filter.vrfs.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/filter.vrfs.yml @@ -2,7 +2,6 @@ hostname: filter.vrfs is_deployed: true router_bgp: as: '65001' - router_id: 10.0.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml index e096e4d4051..c47ba676046 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-leaf1 is_deployed: true router_bgp: as: '65101' - router_id: 10.254.1.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.1 peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml index f4a71f47a4b..db831139667 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-leaf2 is_deployed: true router_bgp: as: '65102' - router_id: 10.254.1.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.2 peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml index 6aa41ef11cc..7101814b9ac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-leaf3 is_deployed: true router_bgp: as: '65105' - router_id: 10.254.1.5 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.254.1.5 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml index cff33ea1ad0..8afcb1ca6c8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-leaf4 is_deployed: true router_bgp: as: '65105' - router_id: 10.254.1.6 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.254.1.6 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml index 246c38a7977..2a772a66ca7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-spine1 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml index 84ce51c94b5..d6a0e4f8afa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml @@ -2,7 +2,6 @@ hostname: flow-tracking-tests-spine2 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-1.yml index 564e54adae3..bede7c67ba1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-1.yml @@ -2,7 +2,6 @@ hostname: generate-cv-tags-1 is_deployed: true router_bgp: as: '65000' - router_id: 10.10.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-2.yml index 0fb18d11d27..02a5b51f86f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/generate-cv-tags-2.yml @@ -2,7 +2,6 @@ hostname: generate-cv-tags-2 is_deployed: true router_bgp: as: '65000' - router_id: 10.10.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml index fe1e6198756..fe0fcdcd828 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent-dualstack1 is_deployed: true router_bgp: as: '65002' - router_id: 10.0.255.3 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.0.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml index 96d2b420de2..5b547df61d9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent-dualstack2 is_deployed: true router_bgp: as: '65002' - router_id: 10.0.255.4 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.0.255.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml index a7e7619b57e..667936a1787 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent-ipv6-1 is_deployed: true router_bgp: as: '65004' - router_id: 10.0.255.5 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.0.255.5 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml index a195325eadd..55d6733fc85 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent-ipv6-2 is_deployed: true router_bgp: as: '65004' - router_id: 10.0.255.6 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.255.6 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml index 555370e4e63..754111dbd9e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent-vrf is_deployed: true router_bgp: as: '65001' - router_id: 10.0.255.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.0.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml index 3ee0096b96c..04f2c6e8afc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml @@ -2,7 +2,6 @@ hostname: inband-mgmt-parent is_deployed: true router_bgp: as: '65000' - router_id: 10.0.255.1 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.0.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ipv4-acls.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ipv4-acls.yml index 07a575b0515..509c5b76687 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ipv4-acls.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ipv4-acls.yml @@ -2,7 +2,6 @@ hostname: ipv4-acls is_deployed: true router_bgp: as: '65000' - router_id: 192.168.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml index 92f664f30b9..d1104ea34db 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml @@ -2,13 +2,13 @@ hostname: isis-system-id-format-using-node-id is_deployed: true router_bgp: as: '65000' - router_id: 172.28.4.99 bgp: default: ipv4_unicast: false maximum_paths: paths: 4 ecmp: 4 + router_id: 172.28.4.99 updates: wait_install: true peer_groups: @@ -60,10 +60,10 @@ loopback_interfaces: node_segment: ipv4_index: 199 router_isis: + router_id: 172.28.4.99 instance: CORE log_adjacency_changes: true net: 49.0001.0000.0001.0099.00 - router_id: 172.28.4.99 is_type: level-2 address_family_ipv4: enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-underlay-loopback.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-underlay-loopback.yml index 91bdc00e58e..329add55d18 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-underlay-loopback.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-underlay-loopback.yml @@ -2,13 +2,13 @@ hostname: isis-system-id-format-using-underlay-loopback is_deployed: true router_bgp: as: '65000' - router_id: 172.28.4.99 bgp: default: ipv4_unicast: false maximum_paths: paths: 4 ecmp: 4 + router_id: 172.28.4.99 updates: wait_install: true peer_groups: @@ -60,10 +60,10 @@ loopback_interfaces: node_segment: ipv4_index: 199 router_isis: + router_id: 172.28.4.99 instance: CORE log_adjacency_changes: true net: 49.0001.1720.2800.4099.00 - router_id: 172.28.4.99 is_type: level-2 address_family_ipv4: enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml index c3ceb717a5f..1f7fc798780 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml @@ -2,7 +2,6 @@ hostname: l3_edge_bgp is_deployed: true router_bgp: as: '65000' - router_id: 1.2.3.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 1.2.3.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml index 252dff77f71..35da6525c6a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml @@ -30,10 +30,10 @@ loopback_interfaces: isis_enable: EVPN_UNDERLAY isis_passive: true router_isis: + router_id: 1.2.3.1 instance: EVPN_UNDERLAY log_adjacency_changes: true net: 49.0001.0010.0200.3001.00 - router_id: 1.2.3.1 is_type: level-2 address_family_ipv4: enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml index ee76f68ba48..5c67d01b966 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml @@ -33,9 +33,9 @@ loopback_interfaces: ospf_area: 0.0.0.0 router_ospf: process_ids: - - id: 100 + - router_id: 1.2.3.1 + id: 100 passive_interface_default: true - router_id: 1.2.3.1 max_lsa: 12000 no_passive_interfaces: - ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml index 703e8a7d313..f2fc69cbe97 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml @@ -30,9 +30,9 @@ loopback_interfaces: ospf_area: 0.0.0.0 router_ospf: process_ids: - - id: 100 + - router_id: 1.2.3.1 + id: 100 passive_interface_default: true - router_id: 1.2.3.1 max_lsa: 12000 no_passive_interfaces: - ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces-bgp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces-bgp.yml index 1c89f4d3756..e3862e5f331 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces-bgp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces-bgp.yml @@ -2,7 +2,6 @@ hostname: node-type-l3-interfaces-bgp is_deployed: true router_bgp: as: '65000' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: redistribute: connected: enabled: true + router_id: 192.168.255.1 updates: wait_install: true neighbors: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces.yml index 1ff3522a12c..a7afcc4a6bb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/node-type-l3-interfaces.yml @@ -2,7 +2,6 @@ hostname: node-type-l3-interfaces is_deployed: true router_bgp: as: '65000' - router_id: 1.2.3.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 1.2.3.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/override_uplink_type-u.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/override_uplink_type-u.yml index 76e5d359763..b3956f0e9df 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/override_uplink_type-u.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/override_uplink_type-u.yml @@ -2,7 +2,6 @@ hostname: override_uplink_type-u is_deployed: true router_bgp: as: '65002' - router_id: 192.168.42.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.42.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml index ae9869f3e95..5dd81b7133d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml @@ -2,7 +2,6 @@ hostname: ptp-tests-leaf1 is_deployed: true router_bgp: as: '65101' - router_id: 10.254.1.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.1 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml index 15008e45596..95ce7119f0b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml @@ -2,7 +2,6 @@ hostname: ptp-tests-leaf2 is_deployed: true router_bgp: as: '65102' - router_id: 10.254.1.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.2 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml index 3b32eeca7db..46907b15de4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml @@ -2,7 +2,6 @@ hostname: ptp-tests-spine1 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml index 95361e29f9e..e28869cb26f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml @@ -2,7 +2,6 @@ hostname: ptp-tests-spine2 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine3.yml index 170f9358155..77bed5d8335 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine3.yml @@ -2,7 +2,6 @@ hostname: ptp-tests-spine3 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml index d9c4c35d511..56825782041 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-leaf1 is_deployed: true router_bgp: as: '65101' - router_id: 10.254.1.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.1 peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml index b1484566334..b91584733c6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-leaf2 is_deployed: true router_bgp: as: '65102' - router_id: 10.254.1.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.254.1.2 peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml index 3f2f40eb317..bf9841d7063 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-leaf3 is_deployed: true router_bgp: as: '65105' - router_id: 10.254.1.5 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.254.1.5 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml index 6b73124c7a6..63a7d889ae0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-leaf4 is_deployed: true router_bgp: as: '65105' - router_id: 10.254.1.6 bgp: default: ipv4_unicast: false @@ -15,6 +14,7 @@ router_bgp: route_map: RM-CONN-2-BGP attached_host: enabled: true + router_id: 10.254.1.6 peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml index cc1d5b2d591..c5f4a7130cc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-spine1 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml index 9b09ab5048c..f0da760531f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml @@ -2,7 +2,6 @@ hostname: sflow-tests-spine2 is_deployed: true router_bgp: as: '65200' - router_id: 10.255.0.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.255.0.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml index 063f65e5f0a..7b993819e3e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml @@ -2,7 +2,6 @@ hostname: site-ha-disabled-leaf is_deployed: true router_bgp: as: '65199' - router_id: 192.168.45.4 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.45.4 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml index 38a83767ced..5500c61b96d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml @@ -2,7 +2,6 @@ hostname: site-ha-enabled-leaf1 is_deployed: true router_bgp: as: '65199' - router_id: 192.168.45.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.45.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml index 7cd16b45675..7136a0a4652 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml @@ -2,7 +2,6 @@ hostname: site-ha-enabled-leaf2A is_deployed: true router_bgp: as: '65199' - router_id: 192.168.45.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.45.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml index 0fa73330482..b0341fa3001 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml @@ -2,7 +2,6 @@ hostname: site-ha-enabled-leaf2B is_deployed: true router_bgp: as: '65199' - router_id: 192.168.45.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.45.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml index 5c010fb956b..151aabe0b07 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml @@ -2,7 +2,6 @@ hostname: trunk-group-tests-l3leaf1a is_deployed: true router_bgp: as: '65001' - router_id: 192.168.250.9 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.250.9 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml index 2896704ea3a..f2a0f635778 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml @@ -2,7 +2,6 @@ hostname: trunk-group-tests-l3leaf1b is_deployed: true router_bgp: as: '65001' - router_id: 192.168.250.10 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.250.10 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml index e1a6fa3ea19..060637f5ca2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml @@ -2,7 +2,6 @@ hostname: trunk-group-tests-l3leaf2a is_deployed: true router_bgp: as: '65002' - router_id: 192.168.250.11 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.250.11 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml index 472256773de..02ee1a93435 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml @@ -2,7 +2,6 @@ hostname: trunk-group-tests-l3leaf2b is_deployed: true router_bgp: as: '65002' - router_id: 192.168.250.12 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.250.12 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml index d8cc1f2f686..0a32cfd0f0a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml @@ -2,7 +2,6 @@ hostname: underlay_filter_peer_as_evpn_1 is_deployed: true router_bgp: as: '64512' - router_id: 192.168.255.1 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml index fa59e0b4c15..fbec1587f27 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml @@ -2,7 +2,6 @@ hostname: underlay_filter_peer_as_evpn_2 is_deployed: true router_bgp: as: '64513' - router_id: 192.168.255.2 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml index 9424de6defc..4332cb59012 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml @@ -2,7 +2,6 @@ hostname: underlay_filter_peer_as_evpn_3 is_deployed: true router_bgp: as: '64513' - router_id: 192.168.255.3 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.3 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml index 35762e30268..4bd534b3431 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml @@ -2,7 +2,6 @@ hostname: uplink_lan_wan_router1 is_deployed: true router_bgp: as: '65100' - router_id: 192.168.1.1 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.1 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml index eef35c3ee53..4a2630098ac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml @@ -2,7 +2,6 @@ hostname: uplink_lan_wan_router2 is_deployed: true router_bgp: as: '65100' - router_id: 192.168.1.2 bgp: default: ipv4_unicast: false @@ -12,6 +11,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.1.2 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml index ed35a170cec..c31477c4902 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml @@ -2,7 +2,6 @@ hostname: varpv6 is_deployed: true router_bgp: as: '101' - router_id: 192.168.255.101 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 192.168.255.101 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml index 97311e07652..bdabe9b9fbd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml @@ -2,7 +2,6 @@ hostname: vrfs_rd_rt_override is_deployed: true router_bgp: as: '65101' - router_id: 10.10.0.20 bgp: default: ipv4_unicast: false @@ -13,6 +12,7 @@ router_bgp: connected: enabled: true route_map: RM-CONN-2-BGP + router_id: 10.10.0.20 updates: wait_install: true peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml index dfa57b3c8ee..55abfafafab 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml @@ -2,6 +2,8 @@ # If the device is set to "is_deployed: false" at the host_vars level, then do not shutdown interfaces towards undeployed peers. shutdown_interfaces_towards_undeployed_peers: false +use_router_general_for_router_id: true + # If the device is set to "is_deployed: false" at the host_vars level, then do not shutdown bgp towards undeployed peers. shutdown_bgp_towards_undeployed_peers: false diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-1-isis-sr-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-1-isis-sr-ldp.yml index 32ddf295a1c..368e3136562 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-1-isis-sr-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-1-isis-sr-ldp.yml @@ -1,2 +1,4 @@ --- underlay_routing_protocol: isis-sr-ldp +#Use router id from router general configuration +use_router_general_for_router_id: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-2-ospf-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-2-ospf-ldp.yml index 688b68e8c00..059afc08cac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-2-ospf-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/core-2-ospf-ldp.yml @@ -1,2 +1,3 @@ --- underlay_routing_protocol: ospf-ldp +use_router_general_for_router_id: true diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/router-general-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/router-general-settings.md new file mode 100644 index 00000000000..6b949d711f1 --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/router-general-settings.md @@ -0,0 +1,22 @@ + +=== "Table" + + | Variable | Type | Required | Default | Value Restrictions | Description | + | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [router_general_settings](## "router_general_settings") | Dictionary | | | | | + | [  router_id](## "router_general_settings.router_id") | Dictionary | | | | | + | [    ipv4](## "router_general_settings.router_id.ipv4") | String | | | | | + | [    ipv6](## "router_general_settings.router_id.ipv6") | String | | | | | + +=== "YAML" + + ```yaml + router_general_settings: + router_id: + ipv4: + ipv6: + ``` diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/use-router-general-for-router-id.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/use-router-general-for-router-id.md new file mode 100644 index 00000000000..61208a5a0d6 --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/use-router-general-for-router-id.md @@ -0,0 +1,17 @@ + +=== "Table" + + | Variable | Type | Required | Default | Value Restrictions | Description | + | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [use_router_general_for_router_id](## "use_router_general_for_router_id") | Boolean | | `False` | | This setting allows to use `router_id` set under `router_general_settings` as BGP router-id. | + +=== "YAML" + + ```yaml + # This setting allows to use `router_id` set under `router_general_settings` as BGP router-id. + use_router_general_for_router_id: + ``` diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml index 55f266ba64e..d37e8374a70 100644 --- a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml @@ -3623,6 +3623,16 @@ keys: valid_values: - sso - rpr + router_general_settings: + type: dict + keys: + router_id: + type: dict + keys: + ipv4: + type: str + ipv6: + type: str router_id_loopback_description: documentation_options: table: overlay-settings @@ -4498,6 +4508,11 @@ keys: description: 'Generate AVD configurations directly from a given CloudVision topology. See `cv_topology` for details.' + use_router_general_for_router_id: + type: bool + description: This setting allows to use `router_id` set under `router_general_settings` + as BGP router-id. + default: false vtep_loopback_description: documentation_options: table: overlay-settings diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/router_general.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/router_general.schema.yml new file mode 100644 index 00000000000..3014aaab6fe --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/router_general.schema.yml @@ -0,0 +1,18 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + router_general_settings: + type: dict + keys: + router_id: + type: dict + keys: + ipv4: + type: str + ipv6: + type: str diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/use_router_general_for_router_id.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/use_router_general_for_router_id.schema.yml new file mode 100644 index 00000000000..6aa3b541178 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/use_router_general_for_router_id.schema.yml @@ -0,0 +1,12 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + use_router_general_for_router_id: + type: bool + description: This setting allows to use `router_id` set under `router_general_settings` as BGP router-id. + default: false diff --git a/python-avd/pyavd/_eos_designs/shared_utils/misc.py b/python-avd/pyavd/_eos_designs/shared_utils/misc.py index 981d11abfb3..9f0243daf6c 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/misc.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/misc.py @@ -427,3 +427,7 @@ def _get_ipv4_acl_field_with_substitution(field_value: str, replacements: dict[s @cached_property def ipv4_prefix_list_catalog(self: SharedUtils) -> list: return get(self.hostvars, "ipv4_prefix_list_catalog", default=[]) + + @cached_property + def use_router_general_for_router_id(self: SharedUtils) -> dict | None: + return get(self.hostvars, "use_router_general_for_router_id", default=False) diff --git a/python-avd/pyavd/_eos_designs/structured_config/base/__init__.py b/python-avd/pyavd/_eos_designs/structured_config/base/__init__.py index d4fa15848eb..7c77f2efad0 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/base/__init__.py +++ b/python-avd/pyavd/_eos_designs/structured_config/base/__init__.py @@ -12,9 +12,9 @@ from .ntp import NtpMixin from .snmp_server import SnmpServerMixin +from .router_general import RouterGeneralMixin - -class AvdStructuredConfigBase(AvdFacts, NtpMixin, SnmpServerMixin): +class AvdStructuredConfigBase(AvdFacts, NtpMixin, SnmpServerMixin, RouterGeneralMixin): """ The AvdStructuredConfig Class is imported by "get_structured_config" to render parts of the structured config. @@ -66,7 +66,6 @@ def router_bgp(self) -> dict | None: router_bgp = { "as": self.shared_utils.bgp_as, - "router_id": self.shared_utils.router_id, "distance": get(self._hostvars, "bgp_distance"), "bgp_defaults": get(self.shared_utils.switch_data_combined, "bgp_defaults"), "bgp": { @@ -80,6 +79,10 @@ def router_bgp(self) -> dict | None: }, "redistribute": self._router_bgp_redistribute_routes, } + + if self.shared_utils.use_router_general_for_router_id is False: + router_bgp["router_id"] = self.shared_utils.router_id + if get(self._hostvars, "bgp_update_wait_for_convergence", default=False) is True and platform_bgp_update_wait_for_convergence: router_bgp.setdefault("updates", {})["wait_for_convergence"] = True diff --git a/python-avd/pyavd/_eos_designs/structured_config/base/router_general.py b/python-avd/pyavd/_eos_designs/structured_config/base/router_general.py new file mode 100644 index 00000000000..cb42f95074d --- /dev/null +++ b/python-avd/pyavd/_eos_designs/structured_config/base/router_general.py @@ -0,0 +1,37 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +from __future__ import annotations + +from functools import cached_property +from hashlib import sha1 +from typing import TYPE_CHECKING + +from pyavd._errors import AristaAvdError, AristaAvdInvalidInputsError +from pyavd._utils import get, replace_or_append_item, strip_null_from_data +from pyavd.j2filters import natural_sort, snmp_hash + +from .utils import UtilsMixin + +if TYPE_CHECKING: + from . import AvdStructuredConfigBase + + +class RouterGeneralMixin(UtilsMixin): + """ + Mixin Class used to generate structured config for one key. + + Class should only be used as Mixin to a AvdStructuredConfig class. + """ + @cached_property + def router_general(self: AvdStructuredConfigBase) -> dict | None: + if self.shared_utils.use_router_general_for_router_id is True: + router_general = { + "router_id" : { + "ipv4": self.shared_utils.router_id, + "ipv6": self.shared_utils.ipv6_router_id + } + } + + return router_general + return None 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 b2e486a8c8e..688c8a30998 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 @@ -168,7 +168,9 @@ def _router_bgp_vrfs(self: AvdStructuredConfigNetworkServices) -> dict: bgp_vrf_redistribute_connected = get(vrf, "redistribute_connected", default=True) if vrf_name != "default": # Non-default VRF - bgp_vrf["router_id"] = self.shared_utils.router_id + if self.shared_utils.use_router_general_for_router_id is False: + bgp_vrf["router_id"] = self.shared_utils.router_id + if bgp_vrf_redistribute_connected is True: bgp_vrf["redistribute"] = {"connected": {"enabled": True}} # Redistribution of static routes for VRF default are handled elsewhere diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py index 6faead71e37..76326af4550 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py @@ -61,15 +61,20 @@ def router_ospf(self: AvdStructuredConfigNetworkServices) -> dict | None: msg = f"'ospf.process_id' or 'vrf_id' under vrf '{vrf['name']}" raise AristaAvdInvalidInputsError(msg) - process = { + process = {} + if self.shared_utils.use_router_general_for_router_id is False: + process["router_id"] = default(get(vrf, "ospf.router_id"), self.shared_utils.router_id) + + process.update( + { "id": process_id, "vrf": vrf["name"] if vrf["name"] != "default" else None, "passive_interface_default": True, - "router_id": default(get(vrf, "ospf.router_id"), self.shared_utils.router_id), "no_passive_interfaces": ospf_interfaces, "bfd_enable": get(vrf, "ospf.bfd"), "max_lsa": get(vrf, "ospf.max_lsa"), } + ) process_redistribute = {} diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/mpls.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/mpls.py index 2f90eb76fa3..d91f4301d35 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/mpls.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/mpls.py @@ -26,14 +26,16 @@ def mpls(self: AvdStructuredConfigUnderlay) -> dict | None: return None if self.shared_utils.underlay_ldp is True: - return { + mpls_config = { "ip": True, "ldp": { "interface_disabled_default": True, - "router_id": self.shared_utils.router_id, "shutdown": False, "transport_address_interface": "Loopback0", }, } + if self.shared_utils.use_router_general_for_router_id is False: + mpls_config["ldp"]["router_id"] = self.shared_utils.router_id + return mpls_config return {"ip": True} diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/router_isis.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/router_isis.py index 4822979e142..d591fae24a1 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/router_isis.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/router_isis.py @@ -28,14 +28,19 @@ def router_isis(self: AvdStructuredConfigUnderlay) -> dict | None: if self.shared_utils.underlay_isis is not True: return None - router_isis = { + router_isis = {} + if self.shared_utils.use_router_general_for_router_id is False: + router_isis["router_id"] = self.shared_utils.router_id + + router_isis.update( + { "instance": self.shared_utils.isis_instance_name, "log_adjacency_changes": True, "net": self._isis_net, - "router_id": self.shared_utils.router_id, "is_type": self._is_type, "address_family_ipv4": {"enabled": True, "maximum_paths": get(self._hostvars, "isis_maximum_paths", default=4)}, } + ) if self.shared_utils.underlay_ldp is True: router_isis["mpls_ldp_sync_default"] = True diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/router_ospf.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/router_ospf.py index 04633c2d83e..4e4579c17ac 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/router_ospf.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/router_ospf.py @@ -36,15 +36,20 @@ def router_ospf(self: AvdStructuredConfigUnderlay) -> dict | None: if self.shared_utils.mlag_l3 is True: mlag_l3_vlan = default(self.shared_utils.mlag_peer_l3_vlan, self.shared_utils.mlag_peer_vlan) no_passive_interfaces.append(f"Vlan{mlag_l3_vlan}") + + process = {} + if self.shared_utils.use_router_general_for_router_id is False: + process["router_id"] = self.shared_utils.router_id - process = { + process.update( + { "id": process_id, "passive_interface_default": True, - "router_id": self.shared_utils.router_id, "max_lsa": get(self._hostvars, "underlay_ospf_max_lsa", default=12000), "no_passive_interfaces": no_passive_interfaces, "bfd_enable": get(self._hostvars, "underlay_ospf_bfd_enable", default=False), } + ) if self.shared_utils.overlay_routing_protocol == "none": process["redistribute"] = { diff --git a/python-avd/pyavd/api/ip_addressing/__init__.py b/python-avd/pyavd/api/ip_addressing/__init__.py index 352bb60e778..478614a1aa7 100644 --- a/python-avd/pyavd/api/ip_addressing/__init__.py +++ b/python-avd/pyavd/api/ip_addressing/__init__.py @@ -7,7 +7,7 @@ from pyavd._eos_designs.avdfacts import AvdFacts from pyavd._errors import AristaAvdError -from pyavd._utils import get_ip_from_pool +from pyavd._utils import get, get_ip_from_pool from .utils import UtilsMixin @@ -222,6 +222,7 @@ def router_id(self) -> str: Default pool is "loopback_ipv4_pool" Default offset from pool is `id + loopback_ipv4_offset` """ + if self._loopback_ipv4_address: return self._loopback_ipv4_address @@ -243,6 +244,7 @@ def ipv6_router_id(self) -> str: Default pool is "loopback_ipv6_pool" Default offset from pool is `id + loopback_ipv6_offset` """ + if template_path := self.shared_utils.ip_addressing_templates.get("ipv6_router_id"): return self._template( template_path,