diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/cvp_instance_ip.cfg b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/cvp_instance_ip.cfg deleted file mode 100644 index e00c55c068c..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/cvp_instance_ip.cfg +++ /dev/null @@ -1,28 +0,0 @@ -!RANCID-CONTENT-TYPE: arista -! -daemon TerminAttr - exec /usr/bin/TerminAttr -cvaddr=192.168.200.12:9910,192.168.200.13:9910,192.168.200.11:9910 -cvauth=token,/tmp/token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs - no shutdown -! -vlan internal order ascending range 1006 1199 -! -transceiver qsfp default-mode 4x10G -! -service routing protocols model multi-agent -! -hostname cvp_instance_ip -! -no enable password -no aaa root -! -vrf instance MGMT -no ip routing vrf MGMT -! -management api http-commands - protocol https - no shutdown - ! - vrf MGMT - no shutdown -! -end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/port-channel-short-esi.cfg b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg similarity index 81% rename from ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/port-channel-short-esi.cfg rename to ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg index 6b347c290fc..0978239333c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/port-channel-short-esi.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg @@ -1,28 +1,34 @@ !RANCID-CONTENT-TYPE: arista ! +daemon TerminAttr + exec /usr/bin/TerminAttr -cvaddr=192.168.200.12:9910,192.168.200.13:9910,192.168.200.11:9910 -cvauth=token,/tmp/token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs + no shutdown +! vlan internal order ascending range 1006 1199 ! transceiver qsfp default-mode 4x10G ! service routing protocols model multi-agent ! -hostname port-channel-short-esi +hostname host1 ! no enable password no aaa root ! vrf instance MGMT ! -interface Port-Channel10 +interface Port-Channel12 description server01_ESI_PortChanne1 no shutdown switchport + switchport trunk allowed vlan 110-111,210-211 + switchport mode trunk evpn ethernet-segment identifier 0000:0000:0303:0202:0101 route-target import 03:03:02:02:01:01 lacp system-id 0303.0202.0101 ! -interface Port-Channel12 +interface Port-Channel13 description server01_ESI_PortChanne1 no shutdown mtu 1601 @@ -33,15 +39,20 @@ interface Port-Channel12 lacp system-id 0303.0202.0102 ! interface Ethernet10 - description server01_ESI_Eth1 + description ROUTER01_Eth1 no shutdown - channel-group 10 mode active + switchport ! interface Ethernet12 - description server01_ESI_Eth6 + description server01_ESI_Eth1 no shutdown channel-group 12 mode active ! +interface Ethernet13 + description server01_ESI_Eth6 + no shutdown + channel-group 13 mode active +! interface Loopback0 description EVPN_Overlay_Peering no shutdown @@ -53,7 +64,7 @@ interface Loopback1 ip address 192.168.254.101/32 ! interface Vxlan1 - description port-channel-short-esi_VTEP + description host1_VTEP vxlan source-interface Loopback1 vxlan udp-port 4789 ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host2.cfg new file mode 100644 index 00000000000..b5d1bdc1d3c --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host2.cfg @@ -0,0 +1,79 @@ +!RANCID-CONTENT-TYPE: arista +! +vlan internal order ascending range 1006 1199 +! +transceiver qsfp default-mode 4x10G +! +service routing protocols model multi-agent +! +hostname host2 +! +no enable password +no aaa root +! +vlan 111 + name Tenant_A_OP_Zone_2 +! +vlan 160 + name Tenant_A_VMOTION +! +vrf instance MGMT +! +vrf instance TENANT_B_WAN +! +interface Loopback0 + description MPLS_Overlay_peering + no shutdown + ip address 10.42.0.102/32 +! +interface Vlan111 + description Tenant_A_OP_Zone_2 + no shutdown + vrf TENANT_B_WAN + ip helper-address 1.1.1.1 vrf MGMT source-interface lo100 +! +ip routing +no ip routing vrf MGMT +ip routing vrf TENANT_B_WAN +! +ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY + seq 10 permit 10.42.0.0/24 eq 32 +! +route-map RM-CONN-2-BGP permit 10 + match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY +! +router bfd + multihop interval 300 min-rx 300 multiplier 3 +! +router bgp 102 + router-id 10.42.0.102 + maximum-paths 4 ecmp 4 + update wait-install + no bgp default ipv4-unicast + neighbor IPv4-UNDERLAY-PEERS peer group + neighbor IPv4-UNDERLAY-PEERS send-community + neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 + neighbor MPLS-OVERLAY-PEERS peer group + neighbor MPLS-OVERLAY-PEERS remote-as 102 + neighbor MPLS-OVERLAY-PEERS update-source Loopback0 + neighbor MPLS-OVERLAY-PEERS bfd + neighbor MPLS-OVERLAY-PEERS send-community + neighbor MPLS-OVERLAY-PEERS maximum-routes 0 + redistribute connected route-map RM-CONN-2-BGP + ! + address-family evpn + neighbor default encapsulation mpls + neighbor MPLS-OVERLAY-PEERS activate + ! + address-family ipv4 + neighbor IPv4-UNDERLAY-PEERS activate + no neighbor MPLS-OVERLAY-PEERS activate +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/cvp_instance_ip.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/cvp_instance_ip.yml deleted file mode 100644 index 750dc03739f..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/cvp_instance_ip.yml +++ /dev/null @@ -1,28 +0,0 @@ -hostname: cvp_instance_ip -service_routing_protocols_model: multi-agent -daemon_terminattr: - cvaddrs: - - 192.168.200.12:9910 - - 192.168.200.13:9910 - - 192.168.200.11:9910 - cvauth: - method: token - token_file: /tmp/token - cvvrf: MGMT - smashexcludes: ale,flexCounter,hardware,kni,pulse,strata - ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent - disable_aaa: false -vlan_internal_order: - allocation: ascending - range: - beginning: 1006 - ending: 1199 -vrfs: -- name: MGMT - ip_routing: false -management_api_http: - enable_vrfs: - - name: MGMT - enable_https: true -ip_igmp_snooping: - globally_enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/port-channel-short-esi.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml similarity index 82% rename from ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/port-channel-short-esi.yml rename to ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml index ec1d4a9804c..f270c054927 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/port-channel-short-esi.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml @@ -1,4 +1,4 @@ -hostname: port-channel-short-esi +hostname: host1 router_bgp: as: '101' router_id: 192.168.255.101 @@ -37,6 +37,18 @@ router_bgp: activate: true service_routing_protocols_model: multi-agent ip_routing: true +daemon_terminattr: + cvaddrs: + - 192.168.200.12:9910 + - 192.168.200.13:9910 + - 192.168.200.11:9910 + cvauth: + method: token + token_file: /tmp/token + cvvrf: MGMT + smashexcludes: ale,flexCounter,hardware,kni,pulse,strata + ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent + disable_aaa: false vlan_internal_order: allocation: ascending range: @@ -81,12 +93,12 @@ ip_igmp_snooping: globally_enabled: true vxlan_interface: Vxlan1: - description: port-channel-short-esi_VTEP + description: host1_VTEP vxlan: udp_port: 4789 source_interface: Loopback1 ethernet_interfaces: -- name: Ethernet10 +- name: Ethernet12 peer: server01_ESI peer_interface: Eth1 peer_type: server @@ -95,9 +107,9 @@ ethernet_interfaces: shutdown: false type: port-channel-member channel_group: - id: 10 + id: 12 mode: active -- name: Ethernet12 +- name: Ethernet13 peer: server01_ESI peer_interface: Eth6 peer_type: server @@ -105,18 +117,28 @@ ethernet_interfaces: shutdown: false type: port-channel-member channel_group: - id: 12 + id: 13 mode: active +- name: Ethernet10 + peer: ROUTER01 + peer_interface: Eth1 + peer_type: router + port_profile: Tenant_X_LT + description: ROUTER01_Eth1 + shutdown: false + type: switched port_channel_interfaces: -- name: Port-Channel10 +- name: Port-Channel12 description: server01_ESI_PortChanne1 type: switched shutdown: false + mode: trunk + vlans: 110-111,210-211 evpn_ethernet_segment: identifier: 0000:0000:0303:0202:0101 route_target: 03:03:02:02:01:01 lacp_id: 0303.0202.0101 -- name: Port-Channel12 +- name: Port-Channel13 description: server01_ESI_PortChanne1 type: switched shutdown: false diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host2.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host2.yml new file mode 100644 index 00000000000..ff37f767a26 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host2.yml @@ -0,0 +1,99 @@ +hostname: host2 +router_bgp: + as: '102' + router_id: 10.42.0.102 + bgp: + default: + ipv4_unicast: false + maximum_paths: + paths: 4 + ecmp: 4 + updates: + wait_install: true + peer_groups: + - name: IPv4-UNDERLAY-PEERS + type: ipv4 + maximum_routes: 12000 + send_community: all + - name: MPLS-OVERLAY-PEERS + type: mpls + update_source: Loopback0 + bfd: true + send_community: all + maximum_routes: 0 + remote_as: '102' + address_family_ipv4: + peer_groups: + - name: IPv4-UNDERLAY-PEERS + activate: true + - name: MPLS-OVERLAY-PEERS + activate: false + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP + address_family_evpn: + neighbor_default: + encapsulation: mpls + peer_groups: + - name: MPLS-OVERLAY-PEERS + activate: true +service_routing_protocols_model: multi-agent +ip_routing: true +vlan_internal_order: + allocation: ascending + range: + beginning: 1006 + ending: 1199 +vrfs: +- name: MGMT + ip_routing: false +- name: TENANT_B_WAN + tenant: TENANT_B + ip_routing: true +management_api_http: + enable_vrfs: + - name: MGMT + enable_https: true +loopback_interfaces: +- name: Loopback0 + description: MPLS_Overlay_peering + shutdown: false + ip_address: 10.42.0.102/32 +prefix_lists: +- name: PL-LOOPBACKS-EVPN-OVERLAY + sequence_numbers: + - sequence: 10 + action: permit 10.42.0.0/24 eq 32 +route_maps: +- name: RM-CONN-2-BGP + sequence_numbers: + - sequence: 10 + type: permit + match: + - ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY +router_bfd: + multihop: + interval: 300 + min_rx: 300 + multiplier: 3 +vlans: +- id: 111 + name: Tenant_A_OP_Zone_2 + tenant: TENANT_B +- id: 160 + name: Tenant_A_VMOTION + tenant: TENANT_B +ip_igmp_snooping: + globally_enabled: true +vlan_interfaces: +- name: Vlan111 + tenant: TENANT_B + tags: + - opzone + description: Tenant_A_OP_Zone_2 + shutdown: false + vrf: TENANT_B_WAN + ip_helpers: + - ip_helper: 1.1.1.1 + source_interface: lo100 + vrf: MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/EOS_DESIGNS_DEPRECATED_VARS.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/EOS_DESIGNS_DEPRECATED_VARS.yml deleted file mode 100644 index 7d630b054d7..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/EOS_DESIGNS_DEPRECATED_VARS.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# This must be the same value for all devices in the molecule scenario. -fabric_name: EOS_DESIGNS_DEPRECATED_VARS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/all.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/all.yml index 259093e253f..d95304e473f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/all.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/group_vars/all.yml @@ -4,3 +4,5 @@ is_for_test: true avd_data_validation_mode: "error" avd_data_conversion_mode: "info" + +fabric_name: EOS_DESIGNS_DEPRECATED_VARS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected_endpoints_keys.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected_endpoints_keys.yml new file mode 100644 index 00000000000..e500814e69d --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected_endpoints_keys.yml @@ -0,0 +1,13 @@ +# Testing "connected_endpoints_keys" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +connected_endpoints_keys: + servers: + type: server + firewalls: + type: firewall + routers: + type: router + load_balancers: + type: load_balancer + storage_arrays: + type: storage_array diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/cvp_instance_ip.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/cvp_instance_ip.yml similarity index 100% rename from ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/cvp_instance_ip.yml rename to ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/cvp_instance_ip.yml diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/l3_edge_p2p_links.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/l3_edge_p2p_links.yml new file mode 100644 index 00000000000..68c6cea9232 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/l3_edge_p2p_links.yml @@ -0,0 +1,13 @@ +# Testing "l3_edge.p2p_links_ip_pools" and "l3_edge.p2p_links_profiles" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +l3_edge: + p2p_links_ip_pools: + pool-leaf: 11.1.0.0/24 + pool-spine: 11.1.1.0/24 + pool-super-spine: 11.1.2.0/24 + p2p_links_profiles: + generic-profile: + mtu: 1499 + bfd: false + ptp: + enabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/node_type.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/node_type.yml new file mode 100644 index 00000000000..d00c33f1aee --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/node_type.yml @@ -0,0 +1,24 @@ +type: l3leaf +l3leaf: + defaults: + loopback_ipv4_pool: 192.168.255.0/24 + vtep_loopback_ipv4_pool: 192.168.254.0/24 + id: 101 + bgp_as: 101 + # Testing "nodes" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + nodes: + host1: + id: 101 + bgp_as: 101 + # Testing "node_groups" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + node_groups: + sflow-tests-leaf-mlag: + bgp_as: 65105 + # Testing "nodes" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + nodes: + host1: + id: 5 + mgmt_ip: 192.168.0.103/24 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/platform_speed_groups.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/platform_speed_groups.yml new file mode 100644 index 00000000000..68c939cb7da --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/platform_speed_groups.yml @@ -0,0 +1,6 @@ +# Testing "platform_speed_groups" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +platform_speed_groups: + 7280R: + 25G: [ 3, 2 ] + 10G: [ 1, 2, 4 ] diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/port-channel-short-esi.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml similarity index 50% rename from ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/port-channel-short-esi.yml rename to ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml index 0a7366987f4..5fcca3aea6e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/port-channel-short-esi.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml @@ -1,31 +1,25 @@ -type: l3leaf -l3leaf: - defaults: - loopback_ipv4_pool: 192.168.255.0/24 - vtep_loopback_ipv4_pool: 192.168.254.0/24 - nodes: - - name: port-channel-short-esi - id: 101 - bgp_as: 101 - servers: - name: server01_ESI rack: RackC adapters: - endpoint_ports: [ Eth1, Eth2] - switch_ports: [ Ethernet10, Ethernet10] - switches: [ port-channel-short-esi, Leaf1] + switch_ports: [ Ethernet12, Ethernet12] + switches: [ host1, Leaf1] profile: TENANT_A_B + # Testing "port_channel" with "short_esi" + # "port_channel.short_esi" is deprecated in 4.0.0. To be removed in 5.0.0 port_channel: description: PortChanne1 mode: active short_esi: '0303:0202:0101' - endpoint_ports: [ Eth6, Eth7 ] - switch_ports: [ Ethernet12, Ethernet12 ] - switches: [ port-channel-short-esi, DC1-LEAF2B ] + switch_ports: [ Ethernet13, Ethernet13 ] + switches: [ host1, DC1-LEAF2B ] mtu: 1601 ethernet_segment: short_esi: '0303:0202:0102' + # Testing "port_channel" with "short_esi" when "ethernet_segment.short_esi" is defined + # "port_channel.short_esi" is deprecated in 4.0.0. To be removed in 5.0.0 port_channel: description: PortChanne1 mode: active diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port_profiles.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port_profiles.yml new file mode 100644 index 00000000000..2c225d9075d --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port_profiles.yml @@ -0,0 +1,6 @@ +# Testing "port_profiles" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +port_profiles: + TENANT_A_B: + mode: trunk + vlans: "110-111,210-211" diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/routers.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/routers.yml new file mode 100644 index 00000000000..e8e82244c13 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/routers.yml @@ -0,0 +1,10 @@ +# Testing "routers" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +routers: + ROUTER01: + rack: RackB + adapters: + - endpoint_ports: [ Eth1 ] + switch_ports: [ Ethernet10 ] + switches: [ host1 ] + profile: Tenant_X_LT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/svi_profiles.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/svi_profiles.yml new file mode 100644 index 00000000000..eacbc233c38 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/svi_profiles.yml @@ -0,0 +1,31 @@ +# Testing "svi_profiles" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +svi_profiles: + GENERIC: + mtu: 1560 + enabled: true + GENERIC_FULL: + name: GENERIC Name + mtu: 1560 + enabled: false + ip_address_virtual: 10.1.10.254/24 + TEST_SVI_NODE_INHERIT: + name: Test the SVI and node config inheritance + mtu: 1560 + enabled: false + ip_address_virtual: 10.4.13.254/24 + ipv6_address_virtual: 2001:db8:413::1/64 + # Testing "ip_helpers" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + ip_helpers: + 1.1.1.1: + source_interface: lo101 + source_vrf: TEST + # Testing "nodes" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + nodes: + evpn_services_l2_only_false: + ip_address: 12.4.13.2/24 + ipv6_address: 2012:db9:413::2/64 + ip_virtual_router_addresses: [ "12.4.13.1" ] + ipv6_virtual_router_addresses: [ "2012:db9:413::1" ] diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type.yml new file mode 100644 index 00000000000..e73a284aab6 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type.yml @@ -0,0 +1,15 @@ +# Testing "pe.nodes" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 +type: pe +design: + type: mpls + +pe: + defaults: + loopback_ipv4_pool: 10.42.0.0/24 + bgp_as: 42 + id: 42 + nodes: + host2: + id: 102 + bgp_as: 102 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type_keys.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type_keys.yml new file mode 100644 index 00000000000..680ff315574 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type_keys.yml @@ -0,0 +1,16 @@ +# Testing "node_type_keys" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + +node_type_keys: + pe: + type: pe + mpls_lsr: true + default_mpls_overlay_role: client + default_evpn_role: client + network_services: + l1: true + l2: true + l3: true + default_overlay_routing_protocol: ibgp + default_overlay_address_families: [ evpn ] + default_evpn_encapsulation: mpls diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/tenants.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/tenants.yml new file mode 100644 index 00000000000..b0aa482a5a0 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/tenants.yml @@ -0,0 +1,57 @@ +# Testing "tenants" as dict of dict +# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + +tenants: + TENANT_B: + bgp_peer_groups: + Tenant_C_BGP_PEER_GROUP: + remote_as: 666 + description: "Tenant C peer group" + send_community: all + next_hop_self: true + maximum_routes: 1000 + # Testing "l2vlans" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + l2vlans: + '160': + name: Tenant_A_VMOTION + tags: ['opzone'] + # Testing "vrfs" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + vrfs: + TENANT_B_WAN: + vrf_id: 20 + # Testing "svis" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + svis: + 111: + vni_override: 50111 + name: Tenant_A_OP_Zone_2 + tags: ['opzone'] + enabled: True + # Testing "ip_helpers" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + ip_helpers: + 1.1.1.1: + source_interface: lo100 + source_vrf: MGMT + # Testing "nodes" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + nodes: + DC1-LEAF2A: + ip_address: 10.3.11.2/24 + ipv6_address: 2001:db8:311::2/64 + # Testing "bgp_peers" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + bgp_peers: + 1.1.1.1: + peer_group: Tenant_C_WAN_Zone_BGP_PEER_GROUP + description: test_description + nodes: [ DC1-BL2B ] + set_ipv4_next_hop: 1.1.1.1 + # Testing "ip_helpers" as dict of dict + # Dict type is deprecated in 4.0.0. To be removed in 5.0.0 + ip_helpers: + 1.1.1.1: + source_interface: lo100 + source_vrf: MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/hosts.yml index 437c641d525..6f894ed98ac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/hosts.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/hosts.yml @@ -3,5 +3,5 @@ all: children: EOS_DESIGNS_DEPRECATED_VARS: hosts: - port-channel-short-esi: - cvp_instance_ip: + host1: + host2: