Refactor(eos_designs): Structured config output as classes

aristanetworks · Nov 8, 2024 · 0ee12b8 · 0ee12b8
1 parent 1f068d2
commit 0ee12b8
Show file tree

Hide file tree

Showing 34 changed files with 422 additions and 412 deletions.
diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg
@@ -13,6 +13,8 @@ hostname inband-mgmt-ipv6-only-vrf
 vlan 107
    name INBAND_MGMT
 !
+vrf instance INBANDMGMT
+!
 vrf instance MGMT
 !
 management api http-commands

diff --git a/...ecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml b/...ecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml
@@ -68,16 +68,16 @@ vlans:
   name: VLAN11
   tenant: FLOW_TRACKING
 - id: 4092
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 ip_igmp_snooping:
   globally_enabled: true
 vlan_interfaces:
 - name: Vlan4092
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 10.254.254.4/24
+  mtu: 1500
   type: inband_mgmt
 flow_tracking:
   sampled:

diff --git a/...ecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml b/...ecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml
@@ -68,16 +68,16 @@ vlans:
   name: VLAN11
   tenant: FLOW_TRACKING
 - id: 4092
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 ip_igmp_snooping:
   globally_enabled: true
 vlan_interfaces:
 - name: Vlan4092
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 10.254.254.5/24
+  mtu: 1500
   type: inband_mgmt
 flow_tracking:
   sampled:

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml
@@ -163,8 +163,8 @@ vlans:
   - MLAG
   tenant: FLOW_TRACKING
 - id: 4092
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4093
   description: MLAG_L3
@@ -193,13 +193,13 @@ vlan_interfaces:
 - name: Vlan4092
   description: Inband Management
   shutdown: false
+  ip_address: 10.254.254.2/24
+  ip_virtual_router_addresses:
+  - 10.254.254.1
   mtu: 1500
   ip_attached_host_route_export:
     enabled: true
     distance: 19
-  ip_address: 10.254.254.2/24
-  ip_virtual_router_addresses:
-  - 10.254.254.1
 port_channel_interfaces:
 - name: Port-Channel21
   description: MLAG_flow-tracking-tests-leaf4_Port-Channel21

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml
@@ -163,8 +163,8 @@ vlans:
   - MLAG
   tenant: FLOW_TRACKING
 - id: 4092
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4093
   description: MLAG_L3
@@ -193,13 +193,13 @@ vlan_interfaces:
 - name: Vlan4092
   description: Inband Management
   shutdown: false
+  ip_address: 10.254.254.3/24
+  ip_virtual_router_addresses:
+  - 10.254.254.1
   mtu: 1500
   ip_attached_host_route_export:
     enabled: true
     distance: 19
-  ip_address: 10.254.254.3/24
-  ip_virtual_router_addresses:
-  - 10.254.254.1
 port_channel_interfaces:
 - name: Port-Channel21
   description: MLAG_flow-tracking-tests-leaf3_Port-Channel21

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml
@@ -53,18 +53,18 @@ vlans:
   tenant: system
 ip_igmp_snooping:
   globally_enabled: true
+ipv6_static_routes:
+- destination_address_prefix: ::/0
+  gateway: 2a00:105::1
+static_routes:
+- destination_address_prefix: 0.0.0.0/0
+  gateway: 192.168.105.1
 vlan_interfaces:
 - name: Vlan105
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 192.168.105.22/24
   ipv6_enable: true
   ipv6_address: 2a00:105::123/64
+  mtu: 1500
   type: inband_mgmt
-static_routes:
-- destination_address_prefix: 0.0.0.0/0
-  gateway: 192.168.105.1
-ipv6_static_routes:
-- destination_address_prefix: ::/0
-  gateway: 2a00:105::1
diff --git a/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml b/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml
@@ -49,22 +49,22 @@ port_channel_interfaces:
   shutdown: false
 ip_igmp_snooping:
   globally_enabled: true
