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

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p1.yml

@@ -67,9 +67,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.0.1
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.0.1
 ethernet_interfaces:
 - name: Ethernet1
   peer: pe1

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p2.yml

@@ -67,9 +67,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.0.2
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.0.2
 ethernet_interfaces:
 - name: Ethernet2
   peer: pe1

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p3.yml

@@ -67,9 +67,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.0.3
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.0.3
 ethernet_interfaces:
 - name: Ethernet2
   peer: rr1

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p4.yml

@@ -67,9 +67,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.0.4
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.0.4
 ethernet_interfaces:
 - name: Ethernet2
   peer: rr2

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml

@@ -157,9 +157,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.1.1
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.1.1
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml

@@ -157,9 +157,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.1.2
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.1.2
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml

@@ -157,9 +157,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.1.3
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.1.3
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr1.yml

@@ -128,9 +128,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.2.1
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.2.1
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr2.yml

@@ -128,9 +128,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 10.255.2.2
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 10.255.2.2
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml

@@ -200,9 +200,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.5
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.5
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml

@@ -245,9 +245,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.6
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.6
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR1.yml

@@ -80,9 +80,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.1
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.1
 ethernet_interfaces:
 - name: Ethernet1
   peer: SITE1-LER1

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR2.yml

@@ -80,9 +80,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.2
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.2
 ethernet_interfaces:
 - name: Ethernet1
   peer: SITE1-LER2

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-RR1.yml

@@ -156,9 +156,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.8
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.8
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml

@@ -254,9 +254,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.7
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.7
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR1.yml

@@ -80,9 +80,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.3
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.3
 ethernet_interfaces:
 - name: Ethernet3
   peer: SITE1-LSR1

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR2.yml

@@ -80,9 +80,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.4
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.4
 ethernet_interfaces:
 - name: Ethernet3
   peer: SITE1-LSR2

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-RR1.yml

@@ -156,9 +156,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.9
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.9
 router_bfd:
   multihop:
     interval: 300

ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE3-LER1.yml

@@ -83,9 +83,9 @@ mpls:
   ip: true
   ldp:
     interface_disabled_default: true
-    router_id: 100.70.0.10
     shutdown: false
     transport_address_interface: Loopback0
+    router_id: 100.70.0.10
 ip_igmp_snooping:
   globally_enabled: true
 ip_virtual_router_mac_address: 00:1c:73:00:dc:00

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

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg

@@ -299,14 +299,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

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

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: [email protected]
   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

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:

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:

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-3-isis-sr-ldp.yml

@@ -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

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
 

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

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