From dd60792165ae40b66bd6bb022df5ac2f0f832d73 Mon Sep 17 00:00:00 2001 From: Shivani-chourasiya Date: Wed, 16 Aug 2023 16:00:57 +0530 Subject: [PATCH] Some fixes --- .../intended/configs/host1.cfg | 15 +++++++++++++++ .../intended/configs/host2.cfg | 8 ++++---- .../intended/structured_configs/host1.yml | 19 +++++++++++++++++++ .../intended/structured_configs/host2.yml | 8 ++++---- .../host1/port-channel-short-esi.yml | 4 ++-- ...ted_endpoints_keys_key.yml => routers.yml} | 0 .../inventory/host_vars/host2/node_type.yml | 15 +++++++++++++++ .../host_vars/host2/node_type_keys.yml | 9 --------- 8 files changed, 59 insertions(+), 19 deletions(-) rename ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/{connected_endpoints_keys_key.yml => routers.yml} (100%) create mode 100644 ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host2/node_type.yml diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg index e8c97c31b3c..0978239333c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg @@ -28,6 +28,16 @@ interface Port-Channel12 route-target import 03:03:02:02:01:01 lacp system-id 0303.0202.0101 ! +interface Port-Channel13 + description server01_ESI_PortChanne1 + no shutdown + mtu 1601 + switchport + evpn ethernet-segment + identifier 0000:0000:0303:0202:0102 + route-target import 03:03:02:02:01:02 + lacp system-id 0303.0202.0102 +! interface Ethernet10 description ROUTER01_Eth1 no shutdown @@ -38,6 +48,11 @@ interface Ethernet12 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 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 index 085ea762efb..b5d1bdc1d3c 100644 --- 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 @@ -24,7 +24,7 @@ vrf instance TENANT_B_WAN interface Loopback0 description MPLS_Overlay_peering no shutdown - ip address 10.42.0.42/32 + ip address 10.42.0.102/32 ! interface Vlan111 description Tenant_A_OP_Zone_2 @@ -45,8 +45,8 @@ route-map RM-CONN-2-BGP permit 10 router bfd multihop interval 300 min-rx 300 multiplier 3 ! -router bgp 42 - router-id 10.42.0.42 +router bgp 102 + router-id 10.42.0.102 maximum-paths 4 ecmp 4 update wait-install no bgp default ipv4-unicast @@ -54,7 +54,7 @@ router bgp 42 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 42 + 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 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml index 2f95843138e..f270c054927 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml @@ -109,6 +109,16 @@ ethernet_interfaces: channel_group: id: 12 mode: active +- name: Ethernet13 + peer: server01_ESI + peer_interface: Eth6 + peer_type: server + description: server01_ESI_Eth6 + shutdown: false + type: port-channel-member + channel_group: + id: 13 + mode: active - name: Ethernet10 peer: ROUTER01 peer_interface: Eth1 @@ -128,3 +138,12 @@ port_channel_interfaces: identifier: 0000:0000:0303:0202:0101 route_target: 03:03:02:02:01:01 lacp_id: 0303.0202.0101 +- name: Port-Channel13 + description: server01_ESI_PortChanne1 + type: switched + shutdown: false + mtu: 1601 + evpn_ethernet_segment: + identifier: 0000:0000:0303:0202:0102 + route_target: 03:03:02:02:01:02 + lacp_id: 0303.0202.0102 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 index 1e4347032c6..ff37f767a26 100644 --- 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 @@ -1,7 +1,7 @@ hostname: host2 router_bgp: - as: '42' - router_id: 10.42.0.42 + as: '102' + router_id: 10.42.0.102 bgp: default: ipv4_unicast: false @@ -21,7 +21,7 @@ router_bgp: bfd: true send_community: all maximum_routes: 0 - remote_as: '42' + remote_as: '102' address_family_ipv4: peer_groups: - name: IPv4-UNDERLAY-PEERS @@ -58,7 +58,7 @@ loopback_interfaces: - name: Loopback0 description: MPLS_Overlay_peering shutdown: false - ip_address: 10.42.0.42/32 + ip_address: 10.42.0.102/32 prefix_lists: - name: PL-LOOPBACKS-EVPN-OVERLAY sequence_numbers: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml index 8c4c49b488f..5fcca3aea6e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/port-channel-short-esi.yml @@ -13,8 +13,8 @@ servers: 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' diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected_endpoints_keys_key.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/routers.yml similarity index 100% rename from ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected_endpoints_keys_key.yml rename to ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/routers.yml 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 index e5887fe7030..680ff315574 100644 --- 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 @@ -1,14 +1,5 @@ # Testing "node_type_keys" 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 node_type_keys: pe: