Refactor(eos_designs): Move l3_interfaces from l3_edge to node type k…

…ey (#3473)
aristanetworks · Jan 8, 2024 · 434331e · 434331e
1 parent 98749b6
commit 434331e
Show file tree

Hide file tree

Showing 39 changed files with 4,529 additions and 12,539 deletions.
diff --git a/...ntended/configs/l3_edge_l3_interfaces.cfg → ...ended/configs/node-type-l3-interfaces.cfg b/...ntended/configs/l3_edge_l3_interfaces.cfg → ...ended/configs/node-type-l3-interfaces.cfg
@@ -6,7 +6,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname l3_edge_l3_interfaces
+hostname node-type-l3-interfaces
 !
 spanning-tree mode none
 !
@@ -18,6 +18,7 @@ vrf instance MGMT
 interface Ethernet1
    description peer1_eth1
    no shutdown
+   speed forced 10000full
    no switchport
    ip address 192.168.1.2/31
    service-policy type qos input TEST_POLICY

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml
@@ -62,6 +62,13 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: dhcp
+  shutdown: false
+  type: routed
+  dhcp_client_accept_default_route: true
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -131,13 +138,6 @@ stun:
       ip_address: 10.7.7.7
     - name: INET-autovpn-rr2-Ethernet1
       ip_address: 10.8.8.8
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: dhcp
-  shutdown: false
-  type: routed
-  dhcp_client_accept_default_route: true
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml
@@ -79,6 +79,13 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: dhcp
+  shutdown: false
+  type: routed
+  dhcp_client_accept_default_route: true
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -134,13 +141,6 @@ stun:
   server:
     local_interfaces:
     - Ethernet1
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: dhcp
-  shutdown: false
-  type: routed
-  dhcp_client_accept_default_route: true
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml
@@ -79,11 +79,20 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: 10.8.8.8/31
+  shutdown: false
+  type: routed
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
   shutdown: false
   ip_address: 192.168.31.2/32
+static_routes:
+- destination_address_prefix: 0.0.0.0/0
+  gateway: 10.8.8.9
 ip_security:
   ike_policies:
   - name: AUTOVPN-IKE
@@ -134,15 +143,6 @@ stun:
   server:
     local_interfaces:
     - Ethernet1
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: 10.8.8.8/31
-  shutdown: false
-  type: routed
-static_routes:
-- destination_address_prefix: 0.0.0.0/0
-  gateway: 10.8.8.9
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml
@@ -69,6 +69,22 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: dhcp
+  shutdown: false
+  type: routed
+  dhcp_client_accept_default_route: true
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
+- name: Ethernet2
+  peer_type: l3_interface
+  ip_address: 172.15.5.5/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -178,22 +194,6 @@ stun:
       ip_address: 10.7.7.7
     - name: INET-cv-pathfinder-pathfinder-Ethernet3
       ip_address: 10.9.9.9
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: dhcp
-  shutdown: false
-  type: routed
-  dhcp_client_accept_default_route: true
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-- name: Ethernet2
-  peer_type: l3_interface
-  ip_address: 172.15.5.5/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/.../molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml b/.../molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml
@@ -78,11 +78,36 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: 10.7.7.7/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
+- name: Ethernet2
+  peer_type: l3_interface
+  ip_address: 172.16.0.1/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
+- name: Ethernet3
+  peer_type: l3_interface
+  ip_address: 10.9.9.9/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
   shutdown: false
   ip_address: 192.168.44.1/32
+static_routes:
+- destination_address_prefix: 0.0.0.0/0
+  gateway: 10.7.7.6
 flow_tracking:
   hardware:
     trackers:
@@ -163,31 +188,6 @@ stun:
     - Ethernet1
     - Ethernet2
     - Ethernet3
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: 10.7.7.7/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-- name: Ethernet2
-  peer_type: l3_interface
-  ip_address: 172.16.0.1/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-- name: Ethernet3
-  peer_type: l3_interface
-  ip_address: 10.9.9.9/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-static_routes:
-- destination_address_prefix: 0.0.0.0/0
-  gateway: 10.7.7.6
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml
@@ -104,6 +104,14 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: 10.8.8.8/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -190,14 +198,6 @@ stun:
   server:
     local_interfaces:
     - Ethernet1
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: 10.8.8.8/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml
@@ -104,6 +104,21 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: 10.9.9.9/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
+- name: Ethernet2
+  peer_type: l3_interface
+  ip_address: 172.19.9.9/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -201,21 +216,6 @@ stun:
     local_interfaces:
     - Ethernet1
     - Ethernet2
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: 10.9.9.9/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-- name: Ethernet2
-  peer_type: l3_interface
-  ip_address: 172.19.9.9/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
 dps_interfaces:
 - name: Dps1
   description: DPS Interface

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit.yml
@@ -69,6 +69,22 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
   enable_https: true
+ethernet_interfaces:
+- name: Ethernet1
+  peer_type: l3_interface
+  ip_address: dhcp
+  shutdown: false
+  type: routed
+  dhcp_client_accept_default_route: true
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
+- name: Ethernet2
+  peer_type: l3_interface
+  ip_address: 172.16.6.6/31
+  shutdown: false
+  type: routed
+  flow_tracker:
+    hardware: WAN-FLOW-TRACKER
 loopback_interfaces:
 - name: Loopback0
   description: Router_ID
@@ -188,22 +204,6 @@ stun:
       ip_address: 10.9.9.9
     - name: MPLS-cv-pathfinder-pathfinder-Ethernet2
       ip_address: 172.16.0.1
-ethernet_interfaces:
-- name: Ethernet1
-  peer_type: l3_interface
-  ip_address: dhcp
-  shutdown: false
-  type: routed
-  dhcp_client_accept_default_route: true
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
-- name: Ethernet2
-  peer_type: l3_interface
-  ip_address: 172.16.6.6/31
-  shutdown: false
-  type: routed
-  flow_tracker:
-    hardware: WAN-FLOW-TRACKER
 dps_interfaces:
 - name: Dps1
   description: DPS Interface