Cut(eos_designs): Remove automatic conversion of dict-of-dicts to lis…

…ts (#4321)
aristanetworks · Aug 6, 2024 · 592a52f · 592a52f
1 parent 2f5e228
commit 592a52f
Show file tree

Hide file tree

Showing 55 changed files with 194 additions and 713 deletions.
diff --git a/ansible_collections/arista/avd/molecule/dhcp_configuration/inventory/group_vars/AVD_LAB.yml b/ansible_collections/arista/avd/molecule/dhcp_configuration/inventory/group_vars/AVD_LAB.yml
@@ -3,12 +3,12 @@ root_dir: '{{ playbook_dir }}'
 
 # local users
 local_users:
-  admin:
+  - name: admin
     privilege: 15
     role: network-admin
     no_password: true
 
-  cvpadmin:
+  - name: cvpadmin
     privilege: 15
     role: network-admin
     sha512_password: "$6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj."

diff --git a/...le_collections/arista/avd/molecule/dhcp_configuration/inventory/group_vars/DC1_FABRIC.yml b/...le_collections/arista/avd/molecule/dhcp_configuration/inventory/group_vars/DC1_FABRIC.yml
@@ -38,19 +38,19 @@ spine:
   platform: vEOS-LAB
   bgp_as: 65001
   nodes:
-    DC1-SPINE1:
+    - name: DC1-SPINE1
       id: 1
       mgmt_ip: 192.168.200.101/24
       mac_address: '0c:1d:c0:1d:62:01'
-    DC1-SPINE2:
+    - name: DC1-SPINE2
       id: 2
       mgmt_ip: 192.168.200.102/24
       mac_address: '0c:1d:c0:1d:62:01'
-    DC1-SPINE3:
+    - name: DC1-SPINE3
       id: 3
       mgmt_ip: 192.168.200.103/24
       mac_address: '0c:1d:c0:1d:62:01'
-    DC1-SPINE4:
+    - name: DC1-SPINE4
       id: 4
       mgmt_ip: 192.168.200.104/24
       mac_address: '0c:1d:c0:1d:62:01'
@@ -70,61 +70,61 @@ l3leaf:
     spanning_tree_priority: 4096
     virtual_router_mac_address: 00:dc:00:00:00:0a
   node_groups:
-    DC1_LEAF1:
+    - group: DC1_LEAF1
       bgp_as: 65101
       filter:
         tenants: [ all ]
         tags: [ web, app ]
       nodes:
-        DC1-LEAF1A:
+        - name: DC1-LEAF1A
           id: 1
           mgmt_ip: 192.168.200.105/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet1, Ethernet1, Ethernet1, Ethernet1 ]
-    DC1_LEAF2:
+    - group: DC1_LEAF2
       bgp_as: 65102
       filter:
         tenants: [ Tenant_A, Tenant_B, Tenant_C ]
         tags: [ opzone, web, app, db, vmotion, nfs ]
       nodes:
-        DC1-LEAF2A:
+        - name: DC1-LEAF2A
           id: 2
           mgmt_ip: 192.168.200.106/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet2, Ethernet2, Ethernet2, Ethernet2 ]
-        DC1-LEAF2B:
+        - name: DC1-LEAF2B
           id: 3
           mgmt_ip: 192.168.200.107/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet3, Ethernet3, Ethernet3, Ethernet3 ]
-    DC1_SVC3:
+    - group: DC1_SVC3
       bgp_as: 65103
       filter:
         tenants: [ Tenant_A, Tenant_B, Tenant_C ]
         tags: [ opzone, web, app, db, vmotion, nfs, wan ]
       nodes:
-        DC1-SVC3A:
+        - name: DC1-SVC3A
           id: 4
           mgmt_ip: 192.168.200.108/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet4, Ethernet4, Ethernet4, Ethernet4 ]
-        DC1-SVC3B:
+        - name: DC1-SVC3B
           id: 5
           mgmt_ip: 192.168.200.109/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet5, Ethernet5, Ethernet5, Ethernet5 ]
-    DC1_BL1:
+    - group: DC1_BL1
       bgp_as: 65104
       filter:
         tenants: [ all ]
         tags: [ wan ]
       nodes:
-        DC1-BL1A:
+        - name: DC1-BL1A
           id: 6
           mgmt_ip: 192.168.200.110/24
           mac_address: '0c:1d:c0:1d:62:01'
           spine_interfaces: [ Ethernet6, Ethernet6, Ethernet6, Ethernet6 ]
-        DC1-BL1B:
+        - name: DC1-BL1B
           id: 7
           mgmt_ip: 192.168.200.111/24
           spine_interfaces: [ Ethernet7, Ethernet7, Ethernet7, Ethernet7 ]

diff --git a/...ions/arista/avd/molecule/dhcp_configuration/inventory/group_vars/DC1_TENANTS_NETWORKS.yml b/...ions/arista/avd/molecule/dhcp_configuration/inventory/group_vars/DC1_TENANTS_NETWORKS.yml
@@ -3,119 +3,118 @@
 
 tenants:
   # Tenant_A Specific Information - VRFs / VLANs
-  Tenant_A:
+  - name: Tenant_A
     mac_vrf_vni_base: 10000
     vrfs:
