Feat(eos_designs): Custom platform_settings and node_type_keys (#3300)

Co-authored-by: Claus Holbech <[email protected]>
aristanetworks · Aug 9, 2024 · 381b7a6 · 381b7a6
1 parent c9e01b9
commit 381b7a6
Show file tree

Hide file tree

Showing 30 changed files with 527 additions and 71 deletions.
diff --git a/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg b/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg
@@ -30,7 +30,7 @@ interface Ethernet2
    ip address 172.31.255.22/31
 !
 interface Loopback0
-   description TEST_CUSTOM_PREFIX_EVPN_Overlay_Peering_SPINE
+   description TEST_CUSTOM_PREFIX_EVPN_Overlay_Peering_CUSTOM_SPINE
    no shutdown
    ip address 192.168.255.1/32
 !

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg
@@ -21,7 +21,7 @@ ip name-server vrf MGMT 2001:db8::2
 !
 sflow vrf OOB destination 10.0.200.90
 sflow vrf OOB destination 192.168.200.10
-sflow vrf OOB source-interface Management1
+sflow vrf OOB source-interface Management99
 !
 snmp-server contact [email protected]
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL1A
@@ -189,7 +189,7 @@ interface Loopback1
    ip address 192.168.254.14/32
    ip address 192.168.255.255/32 secondary
 !
-interface Management1
+interface Management99
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -20,7 +20,7 @@ ip name-server vrf MGMT 2001:db8::2
 !
 sflow vrf OOB destination 10.0.200.90
 sflow vrf OOB destination 192.168.200.10
-sflow vrf OOB source-interface Management1
+sflow vrf OOB source-interface Management99
 !
 snmp-server contact [email protected]
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL1B
@@ -179,7 +179,7 @@ interface Loopback1
    no shutdown
    ip address 192.168.254.15/32
 !
-interface Management1
+interface Management99
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -20,7 +20,7 @@ ip name-server vrf MGMT 192.168.200.5
 ip name-server vrf MGMT 2001:db8::1
 ip name-server vrf MGMT 2001:db8::2
 !
-ntp local-interface vrf MGMT Management1
+ntp local-interface vrf MGMT Management99
 ntp server vrf MGMT 192.168.200.5 prefer
 ntp server vrf MGMT 2001:db8::3
 !
@@ -437,7 +437,7 @@ interface Loopback123
    ip address 10.1.53.0/32
    ip ospf area 1
 !
-interface Management1
+interface Management99
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -20,7 +20,7 @@ ip name-server vrf MGMT 192.168.200.5
 ip name-server vrf MGMT 2001:db8::1
 ip name-server vrf MGMT 2001:db8::2
 !
-ntp local-interface vrf MGMT Management1
+ntp local-interface vrf MGMT Management99
 ntp server vrf MGMT 192.168.200.5 prefer
 ntp server vrf MGMT 2001:db8::3
 !
@@ -402,7 +402,7 @@ interface Loopback123
    ip ospf cost 100
 
 !
-interface Management1
+interface Management99
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -20,18 +20,18 @@ ip name-server vrf MGMT 192.168.200.5
 ip name-server vrf MGMT 2001:db8::1
 ip name-server vrf MGMT 2001:db8::2
 !
-ntp local-interface vrf MGMT Management1
+ntp local-interface vrf MGMT Management42
 ntp server vrf MGMT 192.168.200.5 prefer
 ntp server vrf MGMT 2001:db8::3
 !
 snmp-server contact [email protected]
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1_UNDEPLOYED_LEAF1A
 !
-hardware speed-group 1 serdes 10G
+hardware speed-group 1 serdes 25G
 hardware speed-group 2 serdes 25G
-hardware speed-group 3 serdes 25G
-hardware speed-group 4 serdes 10G
-hardware speed-group 5/1 serdes 25G
+hardware speed-group 3 serdes 10G
+hardware speed-group 4 serdes 25G
+hardware speed-group 5/1 serdes 10G
 !
 spanning-tree root super
 spanning-tree mode mstp
@@ -236,7 +236,7 @@ interface Loopback100
    vrf Tenant_A_OP_Zone
    ip address 10.255.1.21/32
 !
-interface Management1
+interface Management42
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -20,18 +20,18 @@ ip name-server vrf MGMT 192.168.200.5
 ip name-server vrf MGMT 2001:db8::1
 ip name-server vrf MGMT 2001:db8::2
 !
-ntp local-interface vrf MGMT Management1
+ntp local-interface vrf MGMT Management42
 ntp server vrf MGMT 192.168.200.5 prefer
 ntp server vrf MGMT 2001:db8::3
 !
 snmp-server contact [email protected]
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1_UNDEPLOYED_LEAF1B
 !
-hardware speed-group 1 serdes 10G
+hardware speed-group 1 serdes 25G
 hardware speed-group 2 serdes 25G
-hardware speed-group 3 serdes 25G
-hardware speed-group 4 serdes 10G
-hardware speed-group 5/1 serdes 25G
+hardware speed-group 3 serdes 10G
+hardware speed-group 4 serdes 25G
+hardware speed-group 5/1 serdes 10G
 !
 spanning-tree root super
 spanning-tree mode mstp
@@ -236,7 +236,7 @@ interface Loopback100
    vrf Tenant_A_OP_Zone
    ip address 10.255.1.22/32
 !
-interface Management1
+interface Management42
    description oob_management
    no shutdown
    vrf MGMT

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
@@ -212,7 +212,7 @@ ethernet_interfaces:
 - name: Ethernet1
   peer: CUSTOM-PYTHON_MODULES-SPINE1
   peer_interface: Ethernet1
-  peer_type: spine
+  peer_type: custom_spine
   description: TEST_CUSTOM_PREFIX_P2P_LINK_TO_CUSTOM-PYTHON_MODULES-SPINE1_Ethernet1
   shutdown: false
   mtu: 9214

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
@@ -201,7 +201,7 @@ ethernet_interfaces:
 - name: Ethernet1
   peer: CUSTOM-PYTHON_MODULES-SPINE1
   peer_interface: Ethernet2
-  peer_type: spine
+  peer_type: custom_spine
   description: TEST_CUSTOM_PREFIX_P2P_LINK_TO_CUSTOM-PYTHON_MODULES-SPINE1_Ethernet2
   shutdown: false
   mtu: 9214

diff --git a/...ecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml b/...ecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml
@@ -107,7 +107,7 @@ ethernet_interfaces:
   ip_address: 172.31.255.22/31
 loopback_interfaces:
 - name: Loopback0
-  description: TEST_CUSTOM_PREFIX_EVPN_Overlay_Peering_SPINE
+  description: TEST_CUSTOM_PREFIX_EVPN_Overlay_Peering_CUSTOM_SPINE
   shutdown: false
   ip_address: 192.168.255.1/32
 prefix_lists:

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml
@@ -377,7 +377,7 @@ vrfs:
   tenant: Tenant_C
   ip_routing: true
 management_interfaces:
-- name: Management1
+- name: Management99
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -699,4 +699,4 @@ sflow:
     destinations:
     - destination: 192.168.200.10
     - destination: 10.0.200.90
-    source_interface: Management1
+    source_interface: Management99
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
@@ -369,7 +369,7 @@ vrfs:
   tenant: Tenant_C
   ip_routing: true
 management_interfaces:
-- name: Management1
+- name: Management99
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -663,4 +663,4 @@ sflow:
     destinations:
     - destination: 192.168.200.10
     - destination: 10.0.200.90
-    source_interface: Management1
+    source_interface: Management99
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
@@ -427,7 +427,7 @@ vrfs:
   ip_routing: true
   ipv6_routing: true
 management_interfaces:
-- name: Management1
+- name: Management99
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -447,7 +447,7 @@ management_api_http:
   default_services: false
 ntp:
   local_interface:
-    name: Management1
+    name: Management99
     vrf: MGMT
   servers:
   - name: 192.168.200.5

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
@@ -427,7 +427,7 @@ vrfs:
   ip_routing: true
   ipv6_routing: true
 management_interfaces:
-- name: Management1
+- name: Management99
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -447,7 +447,7 @@ management_api_http:
   default_services: false
 ntp:
   local_interface:
-    name: Management1
+    name: Management99
     vrf: MGMT
   servers:
   - name: 192.168.200.5

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
@@ -379,15 +379,15 @@ ip_routing: true
 hardware:
   speed_groups:
   - speed_group: '1'
-    serdes: 10G
+    serdes: 25G
   - speed_group: '2'
     serdes: 25G
   - speed_group: '3'
-    serdes: 25G
-  - speed_group: '4'
     serdes: 10G
-  - speed_group: 5/1
+  - speed_group: '4'
     serdes: 25G
+  - speed_group: 5/1
+    serdes: 10G
 daemon_terminattr:
   cvaddrs:
   - 192.168.200.11:9910
@@ -465,7 +465,7 @@ vrfs:
   tenant: Tenant_C
   ip_routing: true
 management_interfaces:
-- name: Management1
+- name: Management42
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -485,7 +485,7 @@ management_api_http:
   default_services: false
 ntp:
   local_interface:
-    name: Management1
+    name: Management42
     vrf: MGMT
   servers:
   - name: 192.168.200.5
@@ -1066,4 +1066,4 @@ virtual_source_nat_vrfs:
 - name: Tenant_A_OP_Zone
   ip_address: 10.255.1.21
 metadata:
-  platform: 7280R
+  platform: my_custom_platform
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
@@ -379,15 +379,15 @@ ip_routing: true
 hardware:
   speed_groups:
   - speed_group: '1'
-    serdes: 10G
+    serdes: 25G
   - speed_group: '2'
     serdes: 25G
   - speed_group: '3'
-    serdes: 25G
-  - speed_group: '4'
     serdes: 10G
-  - speed_group: 5/1
+  - speed_group: '4'
     serdes: 25G
+  - speed_group: 5/1
+    serdes: 10G
 daemon_terminattr:
   cvaddrs:
   - 192.168.200.11:9910
@@ -465,7 +465,7 @@ vrfs:
   tenant: Tenant_C
   ip_routing: true
 management_interfaces:
-- name: Management1
+- name: Management42
   description: oob_management
   shutdown: false
   vrf: MGMT
@@ -485,7 +485,7 @@ management_api_http:
   default_services: false
 ntp:
   local_interface:
-    name: Management1
+    name: Management42
     vrf: MGMT
   servers:
   - name: 192.168.200.5
@@ -1066,4 +1066,4 @@ virtual_source_nat_vrfs:
 - name: Tenant_A_OP_Zone
   ip_address: 10.255.1.22
 metadata:
-  platform: 7280R
+  platform: my_custom_platform
diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml
@@ -88,7 +88,7 @@ default_interfaces:
     downlink_interfaces: [ Ethernet1-30/1 ]
 
   - types: [ l3leaf ]
-    platforms: [ 7280R, 7280R2 ]
+    platforms: [ 7280R, 7280R2, my_custom_platform ]
     uplink_interfaces: [ Ethernet49-56/1 ]
     mlag_interfaces: [ Ethernet57-58/1 ]
     downlink_interfaces: [ Ethernet1-30/1 ]
@@ -104,3 +104,27 @@ default_interfaces:
     uplink_interfaces: [ Ethernet1/27-30/1 ]
     mlag_interfaces: [ Ethernet1/31-32/1 ]
     downlink_interfaces: [ Ethernet1/1-26/1 ]
+
+# Custom platform with Management42 as the management interface
+custom_platform_settings:
+  - platforms: [ my_custom_platform ]
+    management_interface: Management42
+    tcam_profile: vxlan-routing
+    lag_hardware_only: true
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
+    feature_support:
+      queue_monitor_length_notify: false
+      interface_storm_control: false
+      bgp_update_wait_for_convergence: true
+      bgp_update_wait_install: true
+
+  # Test overwriting an existing platform
+  - platforms: [ 7280R ]
+    management_interface: Management99
+    tcam_profile: vxlan-routing
+    lag_hardware_only: true
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
diff --git a/...avd/molecule/eos_designs_unit_tests/inventory/group_vars/CUSTOM_PYTHON_MODULES_SPINES.yml b/...avd/molecule/eos_designs_unit_tests/inventory/group_vars/CUSTOM_PYTHON_MODULES_SPINES.yml
@@ -1,9 +1,9 @@
 ---
 
-type: spine
+type: custom_spine
 
 # Spine Switches
-spine:
+custom_spine:
   defaults:
     platform: vEOS-LAB
     bgp_as: 65001

diff --git a/.../avd/molecule/eos_designs_unit_tests/inventory/group_vars/CUSTOM_PYTHON_MODULES_TESTS.yml b/.../avd/molecule/eos_designs_unit_tests/inventory/group_vars/CUSTOM_PYTHON_MODULES_TESTS.yml
@@ -2,9 +2,9 @@
 
 mgmt_gateway: 192.168.200.1
 
-node_type_keys:
-  - key: spine
-    type: spine
+custom_node_type_keys:
+  - key: custom_spine
+    type: custom_spine
     default_evpn_role: server
     interface_descriptions:
       # Override default interface description with a custom python module