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

aristanetworks · Nov 7, 2024 · 27f0a0f · 27f0a0f
1 parent 0ab8c82
commit 27f0a0f
Show file tree

Hide file tree

Showing 220 changed files with 416 additions and 246 deletions.
diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg
@@ -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/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg b/...ctions/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/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg b/...llections/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/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml b/...s/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/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml b/...s/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml b/...a/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/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml b/...ta/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml b/...a/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/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml b/...a/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/.../molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml b/.../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/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml b/...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/...vd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml b/...vd/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/...vd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml b/...vd/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/...le/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml b/...le/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/...ule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml b/...ule/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/...ule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml b/...ule/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: