added router_id support with vtep_diagnostic under netwrok services

aristanetworks · Dec 3, 2024 · ee003c3 · ee003c3
1 parent 201e02a
commit ee003c3
Show file tree

Hide file tree

Showing 34 changed files with 199 additions and 59 deletions.
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg
@@ -477,7 +477,6 @@ router bgp 65105
       router-id 192.168.255.15
 !
 router ospf 14 vrf Tenant_A_WAN_Zone
-   router-id 192.168.255.15
    passive-interface default
    no passive-interface Vlan150
    redistribute bgp

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg
@@ -375,7 +375,6 @@ router bgp 65101
       rd 1.1.1.1:12
       route-target import evpn 1234:12
       route-target export evpn 1234:12
-      router-id 192.168.42.42
       redistribute connected
    !
    vrf Tenant_A_OP_Zone
@@ -394,7 +393,7 @@ router bgp 65101
       redistribute connected
 !
 router ospf 9 vrf Tenant_A_OP_Zone
-   router-id 192.168.42.42
+   router-id 10.10.10.10
    passive-interface default
    no passive-interface Vlan113
    redistribute bgp

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg
@@ -822,14 +822,13 @@ router bgp 65102
       rd 65001:12
       route-target import evpn 100000:12
       route-target export evpn 100000:12
-      router-id 192.168.255.10
       redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 65001:13
       route-target import evpn 100000:13
       route-target export evpn 100000:13
-      router-id 192.168.255.10
+      router-id 11.11.11.11
       redistribute connected
    !
    vrf Tenant_A_OP_Zone
@@ -877,7 +876,7 @@ router bgp 65102
       redistribute static
 !
 router ospf 16 vrf Tenant_A_OSPF
-   router-id 192.168.255.10
+   router-id 10.255.11.10
    passive-interface default
    no passive-interface Ethernet22
    no passive-interface Ethernet23

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg
@@ -786,14 +786,13 @@ router bgp 65102
       rd 65001:12
       route-target import evpn 100000:12
       route-target export evpn 100000:12
-      router-id 192.168.255.11
       redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 65001:13
       route-target import evpn 100000:13
       route-target export evpn 100000:13
-      router-id 192.168.255.11
+      router-id 11.11.11.11
       redistribute connected
    !
    vrf Tenant_A_OP_Zone
@@ -841,7 +840,7 @@ router bgp 65102
       redistribute static
 !
 router ospf 16 vrf Tenant_A_OSPF
-   router-id 192.168.255.11
+   router-id 10.255.11.11
    passive-interface default
    no passive-interface Ethernet24
    redistribute bgp

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg
@@ -1098,7 +1098,6 @@ router bgp 65103
       rd 65103:12
       route-target import evpn 12:12
       route-target export evpn 12:12
-      router-id 192.168.255.12
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B
@@ -1108,7 +1107,7 @@ router bgp 65103
       rd 65103:13
       route-target import evpn 13:13
       route-target export evpn 13:13
-      router-id 192.168.255.12
+      router-id 11.11.11.11
       update wait-install
       neighbor 10.255.251.7 peer group MLAG-PEERS
       neighbor 10.255.251.7 description DC1-SVC3B

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg
@@ -1062,7 +1062,6 @@ router bgp 65103
       rd 65103:12
       route-target import evpn 12:12
       route-target export evpn 12:12
-      router-id 192.168.255.13
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A
@@ -1072,7 +1071,7 @@ router bgp 65103
       rd 65103:13
       route-target import evpn 13:13
       route-target export evpn 13:13
-      router-id 192.168.255.13
+      router-id 11.11.11.11
       update wait-install
       neighbor 10.255.251.6 peer group MLAG-PEERS
       neighbor 10.255.251.6 description DC1-SVC3A

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg
@@ -656,7 +656,6 @@ router bgp 65110
       rd 192.168.255.21:12
       route-target import evpn 12:12
       route-target export evpn 12:12
-      router-id 192.168.255.21
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B
@@ -666,7 +665,7 @@ router bgp 65110
       rd 192.168.255.21:13
       route-target import evpn 13:13
       route-target export evpn 13:13
-      router-id 192.168.255.21
+      router-id 11.11.11.11
       update wait-install
       neighbor 10.255.251.25 peer group MLAG-PEERS
       neighbor 10.255.251.25 description DC1_UNDEPLOYED_LEAF1B

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg
@@ -656,7 +656,6 @@ router bgp 65111
       rd 192.168.255.22:12
       route-target import evpn 12:12
       route-target export evpn 12:12
-      router-id 192.168.255.22
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
       neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A
@@ -666,7 +665,7 @@ router bgp 65111
       rd 192.168.255.22:13
       route-target import evpn 13:13
       route-target export evpn 13:13
-      router-id 192.168.255.22
+      router-id 11.11.11.11
       update wait-install
       neighbor 10.255.251.24 peer group MLAG-PEERS
       neighbor 10.255.251.24 description DC1_UNDEPLOYED_LEAF1A

diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg
@@ -422,7 +422,7 @@ router bgp 65151
       rd 192.168.255.33:20
       route-target import evpn 20:20
       route-target export evpn 20:20
-      router-id 192.168.255.33
+      router-id 10.255.1.33
       redistribute connected
 !
 end
diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg
@@ -422,7 +422,7 @@ router bgp 65152
       rd 192.168.255.34:20
       route-target import evpn 20:20
       route-target export evpn 20:20
-      router-id 192.168.255.34
+      router-id 10.255.1.34
       redistribute connected
 !
 end
diff --git a/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg b/...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
@@ -227,7 +227,7 @@ router bgp 65153
       rd 192.168.255.35:20
       route-target import evpn 20:20
       route-target export evpn 20:20
-      router-id 192.168.255.35
+      router-id 10.255.1.35
       redistribute connected
 !
 end
diff --git a/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg b/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg
@@ -659,14 +659,13 @@ router bgp 101
       rd 192.168.255.109:12
       route-target import evpn 12:12
       route-target export evpn 12:12
-      router-id 192.168.255.109
       redistribute connected
    !
    vrf Tenant_A_DB_Zone
       rd 192.168.255.109:13
       route-target import evpn 13:13
       route-target export evpn 13:13
-      router-id 192.168.255.109
+      router-id 11.11.11.11
       redistribute connected
    !
    vrf Tenant_A_ERP_Zone

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml
@@ -692,7 +692,6 @@ router_ospf:
   - 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/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml
@@ -100,7 +100,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '1234:12'
-    router_id: 192.168.42.42
     redistribute:
       connected:
         enabled: true
@@ -569,7 +568,7 @@ router_ospf:
   - id: 9
     vrf: Tenant_A_OP_Zone
     passive_interface_default: true
-    router_id: 192.168.42.42
+    router_id: 10.10.10.10
     no_passive_interfaces:
     - Vlan113
     redistribute:

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
@@ -120,7 +120,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '100000:12'
-    router_id: 192.168.255.10
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '100000:13'
-    router_id: 192.168.255.10
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true
@@ -1226,7 +1225,7 @@ router_ospf:
   - id: 16
     vrf: Tenant_A_OSPF
     passive_interface_default: true
-    router_id: 192.168.255.10
+    router_id: 10.255.11.10
     no_passive_interfaces:
     - Ethernet22
     - Ethernet23

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
@@ -120,7 +120,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '100000:12'
-    router_id: 192.168.255.11
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '100000:13'
-    router_id: 192.168.255.11
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true
@@ -1166,7 +1165,7 @@ router_ospf:
   - id: 16
     vrf: Tenant_A_OSPF
     passive_interface_default: true
-    router_id: 192.168.255.11
+    router_id: 10.255.11.11
     no_passive_interfaces:
     - Ethernet24
     redistribute:

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml
@@ -114,7 +114,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '12:12'
-    router_id: 192.168.255.12
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '13:13'
-    router_id: 192.168.255.12
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml
@@ -114,7 +114,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '12:12'
-    router_id: 192.168.255.13
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '13:13'
-    router_id: 192.168.255.13
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml
@@ -114,7 +114,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '12:12'
-    router_id: 192.168.255.21
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '13:13'
-    router_id: 192.168.255.21
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml
@@ -114,7 +114,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '12:12'
-    router_id: 192.168.255.22
     redistribute:
       connected:
         enabled: true
@@ -135,7 +134,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '13:13'
-    router_id: 192.168.255.22
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
@@ -67,7 +67,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '20:20'
-    router_id: 192.168.255.33
+    router_id: 10.255.1.33
     redistribute:
       connected:
         enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
@@ -67,7 +67,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '20:20'
-    router_id: 192.168.255.34
+    router_id: 10.255.1.34
     redistribute:
       connected:
         enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
@@ -82,7 +82,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '20:20'
-    router_id: 192.168.255.35
+    router_id: 10.255.1.35
     redistribute:
       connected:
         enabled: true

diff --git a/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml b/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml
@@ -58,7 +58,6 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '12:12'
-    router_id: 192.168.255.109
     redistribute:
       connected:
         enabled: true
@@ -73,7 +72,7 @@ router_bgp:
       - address_family: evpn
         route_targets:
         - '13:13'
-    router_id: 192.168.255.109
+    router_id: 11.11.11.11
     redistribute:
       connected:
         enabled: true