Refactor(eos_designs): Move custom_structured_configuration to python (…

…#2268) Co-authored-by: Carl Buchmann <[email protected]>
aristanetworks · Nov 16, 2022 · 76e4ecc · 76e4ecc
1 parent 1db8184
commit 76e4ecc
Show file tree

Hide file tree

Showing 67 changed files with 155 additions and 536 deletions.
diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml
@@ -191,9 +191,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
       rd_evpn_domain:
         domain: remote
         rd: 172.16.110.5:99110
@@ -216,9 +213,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
       rd_evpn_domain:
         domain: remote
         rd: 172.16.110.5:50111
@@ -241,9 +235,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
       rd_evpn_domain:
         domain: remote
         rd: 172.16.110.5:20112
@@ -280,9 +271,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
       rd_evpn_domain:
         domain: remote
         rd: 172.16.110.5:32600
@@ -392,8 +380,6 @@ vlan_interfaces:
     - opzone
     description: set from structured_config on svi (was Tenant_A_OP_Zone_1)
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi (was Tenant_A_OP_Zone_1)
     ip_address_virtual: 10.1.10.1/24
     vrf: Common_VRF
   Vlan111:
@@ -498,8 +484,6 @@ port_channel_interfaces:
     vlans: 110
     mlag: 17
     service_profile: foo
-    struct_cfg:
-      description: Set using structured_config on server adapter port-channel
   Port-Channel18:
     description: server-1_PortChannel
     type: switched
@@ -670,8 +654,6 @@ ethernet_interfaces:
       EOF
 
       '
-    struct_cfg:
-      description: Set using structured_config on server adapter
   Ethernet18:
     peer: server-1
     peer_interface: Eth6
@@ -804,9 +786,6 @@ router_bfd:
 ip_igmp_snooping:
   globally_enabled: true
 ip_virtual_router_mac_address: 00:1c:73:00:dc:01
-struct_cfg:
-  domain_list:
-  - structured-config.set.under.vrf.common-vrf
 vxlan_interface:
   Vxlan1:
     description: DC1-POD1-LEAF2B_VTEP

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml
@@ -137,9 +137,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     111:
       tenant: Tenant_A
       rd: 172.16.120.3:50111
@@ -156,9 +153,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     112:
       tenant: Tenant_A
       rd: 172.16.120.3:20112
@@ -175,9 +169,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     2500:
       tenant: Tenant_A
       rd: 172.16.120.3:2500
@@ -202,9 +193,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
 static_routes:
 - vrf: MGMT
   destination_address_prefix: 0.0.0.0/0
@@ -376,8 +364,6 @@ vlan_interfaces:
     - opzone
     description: set from structured_config on svi (was Tenant_A_OP_Zone_1)
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi (was Tenant_A_OP_Zone_1)
     ip_address_virtual: 10.1.10.1/24
     vrf: Common_VRF
   Vlan111:
@@ -438,9 +424,6 @@ vlan_interfaces:
     shutdown: false
     ip_address_virtual: 10.101.100.1/24
     vrf: vrf_with_loopbacks_from_pod_pools
-struct_cfg:
-  domain_list:
-  - structured-config.set.under.vrf.common-vrf
 vxlan_interface:
   Vxlan1:
     description: DC1-POD2-LEAF1A_VTEP

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml
@@ -186,9 +186,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     111:
       tenant: Tenant_A
       rd: 172.16.110.4:50111
@@ -205,9 +202,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     112:
       tenant: Tenant_A
       rd: 172.16.110.4:20112
@@ -224,9 +218,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
     2500:
       tenant: Tenant_A
       rd: 172.16.110.4:2500
@@ -251,9 +242,6 @@ router_bgp:
         EOF
 
         '
-      struct_cfg:
-        redistribute_routes:
-        - router-mac system
 static_routes:
 - vrf: MGMT
   destination_address_prefix: 0.0.0.0/0
@@ -300,10 +288,6 @@ management_api_http:
 eos_cli: "interface Loopback1002\n  description Loopback created from raw_eos_cli under l3leaf node-group RACK2_MLAG\n\ninterface Loopback1111\n
   \ description Loopback created from raw_eos_cli under platform_settings vEOS-LAB\n\ninterface Loopback1000\n  description Loopback
   created from raw_eos_cli under VRF Common_VRF\n"
-struct_cfg:
-  domain_list:
-  - structured-config.set.on.node
-  - structured-config.set.under.vrf.common-vrf
 vlans:
   4094:
     tenant: system
@@ -356,8 +340,6 @@ vlan_interfaces:
     - opzone
     description: set from structured_config on svi for DC1.POD1.LEAF2A (was Tenant_A_OP_Zone_1)
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi for DC1.POD1.LEAF2A (was Tenant_A_OP_Zone_1)
     ip_address_virtual: 10.1.10.1/24
     vrf: Common_VRF
   Vlan111:
@@ -462,8 +444,6 @@ port_channel_interfaces:
     vlans: 110
     mlag: 17
     service_profile: foo
-    struct_cfg:
-      description: Set using structured_config on server adapter port-channel
   Port-Channel18:
     description: server-1_PortChannel
     type: switched
@@ -632,8 +612,6 @@ ethernet_interfaces:
       EOF
 
       '
-    struct_cfg:
-      description: Set using structured_config on server adapter
   Ethernet18:
     peer: server-1
     peer_interface: Eth5

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml
@@ -297,9 +297,6 @@ router_bfd:
 ip_igmp_snooping:
   globally_enabled: true
 ip_virtual_router_mac_address: 00:1c:73:00:dc:01
-struct_cfg:
-  domain_list:
-  - structured-config.set.under.vrf.common-vrf
 vxlan_interface:
   Vxlan1:
     description: DC2-POD1-LEAF1A_VTEP

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
@@ -366,14 +366,6 @@ management_api_http:
     MGMT: {}
   enable_https: true
   default_services: false
-struct_cfg:
-  sflow:
-    vrfs:
-      OOB:
-        destinations:
-          192.168.200.10: null
-          10.0.200.90: null
-        source_interface: '{{ switch.mgmt_interface }}'
 ethernet_interfaces:
   Ethernet1:
     peer: DC1-SPINE1

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
@@ -351,14 +351,6 @@ management_api_http:
     MGMT: {}
   enable_https: true
   default_services: false
-struct_cfg:
-  sflow:
-    vrfs:
-      OOB:
-        destinations:
-          192.168.200.10: null
-          10.0.200.90: null
-        source_interface: '{{ switch.mgmt_interface }}'
 ethernet_interfaces:
   Ethernet1:
     peer: DC1-SPINE1

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml
@@ -294,48 +294,36 @@ vlan_interfaces:
     tenant: svi_profile_tests
     description: set from structured_config on svi.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.10.1/24
     vrf: svi_profile_tests_vrf
   Vlan111:
     tenant: svi_profile_tests
     description: set from structured_config on svi_profile.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_profile.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.11.1/24
     vrf: svi_profile_tests_vrf
   Vlan112:
     tenant: svi_profile_tests
     description: set from structured_config on svi_parent_profile.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_parent_profile.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.12.1/24
     vrf: svi_profile_tests_vrf
   Vlan113:
     tenant: svi_profile_tests
     description: set from svi.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from svi.structured_config
     ip_address_virtual: 10.1.13.1/24
     vrf: svi_profile_tests_vrf
   Vlan114:
     tenant: svi_profile_tests
     description: set from structured_config on svi_profile.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_profile.structured_config
     ip_address_virtual: 10.1.14.1/24
     vrf: svi_profile_tests_vrf
   Vlan115:
     tenant: svi_profile_tests
     description: set from structured_config on svi_parent_profile.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_parent_profile.structured_config
     ip_address_virtual: 10.1.15.1/24
     vrf: svi_profile_tests_vrf
   Vlan210:

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml
@@ -182,48 +182,36 @@ vlan_interfaces:
     tenant: svi_profile_tests
     description: set from structured_config on svi.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.10.1/24
     vrf: svi_profile_tests_vrf
   Vlan111:
     tenant: svi_profile_tests
     description: set from structured_config on svi_profile.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_profile.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.11.1/24
     vrf: svi_profile_tests_vrf
   Vlan112:
     tenant: svi_profile_tests
     description: set from structured_config on svi_parent_profile.nodes[inventory_hostname].structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_parent_profile.nodes[inventory_hostname].structured_config
     ip_address_virtual: 10.1.12.1/24
     vrf: svi_profile_tests_vrf
   Vlan113:
     tenant: svi_profile_tests
     description: set from svi.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from svi.structured_config
     ip_address_virtual: 10.1.13.1/24
     vrf: svi_profile_tests_vrf
   Vlan114:
     tenant: svi_profile_tests
     description: set from structured_config on svi_profile.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_profile.structured_config
     ip_address_virtual: 10.1.14.1/24
     vrf: svi_profile_tests_vrf
   Vlan115:
     tenant: svi_profile_tests
     description: set from structured_config on svi_parent_profile.structured_config
     shutdown: false
-    struct_cfg:
-      description: set from structured_config on svi_parent_profile.structured_config
     ip_address_virtual: 10.1.15.1/24
     vrf: svi_profile_tests_vrf
   Vlan210:

diff --git a/...designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml b/...designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml
@@ -52,13 +52,6 @@ port_channel_interfaces:
     mode: trunk
     trunk_groups:
     - MLAG
-    struct_cfg:
-      storm_control:
-        broadcast:
-          level: 25
-        unknown_unicast:
-          level: 25
-      native_vlan_tag: true
     storm_control:
       broadcast:
         level: 25
@@ -72,13 +65,6 @@ port_channel_interfaces:
     vlans: none
     mode: trunk
     mlag: 1
-    struct_cfg:
-      storm_control:
-        broadcast:
-          level: 25
-        unknown_unicast:
-          level: 25
-      native_vlan_tag: true
     storm_control:
       broadcast:
         level: 25