-vlans:
-- id: 104
-  tenant: system
-  name: INBAND_MGMT
+ipv6_static_routes:
+- destination_address_prefix: ::/0
+  gateway: 2a00:104::1
+static_routes:
+- destination_address_prefix: 0.0.0.0/0
+  gateway: 192.168.104.1
 vlan_interfaces:
 - name: Vlan104
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 192.168.104.7/24
   ipv6_enable: true
   ipv6_address: 2a00:104::7/64
+  mtu: 1500
   type: inband_mgmt
-static_routes:
-- destination_address_prefix: 0.0.0.0/0
-  gateway: 192.168.104.1
-ipv6_static_routes:
-- destination_address_prefix: ::/0
-  gateway: 2a00:104::1
+vlans:
+- id: 104
+  name: INBAND_MGMT
+  tenant: system
diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ip.yml b/...arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ip.yml
@@ -58,7 +58,7 @@ vlan_interfaces:
 - name: Vlan103
   description: My description
   shutdown: false
-  mtu: 1500
   vrf: INBANDMGMT
   ip_address: 192.168.103.22/24
+  mtu: 1500
   type: inband_mgmt
diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml
@@ -15,6 +15,7 @@ transceiver_qsfp_default_mode_4x10: true
 vrfs:
 - name: MGMT
   ip_routing: false
+- name: INBANDMGMT
 management_api_http:
   enable_vrfs:
   - name: MGMT
@@ -49,20 +50,20 @@ port_channel_interfaces:
   shutdown: false
 ip_igmp_snooping:
   globally_enabled: true
-vlans:
-- id: 107
-  tenant: system
-  name: INBAND_MGMT
+ipv6_static_routes:
+- vrf: INBANDMGMT
+  destination_address_prefix: ::/0
+  gateway: 2a00:107::1
 vlan_interfaces:
 - name: Vlan107
   description: Inband Management
   shutdown: false
-  mtu: 1500
   vrf: INBANDMGMT
   ipv6_enable: true
   ipv6_address: 2a00:107::a/64
+  mtu: 1500
   type: inband_mgmt
-ipv6_static_routes:
-- destination_address_prefix: ::/0
-  gateway: 2a00:107::1
-  vrf: INBANDMGMT
+vlans:
+- id: 107
+  name: INBAND_MGMT
+  tenant: system
diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml
@@ -49,18 +49,18 @@ port_channel_interfaces:
   shutdown: false
 ip_igmp_snooping:
   globally_enabled: true
-vlans:
-- id: 106
-  tenant: system
-  name: INBAND_MGMT
+ipv6_static_routes:
+- destination_address_prefix: ::/0
+  gateway: 2a00:106::1
 vlan_interfaces:
 - name: Vlan106
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ipv6_enable: true
   ipv6_address: 2a00:106::9/64
+  mtu: 1500
   type: inband_mgmt
-ipv6_static_routes:
-- destination_address_prefix: ::/0
-  gateway: 2a00:106::1
+vlans:
+- id: 106
+  name: INBAND_MGMT
+  tenant: system
diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml
@@ -28,8 +28,8 @@ vlans:
   trunk_groups:
   - MLAG
 - id: 101
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4094
   description: MLAG
@@ -40,8 +40,8 @@ vlan_interfaces:
 - name: Vlan101
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 192.168.101.22/24
+  mtu: 1500
   type: inband_mgmt
 port_channel_interfaces:
 - name: Port-Channel11

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml
@@ -28,8 +28,8 @@ vlans:
   trunk_groups:
   - MLAG
 - id: 101
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4094
   description: MLAG
@@ -40,8 +40,8 @@ vlan_interfaces:
 - name: Vlan101
   description: Inband Management
   shutdown: false
-  mtu: 1500
   ip_address: 192.168.101.23/24
+  mtu: 1500
   type: inband_mgmt
 port_channel_interfaces:
 - name: Port-Channel11

diff --git a/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml b/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml
@@ -123,8 +123,8 @@ vlans:
   - MLAG
   tenant: INBAND_MGMT_TESTS
 - id: 104
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4093
   description: MLAG_L3
@@ -160,20 +160,20 @@ vlan_interfaces:
 - name: Vlan104
   description: Inband Management
   shutdown: false
-  mtu: 1500
-  ip_attached_host_route_export:
-    enabled: true
-    distance: 19
   ip_address: 192.168.104.2/24
   ip_virtual_router_addresses:
   - 192.168.104.1
-  ipv6_address: 2a00:104::2/64
   ipv6_enable: true
+  ipv6_address: 2a00:104::2/64
+  ipv6_virtual_router_addresses:
+  - 2a00:104::1
+  mtu: 1500
+  ip_attached_host_route_export:
+    enabled: true
+    distance: 19
   ipv6_attached_host_route_export:
     enabled: true
     distance: 19
-  ipv6_virtual_router_addresses:
-  - 2a00:104::1
 port_channel_interfaces:
 - name: Port-Channel11
   description: MLAG_inband-mgmt-parent-dualstack2_Port-Channel11

diff --git a/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml b/...cule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml
@@ -123,8 +123,8 @@ vlans:
   - MLAG
   tenant: INBAND_MGMT_TESTS
 - id: 104
-  tenant: system
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4093
   description: MLAG_L3
@@ -160,20 +160,20 @@ vlan_interfaces:
 - name: Vlan104
   description: Inband Management
   shutdown: false
-  mtu: 1500
-  ip_attached_host_route_export:
-    enabled: true
-    distance: 19
   ip_address: 192.168.104.3/24
   ip_virtual_router_addresses:
   - 192.168.104.1
-  ipv6_address: 2a00:104::3/64
   ipv6_enable: true
+  ipv6_address: 2a00:104::3/64
+  ipv6_virtual_router_addresses:
+  - 2a00:104::1
+  mtu: 1500
+  ip_attached_host_route_export:
+    enabled: true
+    distance: 19
   ipv6_attached_host_route_export:
     enabled: true
     distance: 19
-  ipv6_virtual_router_addresses:
-  - 2a00:104::1
 port_channel_interfaces:
 - name: Port-Channel11
   description: MLAG_inband-mgmt-parent-dualstack1_Port-Channel11

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml
@@ -88,11 +88,11 @@ vlans:
   trunk_groups:
   - MLAG
 - id: 106
-  tenant: system
   name: INBAND_MGMT
-- id: 107
   tenant: system
+- id: 107
   name: INBAND_MGMT
+  tenant: system
 vlan_interfaces:
 - name: Vlan4093
   description: MLAG_L3
@@ -108,25 +108,25 @@ vlan_interfaces:
 - name: Vlan106
   description: Inband Management
   shutdown: false
-  mtu: 1500
-  ipv6_address: 2a00:106::2/64
   ipv6_enable: true
+  ipv6_address: 2a00:106::2/64
+  ipv6_virtual_router_addresses:
+  - 2a00:106::1
+  mtu: 1500
   ipv6_attached_host_route_export:
     enabled: true
     distance: 19
-  ipv6_virtual_router_addresses:
-  - 2a00:106::1
 - name: Vlan107
   description: Inband Management
   shutdown: false
-  mtu: 1500
-  ipv6_address: 2a00:107::2/64
   ipv6_enable: true
+  ipv6_address: 2a00:107::2/64
+  ipv6_virtual_router_addresses:
+  - 2a00:107::1
+  mtu: 1500
   ipv6_attached_host_route_export:
     enabled: true
     distance: 19
-  ipv6_virtual_router_addresses:
-  - 2a00:107::1
 port_channel_interfaces:
 - name: Port-Channel11
   description: MLAG_inband-mgmt-parent-ipv6-2_Port-Channel11