-      Tenant_A_OP_Zone:
+      - name: Tenant_A_OP_Zone
         vrf_vni: 10
         vtep_diagnostic:
           loopback: 100
           loopback_ip_range: 10.255.1.0/24
         svis:
-          110:
+          - id: 110
             name: Tenant_A_OP_Zone_1
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.1.10.1/24
-          111:
+          - id: 111
             vni_override: 50111
             name: Tenant_A_OP_Zone_2
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.1.11.1/24
-      Tenant_A_WEB_Zone:
+      - name: Tenant_A_WEB_Zone
         vrf_vni: 11
         svis:
-          120:
+          - id: 120
             name: Tenant_A_WEB_Zone_1
             tags: ['web', 'erp1']
             enabled: True
             ip_address_virtual: 10.1.20.1/24
-          121:
+          - id: 121
             name: Tenant_A_WEBZone_2
             tags: ['web']
             enabled: True
-            ip_address_virtual: 10.1.21.1/24
-      Tenant_A_APP_Zone:
+      - name: Tenant_A_APP_Zone
         vrf_vni: 12
         svis:
-          130:
+          - id: 130
             name: Tenant_A_APP_Zone_1
             tags: ['app', 'erp1']
             enabled: True
             ip_address_virtual: 10.1.30.1/24
-          131:
+          - id: 131
             name: Tenant_A_APP_Zone_2
             tags: ['app']
             enabled: True
             ip_address_virtual: 10.1.31.1/24
-      Tenant_A_DB_Zone:
+      - name: Tenant_A_DB_Zone
         vrf_vni: 13
         svis:
-          140:
+          - id: 140
             name: Tenant_A_DB_BZone_1
             tags: ['db', 'erp1']
             enabled: True
             ip_address_virtual: 10.1.40.1/24
-          141:
+          - id: 141
             name: Tenant_A_DB_Zone_2
             tags: ['db']
             enabled: True
             ip_address_virtual: 10.1.41.1/24
-      Tenant_A_WAN_Zone:
+      - name: Tenant_A_WAN_Zone
         vrf_vni: 14
         svis:
-          150:
+          - id: 150
             name: Tenant_A_WAN_Zone_1
             tags: ['wan']
             enabled: True
             ip_address_virtual: 10.1.40.1/24
   # Tenant_B Specific Information - VRFs / VLANs
-  Tenant_B:
+  - name: Tenant_B
     mac_vrf_vni_base: 20000
     vrfs:
-      Tenant_B_OP_Zone:
+      - name: Tenant_B_OP_Zone
         vrf_vni: 20
         svis:
-          210:
+          - id: 210
             name: Tenant_B_OP_Zone_1
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.2.10.1/24
-          211:
+          - id: 211
             name: Tenant_B_OP_Zone_2
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.2.11.1/24
-      Tenant_B_WAN_Zone:
+      - name: Tenant_B_WAN_Zone
         vrf_vni: 21
         svis:
-          250:
+          - id: 250
             name: Tenant_B_WAN_Zone_1
             tags: ['wan']
             enabled: True
             ip_address_virtual: 10.2.50.1/24
   # Tenant_C Specific Information - VRFs / VLANs
-  Tenant_C:
+  - name: Tenant_C
     mac_vrf_vni_base: 30000
     vrfs:
-      Tenant_C_OP_Zone:
+      - name: Tenant_C_OP_Zone
         vrf_vni: 30
         svis:
-          310:
+          - id: 310
             name: Tenant_C_OP_Zone_1
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.3.10.1/24
-          311:
+          - id: 311
             name: Tenant_C_OP_Zone_2
             tags: ['opzone']
             enabled: True
             ip_address_virtual: 10.3.11.1/24
-      Tenant_C_WAN_Zone:
+      - name: Tenant_C_WAN_Zone
         vrf_vni: 31
         svis:
-          350:
+          - id: 350
             name: Tenant_C_WAN_Zone_1
             tags: ['wan']
             enabled: True

diff --git a/ansible_collections/arista/avd/molecule/dhcp_provisioning/converge.yml b/ansible_collections/arista/avd/molecule/dhcp_provisioning/converge.yml
@@ -13,20 +13,6 @@
         eos_config_dir_name: "configs/default_node_types"
         structured_cvp_dir: "{{ structured_dir }}/cvp/default_node_types/"
 
-- name: Converge - generate DHCP configuration offline for custom node types with 3.x syntax using a dict of dicts
-  hosts: TOOLS
-  gather_facts: false
-  connection: local
-  tasks:
-    - name: Generate intended configuration
-      ansible.builtin.import_role:
-        name: arista.avd.dhcp_provisioner
-      vars:
-        fabric_group: DC1_L2LEAFS
-        # Overwriting destination dirs .. based on the not so glorious role hack for eos_config_dir_name
-        eos_config_dir_name: "configs/custom_avd3_node_types"
-        structured_cvp_dir: "{{ structured_dir }}/cvp/custom_avd3_node_types/"
-
 - name: Converge - generate DHCP configuration offline for custom node types with 4.x syntax using a list of dicts
   hosts: TOOLS
   gather_facts: false

diff --git a/.../arista/avd/molecule/dhcp_provisioning/intended/configs/custom_avd3_node_types/dhcpd.conf b/.../arista/avd/molecule/dhcp_provisioning/intended/configs/custom_avd3_node_types/dhcpd.conf