diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml index 4bd9f42735b..f2c99769639 100644 --- a/.github/workflows/pull-request-management.yml +++ b/.github/workflows/pull-request-management.yml @@ -458,7 +458,7 @@ jobs: # The version conflicts with our requirements, # so we let the galaxy-importer version resolve remaining requirements. run: | - pip install "galaxy-importer==0.4.22" + pip install "galaxy-importer==0.4.25" - name: 'Build ansible package' run: make collection-build - name: 'Run galaxy-importer checks' diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md index 0137517c629..ef8fbb408f9 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -391,6 +391,40 @@ The description can be reverted manually if needed: +vtep_loopback_description: "VTEP_VXLAN_Tunnel_Source" ``` +#### Underlay point-to-point L3 ethernet interfaces + +The interface description for the L3 point-to-point interfaces changes to `P2P___VRF_`. Previously the description was `P2P_LINK_TO___vrf_`. The VRF suffix is only added when using `uplink_type: p2p-vrfs`. + +The interfaces using this are routed uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`. + +Setting the description directly on `p2p_links` defined under `l3_edge` or `core_interfaces` still takes precedence. + +The default descriptions can be reverted manually if needed: + +```diff ++default_underlay_p2p_ethernet_description: "P2P_LINK_TO_{peer!u}_{peer_interface}{vrf?<_vrf_}" +``` + +The description fields support templates. See the input variables documentation for available fields. + +#### Underlay point-to-point L3 port-channel interfaces + +The interface description for the L3 point-to-point port-channels changes to `P2P__`. Previously the default description was `P2P_LINK_TO__`. + +The port-channels using this are `p2p_links` defined under `l3_edge` or `core_interfaces`. + +Setting the description directly on `p2p_links` defined under `l3_edge` or `core_interfaces` still takes precedence. + +In AVD 5.0.0 it is also possible to control the port-channel description separately by setting the `description` key under `port_channel`. It will replace the full port-channel interface description. + +The default descriptions can be reverted manually if needed: + +```diff ++default_underlay_p2p_port_channel_description: "P2P_LINK_TO_{peer}_{peer_interface}" +``` + +The description fields support templates. See the input variables documentation for available fields. + #### Out-of-band management interface The default interface description for the management interface changes to `OOB_MANAGEMENT`. @@ -502,6 +536,106 @@ The description can be reverted manually if needed: +mlag_port_channel_description: "MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}" ``` +#### MLAG peer VLAN interface + +The interface description for the MLAG peer SVI changes to `MLAG`. Previously the description was `MLAG_PEER`. + +The description can be reverted manually if needed: + +```diff ++mlag_peer_svi_description: "MLAG_PEER" +``` + +The description setting supports a template. See the input variables documentation for available fields. + +#### MLAG L3 peering VLAN interface + +The interface description for the MLAG L3 peering SVI changes to `MLAG_L3`. Previously the description was `MLAG_PEER_L3_PEERING`. + +The description can be reverted manually if needed: + +```diff ++mlag_peer_l3_svi_description: "MLAG_PEER_L3_PEERING" +``` + +The description setting supports a template. See the input variables documentation for available fields. + +#### MLAG L3 VRF peering VLAN interface + +The interface description for the MLAG L3 VRF peering SVI changes to `MLAG_L3_VRF_{vrf}`. Previously the description was `MLAG_PEER_L3_iBGP: vrf {vrf}`. + +The description can be reverted manually if needed: + +```diff ++mlag_peer_l3_vrf_svi_description: "MLAG_PEER_L3_iBGP: vrf {vrf}" +``` + +The description setting supports a template. See the input variables documentation for available fields. + +### Default VLAN names are changed for more consistency + +#### MLAG peer VLAN + +The name of the MLAG peer VLAN (VLAN 4094 by default) changes to `MLAG`. Previously the name was `MLAG_PEER`. + +The name can be reverted manually if needed: + +```diff ++mlag_peer_vlan_name: "MLAG_PEER" +``` + +The setting supports a template. See the input variables documentation for available fields. + +#### MLAG L3 peering VLAN + +The name of the MLAG L3 peering VLAN (VLAN 4093 by default) changes to `MLAG_L3`. Previously the name was `LEAF_PEER_L3`. + +The name can be reverted manually if needed: + +```diff ++mlag_peer_l3_vlan_name: "LEAF_PEER_L3" +``` + +The setting supports a template. See the input variables documentation for available fields. + +#### MLAG L3 VRF peering VLAN + +The name of the MLAG L3 VRF peering VLAN changes to `MLAG_L3_VRF_{vrf}`. Previously the name was `MLAG_iBGP_{vrf}`. + +The name can be reverted manually if needed: + +```diff ++mlag_peer_l3_vrf_vlan_name: "MLAG_iBGP_{vrf}" +``` + +The setting supports a template. See the input variables documentation for available fields. + +### Default BGP peer descriptions are changed for more consistency + +#### MLAG L3 peering + +The description of the MLAG L3 BGP peers, including those in VRFs, changes to `{mlag_peer}_{peer_interface}`. Previously the description was `{mlag_peer}`. + +The description can be reverted manually if needed: + +```diff ++mlag_bgp_peer_description: "{mlag_peer}" +``` + +The setting supports a template. See the input variables documentation for available fields. + +#### Overlay peerings + +The description of the overlay BGP peers (EVPN, MPLS, WAN) changes to `{peer}{peer_interface?<_}`. Previously the description was `{peer}`. + +The description can be reverted manually if needed: + +```diff ++overlay_bgp_peer_description: "{peer}" +``` + +The setting supports a template. See the input variables documentation for available fields. + ### Combine the VLAN trunk groups used for MLAG With AVD version 5.0.0 a single `MLAG` trunk group is used for MLAG and MLAG L3 peerings, including the peerings in VRFs. @@ -713,6 +847,44 @@ custom_platform_settings: - AWE-7220R ``` +#### Default encapsulation for WAN EVPN iBGP peerings changed to `path-selection` + +With AVD version 5.0.0 the default encapsulation used for EVPN iBGP peering between WAN routers is `path-selection`. Previously it was `vxlan`. + +!!! danger + The `path-selection` encapsulation is only supported on EOS above 4.33.0F. + + It is critical that all WAN devices use the same encapsulation. For + existing deployments it is recommended to set the encapsulation back to + `vxlan` until a migration can be done across the entire WAN network. + + Contact your Arista account team for guidance on migration. + +To retain the vxlan encapsulation on WAN EVPN iBGP peerings use `wan_encapsulation`: + +```diff ++ wan_encapsulation: vxlan +``` + +### PREVIEW WAN HA Direct Link now uses Port-Channel by default + +For WAN direct HA, AVD will now configure a port-channel by default. This feature was introduced in EOS 4.33.0F. + +To retain the previous configuration use custom_platform_settings use `use_port_channel_for_direct_ha: false` under `wan_ha`. + +```diff + wan_router: + node_groups: + - group: Site42 + cv_pathfinder_region: AVD_Land_West + cv_pathfinder_site: Site42 + wan_ha: + enabled: true ++ use_port_channel_for_direct_ha: false + ha_interfaces: [Ethernet52] + ha_ipv4_pool: 10.10.10.0/24 +``` + ## Changes to role `arista.avd.eos_cli_config_gen` TODO: Level 3 sections for each change with details on how to migrate diff --git a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md index 0abba9da3cd..de899454566 100644 --- a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md +++ b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md @@ -206,12 +206,46 @@ The updated version gives more flexibility to customizing interface descriptions See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md#avdinterfacedescriptions-breaking-changes) +#### Reference to a non-existing profile now raise an error + +With AVD version 5.0.0, if any referenced profile or parent profile is not defined, AVD will now raise an error. This helps catching typos in the input variables. + +This applies to: + +- `l3_interface_profiles` +- `port_profiles` +- `svi_profiles` + #### `wan_mode: autovpn` renamed `wan_mode: legacy-autovpn` With AVD version 5.0.0 the valid values for `wan_mode` key are now `legacy-autovpn | cv-pathfinder`. See the [porting guide](../porting-guides/5.x.x.md#wan-mode-autovpn-renamed-wan-mode-legacy-vpn) for details. +#### Default encapsulation for WAN EVPN iBGP peerings changed to `path-selection` + +With AVD version 5.0.0 the default encapsulation used for EVPN iBGP peering between WAN routers is `path-selection`. Previously it was `vxlan`. + +!!! danger + The `path-selection` encapsulation is only supported on EOS above 4.33.0F. + + It is critical that all WAN devices use the same encapsulation. For + existing deployments it is recommended to set the encapsulation back to + `vxlan` until a migration can be done across the entire WAN network. + + Contact your Arista account team for guidance on migration. + +See the [porting guide](../porting-guides/5.x.x.md#default-encapsulation-for-wan-evpn-ibgp-peerings-changed-to-path-selection) for details. + +#### PREVIEW WAN HA Direct Link now uses Port-Channel by default + +TODO: Keep PREVIEW changes at the end as we warn users that PREVIEW mean changes + +For WAN direct HA, AVD will now configure a port-channel by default. +This feature was introduced recently in EOS and may not be supported on your version. + +See the [porting guide](../porting-guides/5.x.x.md#preview-wan-ha-direct-link-now-uses-port-channel-by-default) for details. + ### Other breaking or behavioral changes Breaking changes may require modifications to the inventory or playbook. See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md) diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md index 637bdf26d80..12f693832ab 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199 | 110 | IDF1-Data | - | | 120 | IDF1-Voice | - | | 130 | IDF1-Guest | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,7 +267,7 @@ vlan 130 name IDF1-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -1406,7 +1406,7 @@ interface Port-Channel53 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan10 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -1426,7 +1426,7 @@ interface Vlan10 ip address 10.10.10.6/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md index 50015e2a0b6..ffd245861bf 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199 | 110 | IDF1-Data | - | | 120 | IDF1-Voice | - | | 130 | IDF1-Guest | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,7 +267,7 @@ vlan 130 name IDF1-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -1406,7 +1406,7 @@ interface Port-Channel53 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan10 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -1426,7 +1426,7 @@ interface Vlan10 ip address 10.10.10.7/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md index 319e7f18486..02d80eb4b44 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199 | 310 | IDF3-Data | - | | 320 | IDF3-Voice | - | | 330 | IDF3-Guest | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,7 +267,7 @@ vlan 330 name IDF3-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -2513,7 +2513,7 @@ interface Port-Channel983 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan10 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -2533,7 +2533,7 @@ interface Vlan10 ip address 10.10.10.9/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md index 65f91bac675..17f1052e0b3 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199 | 310 | IDF3-Data | - | | 320 | IDF3-Voice | - | | 330 | IDF3-Guest | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,7 +267,7 @@ vlan 330 name IDF3-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -2513,7 +2513,7 @@ interface Port-Channel983 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan10 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -2533,7 +2533,7 @@ interface Vlan10 ip address 10.10.10.10/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md index 18f64137586..a4a4fd1950b 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md @@ -255,8 +255,8 @@ vlan internal order ascending range 1006 1199 | 310 | IDF3-Data | - | | 320 | IDF3-Voice | - | | 330 | IDF3-Guest | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -293,11 +293,11 @@ vlan 330 name IDF3-Guest ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -324,7 +324,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet52/1 | P2P_LINK_TO_WAN_Ethernet1/1 | - | 10.0.0.3/31 | default | 1500 | False | - | - | +| Ethernet52/1 | P2P_WAN_Ethernet1/1 | - | 10.0.0.3/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -351,7 +351,7 @@ interface Ethernet51/1 channel-group 501 mode active ! interface Ethernet52/1 - description P2P_LINK_TO_WAN_Ethernet1/1 + description P2P_WAN_Ethernet1/1 no shutdown mtu 1500 no switchport @@ -462,8 +462,8 @@ interface Loopback0 | Vlan310 | IDF3-Data | default | - | False | | Vlan320 | IDF3-Voice | default | - | False | | Vlan330 | IDF3-Guest | default | - | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -549,7 +549,7 @@ interface Vlan330 ip virtual-router address 10.3.30.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.1.1.0/31 @@ -557,7 +557,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md index 2b80480083a..2f1cdd6cf88 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md @@ -255,8 +255,8 @@ vlan internal order ascending range 1006 1199 | 310 | IDF3-Data | - | | 320 | IDF3-Voice | - | | 330 | IDF3-Guest | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -293,11 +293,11 @@ vlan 330 name IDF3-Guest ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -324,7 +324,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet52/1 | P2P_LINK_TO_WAN_Ethernet1/1 | - | 10.0.0.5/31 | default | 1500 | False | - | - | +| Ethernet52/1 | P2P_WAN_Ethernet1/1 | - | 10.0.0.5/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -351,7 +351,7 @@ interface Ethernet51/1 channel-group 501 mode active ! interface Ethernet52/1 - description P2P_LINK_TO_WAN_Ethernet1/1 + description P2P_WAN_Ethernet1/1 no shutdown mtu 1500 no switchport @@ -462,8 +462,8 @@ interface Loopback0 | Vlan310 | IDF3-Data | default | - | False | | Vlan320 | IDF3-Voice | default | - | False | | Vlan330 | IDF3-Guest | default | - | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -549,7 +549,7 @@ interface Vlan330 ip virtual-router address 10.3.30.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.1.1.1/31 @@ -557,7 +557,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg index 183a5268604..e64155dff63 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg @@ -38,7 +38,7 @@ vlan 130 name IDF1-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -1048,7 +1048,7 @@ interface Vlan10 ip address 10.10.10.6/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg index c7dd6492ec8..ef2cc9787ec 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg @@ -38,7 +38,7 @@ vlan 130 name IDF1-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -1048,7 +1048,7 @@ interface Vlan10 ip address 10.10.10.7/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg index e82f6ab4a90..88571bae807 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg @@ -38,7 +38,7 @@ vlan 330 name IDF3-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -2052,7 +2052,7 @@ interface Vlan10 ip address 10.10.10.9/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg index 7f54c81fbb2..d2087b4893f 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg @@ -38,7 +38,7 @@ vlan 330 name IDF3-Guest ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -2052,7 +2052,7 @@ interface Vlan10 ip address 10.10.10.10/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg index a168e302b51..3413de7fcf7 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg @@ -56,11 +56,11 @@ vlan 330 name IDF3-Guest ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -119,7 +119,7 @@ interface Ethernet51/1 channel-group 501 mode active ! interface Ethernet52/1 - description P2P_LINK_TO_WAN_Ethernet1/1 + description P2P_WAN_Ethernet1/1 no shutdown mtu 1500 no switchport @@ -212,7 +212,7 @@ interface Vlan330 ip virtual-router address 10.3.30.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.1.1.0/31 @@ -220,7 +220,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg index e8d0b1e456e..bc9767ef2b1 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg @@ -56,11 +56,11 @@ vlan 330 name IDF3-Guest ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -119,7 +119,7 @@ interface Ethernet51/1 channel-group 501 mode active ! interface Ethernet52/1 - description P2P_LINK_TO_WAN_Ethernet1/1 + description P2P_WAN_Ethernet1/1 no shutdown mtu 1500 no switchport @@ -212,7 +212,7 @@ interface Vlan330 ip virtual-router address 10.3.30.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.1.1.1/31 @@ -220,7 +220,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1A.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1A.yml index 340c16706a9..730de75c919 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1A.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1A.yml @@ -62,7 +62,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -79,7 +79,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1B.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1B.yml index 30dc9d61c4b..95b927caf9d 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1B.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF1B.yml @@ -62,7 +62,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -79,7 +79,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3A.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3A.yml index b9b4b451a76..7d5d688d014 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3A.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3A.yml @@ -62,7 +62,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 310 @@ -79,7 +79,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3B.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3B.yml index 2c4394daef1..f74d529477a 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3B.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/LEAF3B.yml @@ -62,7 +62,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 310 @@ -79,7 +79,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml index 59767d0b265..4369a021a16 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml @@ -61,12 +61,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -101,14 +101,14 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.1.1.0/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -300,7 +300,6 @@ ethernet_interfaces: peer: WAN peer_interface: Ethernet1/1 peer_type: other - description: P2P_LINK_TO_WAN_Ethernet1/1 switchport: enabled: false shutdown: false @@ -308,6 +307,7 @@ ethernet_interfaces: ip_address: 10.0.0.3/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_WAN_Ethernet1/1 mlag_configuration: domain_id: SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml index f05d6c463a1..2142e2800a2 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml @@ -61,12 +61,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -101,14 +101,14 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.1.1.1/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -300,7 +300,6 @@ ethernet_interfaces: peer: WAN peer_interface: Ethernet1/1 peer_type: other - description: P2P_LINK_TO_WAN_Ethernet1/1 switchport: enabled: false shutdown: false @@ -308,6 +307,7 @@ ethernet_interfaces: ip_address: 10.0.0.5/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_WAN_Ethernet1/1 mlag_configuration: domain_id: SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md index f2076ec2425..a407340bdf0 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,22 +265,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_dc1-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_dc1-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -408,10 +408,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -455,27 +455,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.96/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.96/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.96/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -713,12 +713,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan4093 neighbor 10.255.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.0 remote-as 65100 neighbor 10.255.255.0 description dc1-spine1_Ethernet1 @@ -771,7 +771,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -780,7 +780,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md index 57a8de56b9d..868f391f4e7 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,22 +265,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_dc1-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.5/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_dc1-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -408,10 +408,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -455,27 +455,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.97/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.97/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.97/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -713,12 +713,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan4093 neighbor 10.255.255.4 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.4 remote-as 65100 neighbor 10.255.255.4 description dc1-spine1_Ethernet2 @@ -771,7 +771,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -780,7 +780,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md index 1f590cbdf3a..5ff336d7b3e 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,23 +265,23 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_dc2-leaf2a_Ethernet6 | - | 172.16.100.0/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_dc2-leaf2a_Ethernet6 | - | 172.16.100.0/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_dc1-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_dc1-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -303,7 +303,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc2-leaf2a_Ethernet6 + description P2P_dc2-leaf2a_Ethernet6 no shutdown mtu 1500 no switchport @@ -416,10 +416,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -463,27 +463,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.100/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.100/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.100/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -749,15 +749,15 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan4093 neighbor 10.255.128.15 peer group EVPN-OVERLAY-CORE neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.8 remote-as 65100 neighbor 10.255.255.8 description dc1-spine1_Ethernet3 @@ -829,7 +829,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -838,7 +838,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md index 3193f653f7e..7e97f2628f7 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,23 +265,23 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_dc2-leaf2b_Ethernet6 | - | 172.16.100.2/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_dc2-leaf2b_Ethernet6 | - | 172.16.100.2/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_dc1-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.13/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_dc1-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -303,7 +303,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc2-leaf2b_Ethernet6 + description P2P_dc2-leaf2b_Ethernet6 no shutdown mtu 1500 no switchport @@ -416,10 +416,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -463,27 +463,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.101/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.101/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.101/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -749,15 +749,15 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan4093 neighbor 10.255.128.16 peer group EVPN-OVERLAY-CORE neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.12 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.12 remote-as 65100 neighbor 10.255.255.12 description dc1-spine1_Ethernet4 @@ -829,7 +829,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -838,7 +838,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md index 03be2942b49..75d524a0cbd 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-leaf1a_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-leaf1b_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc1-leaf2a_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc1-leaf2b_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_dc1-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description P2P_dc1-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.4/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_dc1-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.8/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_dc1-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -351,16 +351,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.1 remote-as 65101 neighbor 10.255.255.1 description dc1-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md index cb8df8dcefd..fe925a4eb02 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-leaf1a_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-leaf1b_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc1-leaf2a_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc1-leaf2b_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_dc1-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description P2P_dc1-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.6/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_dc1-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.10/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_dc1-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -351,16 +351,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.3 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.3 remote-as 65101 neighbor 10.255.255.3 description dc1-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md index d68dbea76a6..fd66afaeb9c 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,22 +265,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SPINE1_Ethernet1 | - | 10.255.255.105/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SPINE2_Ethernet1 | - | 10.255.255.107/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-spine1_Ethernet1 | - | 10.255.255.105/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-spine2_Ethernet1 | - | 10.255.255.107/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet1 + description P2P_dc2-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.105/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet1 + description P2P_dc2-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -408,10 +408,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -455,27 +455,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.116/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.116/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.116/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -713,12 +713,12 @@ router bgp 65201 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan4093 neighbor 10.255.255.104 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.104 remote-as 65200 neighbor 10.255.255.104 description dc2-spine1_Ethernet1 @@ -771,7 +771,7 @@ router bgp 65201 route-target export evpn 10:10 router-id 10.255.128.13 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -780,7 +780,7 @@ router bgp 65201 route-target export evpn 11:11 router-id 10.255.128.13 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md index 92dbb58a658..685c1b2d8c7 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,22 +265,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SPINE1_Ethernet2 | - | 10.255.255.109/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SPINE2_Ethernet2 | - | 10.255.255.111/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-spine1_Ethernet2 | - | 10.255.255.109/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-spine2_Ethernet2 | - | 10.255.255.111/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet2 + description P2P_dc2-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.109/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet2 + description P2P_dc2-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -408,10 +408,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -455,27 +455,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.117/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.117/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.117/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -713,12 +713,12 @@ router bgp 65201 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan4093 neighbor 10.255.255.108 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.108 remote-as 65200 neighbor 10.255.255.108 description dc2-spine1_Ethernet2 @@ -771,7 +771,7 @@ router bgp 65201 route-target export evpn 10:10 router-id 10.255.128.14 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -780,7 +780,7 @@ router bgp 65201 route-target export evpn 11:11 router-id 10.255.128.14 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md index b5e04f37b44..45328345368 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,23 +265,23 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SPINE1_Ethernet3 | - | 10.255.255.113/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SPINE2_Ethernet3 | - | 10.255.255.115/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_dc1-leaf2a_Ethernet6 | - | 172.16.100.1/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-spine1_Ethernet3 | - | 10.255.255.113/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-spine2_Ethernet3 | - | 10.255.255.115/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_dc1-leaf2a_Ethernet6 | - | 172.16.100.1/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet3 + description P2P_dc2-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.113/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet3 + description P2P_dc2-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -303,7 +303,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc1-leaf2a_Ethernet6 + description P2P_dc1-leaf2a_Ethernet6 no shutdown mtu 1500 no switchport @@ -416,10 +416,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -463,27 +463,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.120/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.120/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.120/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -749,15 +749,15 @@ router bgp 65202 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.5 peer group EVPN-OVERLAY-CORE neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan4093 neighbor 10.255.255.112 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.112 remote-as 65200 neighbor 10.255.255.112 description dc2-spine1_Ethernet3 @@ -829,7 +829,7 @@ router bgp 65202 route-target export evpn 10:10 router-id 10.255.128.15 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -838,7 +838,7 @@ router bgp 65202 route-target export evpn 11:11 router-id 10.255.128.15 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md index 434d56498ba..c04d68b72fc 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md @@ -198,12 +198,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -222,11 +222,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -236,11 +236,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -265,23 +265,23 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SPINE1_Ethernet4 | - | 10.255.255.117/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SPINE2_Ethernet4 | - | 10.255.255.119/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_dc1-leaf2b_Ethernet6 | - | 172.16.100.3/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-spine1_Ethernet4 | - | 10.255.255.117/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-spine2_Ethernet4 | - | 10.255.255.119/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_dc1-leaf2b_Ethernet6 | - | 172.16.100.3/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet4 + description P2P_dc2-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.117/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet4 + description P2P_dc2-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -303,7 +303,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc1-leaf2b_Ethernet6 + description P2P_dc1-leaf2b_Ethernet6 no shutdown mtu 1500 no switchport @@ -416,10 +416,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -463,27 +463,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.121/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.121/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.121/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -749,15 +749,15 @@ router bgp 65202 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.6 peer group EVPN-OVERLAY-CORE neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan4093 neighbor 10.255.255.116 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.116 remote-as 65200 neighbor 10.255.255.116 description dc2-spine1_Ethernet4 @@ -829,7 +829,7 @@ router bgp 65202 route-target export evpn 10:10 router-id 10.255.128.16 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -838,7 +838,7 @@ router bgp 65202 route-target export evpn 11:11 router-id 10.255.128.16 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md index 750126e33da..3888c7c76a5 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-LEAF1A_Ethernet1 | - | 10.255.255.104/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-LEAF1B_Ethernet1 | - | 10.255.255.108/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC2-LEAF2A_Ethernet1 | - | 10.255.255.112/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC2-LEAF2B_Ethernet1 | - | 10.255.255.116/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-leaf1a_Ethernet1 | - | 10.255.255.104/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-leaf1b_Ethernet1 | - | 10.255.255.108/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc2-leaf2a_Ethernet1 | - | 10.255.255.112/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc2-leaf2b_Ethernet1 | - | 10.255.255.116/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-LEAF1A_Ethernet1 + description P2P_dc2-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.104/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-LEAF1B_Ethernet1 + description P2P_dc2-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.108/31 ! interface Ethernet3 - description P2P_LINK_TO_DC2-LEAF2A_Ethernet1 + description P2P_dc2-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.112/31 ! interface Ethernet4 - description P2P_LINK_TO_DC2-LEAF2B_Ethernet1 + description P2P_dc2-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -351,16 +351,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.128.13 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.13 remote-as 65201 - neighbor 10.255.128.13 description dc2-leaf1a + neighbor 10.255.128.13 description dc2-leaf1a_Loopback0 neighbor 10.255.128.14 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.14 remote-as 65201 - neighbor 10.255.128.14 description dc2-leaf1b + neighbor 10.255.128.14 description dc2-leaf1b_Loopback0 neighbor 10.255.128.15 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.128.16 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.105 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.105 remote-as 65201 neighbor 10.255.255.105 description dc2-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md index a09f8fdb92a..9f268bee4e6 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-LEAF1A_Ethernet2 | - | 10.255.255.106/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-LEAF1B_Ethernet2 | - | 10.255.255.110/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC2-LEAF2A_Ethernet2 | - | 10.255.255.114/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC2-LEAF2B_Ethernet2 | - | 10.255.255.118/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc2-leaf1a_Ethernet2 | - | 10.255.255.106/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc2-leaf1b_Ethernet2 | - | 10.255.255.110/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc2-leaf2a_Ethernet2 | - | 10.255.255.114/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc2-leaf2b_Ethernet2 | - | 10.255.255.118/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-LEAF1A_Ethernet2 + description P2P_dc2-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.106/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-LEAF1B_Ethernet2 + description P2P_dc2-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.110/31 ! interface Ethernet3 - description P2P_LINK_TO_DC2-LEAF2A_Ethernet2 + description P2P_dc2-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.114/31 ! interface Ethernet4 - description P2P_LINK_TO_DC2-LEAF2B_Ethernet2 + description P2P_dc2-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -351,16 +351,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.128.13 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.13 remote-as 65201 - neighbor 10.255.128.13 description dc2-leaf1a + neighbor 10.255.128.13 description dc2-leaf1a_Loopback0 neighbor 10.255.128.14 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.14 remote-as 65201 - neighbor 10.255.128.14 description dc2-leaf1b + neighbor 10.255.128.14 description dc2-leaf1b_Loopback0 neighbor 10.255.128.15 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.128.16 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.107 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.107 remote-as 65201 neighbor 10.255.255.107 description dc2-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1a.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1a.cfg index 4da9959e8ed..3dedc87440e 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1a.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1a.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_dc1-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_dc1-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -176,27 +176,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.96/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.96/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.96/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -275,12 +275,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan4093 neighbor 10.255.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.0 remote-as 65100 neighbor 10.255.255.0 description dc1-spine1_Ethernet1 @@ -333,7 +333,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -342,7 +342,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1b.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1b.cfg index c3d1e01352a..2b33278bacd 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1b.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf1b.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_dc1-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.5/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_dc1-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -176,27 +176,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.97/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.97/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.97/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -275,12 +275,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan4093 neighbor 10.255.255.4 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.4 remote-as 65100 neighbor 10.255.255.4 description dc1-spine1_Ethernet2 @@ -333,7 +333,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -342,7 +342,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2a.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2a.cfg index a6f29882b8b..d3715e0dd1f 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2a.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2a.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_dc1-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_dc1-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -119,7 +119,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc2-leaf2a_Ethernet6 + description P2P_dc2-leaf2a_Ethernet6 no shutdown mtu 1500 no switchport @@ -183,27 +183,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.100/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.100/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.100/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -288,15 +288,15 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan4093 neighbor 10.255.128.15 peer group EVPN-OVERLAY-CORE neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.8 remote-as 65100 neighbor 10.255.255.8 description dc1-spine1_Ethernet3 @@ -368,7 +368,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -377,7 +377,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2b.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2b.cfg index 40873169c2b..337dd182758 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2b.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-leaf2b.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_dc1-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.13/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_dc1-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -119,7 +119,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc2-leaf2b_Ethernet6 + description P2P_dc2-leaf2b_Ethernet6 no shutdown mtu 1500 no switchport @@ -183,27 +183,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.101/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.101/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.101/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -288,15 +288,15 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan4093 neighbor 10.255.128.16 peer group EVPN-OVERLAY-CORE neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.12 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.12 remote-as 65100 neighbor 10.255.255.12 description dc1-spine1_Ethernet4 @@ -368,7 +368,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -377,7 +377,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine1.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine1.cfg index 845a51f637c..5338d2a35bd 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine1.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine1.cfg @@ -25,28 +25,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_dc1-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description P2P_dc1-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.4/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_dc1-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.8/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_dc1-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -95,16 +95,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.1 remote-as 65101 neighbor 10.255.255.1 description dc1-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine2.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine2.cfg index 6fc050d5d06..9496d77fbf3 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine2.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc1-spine2.cfg @@ -25,28 +25,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_dc1-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description P2P_dc1-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.6/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_dc1-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.10/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_dc1-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -95,16 +95,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.3 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.3 remote-as 65101 neighbor 10.255.255.3 description dc1-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1a.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1a.cfg index b32c7faa267..8e45534876f 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1a.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1a.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet1 + description P2P_dc2-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.105/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet1 + description P2P_dc2-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -176,27 +176,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.116/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.116/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.116/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -275,12 +275,12 @@ router bgp 65201 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan4093 neighbor 10.255.255.104 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.104 remote-as 65200 neighbor 10.255.255.104 description dc2-spine1_Ethernet1 @@ -333,7 +333,7 @@ router bgp 65201 route-target export evpn 10:10 router-id 10.255.128.13 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -342,7 +342,7 @@ router bgp 65201 route-target export evpn 11:11 router-id 10.255.128.13 neighbor 10.255.129.117 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.117 description dc2-leaf1b + neighbor 10.255.129.117 description dc2-leaf1b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1b.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1b.cfg index 997c7ecb0a2..9a3ad03dac5 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1b.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf1b.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet2 + description P2P_dc2-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.109/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet2 + description P2P_dc2-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -176,27 +176,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.117/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.117/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.117/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -275,12 +275,12 @@ router bgp 65201 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan4093 neighbor 10.255.255.108 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.108 remote-as 65200 neighbor 10.255.255.108 description dc2-spine1_Ethernet2 @@ -333,7 +333,7 @@ router bgp 65201 route-target export evpn 10:10 router-id 10.255.128.14 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -342,7 +342,7 @@ router bgp 65201 route-target export evpn 11:11 router-id 10.255.128.14 neighbor 10.255.129.116 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.116 description dc2-leaf1a + neighbor 10.255.129.116 description dc2-leaf1a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2a.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2a.cfg index aea07f4b28b..e227636e2cc 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2a.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2a.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet3 + description P2P_dc2-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.113/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet3 + description P2P_dc2-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -119,7 +119,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc1-leaf2a_Ethernet6 + description P2P_dc1-leaf2a_Ethernet6 no shutdown mtu 1500 no switchport @@ -183,27 +183,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.120/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.120/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.120/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -288,15 +288,15 @@ router bgp 65202 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.5 peer group EVPN-OVERLAY-CORE neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan4093 neighbor 10.255.255.112 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.112 remote-as 65200 neighbor 10.255.255.112 description dc2-spine1_Ethernet3 @@ -368,7 +368,7 @@ router bgp 65202 route-target export evpn 10:10 router-id 10.255.128.15 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -377,7 +377,7 @@ router bgp 65202 route-target export evpn 11:11 router-id 10.255.128.15 neighbor 10.255.129.121 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.121 description dc2-leaf2b + neighbor 10.255.129.121 description dc2-leaf2b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2b.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2b.cfg index f5c443ea0b6..864ca8178ca 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2b.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-leaf2b.cfg @@ -37,11 +37,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -51,11 +51,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -90,14 +90,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC2-SPINE1_Ethernet4 + description P2P_dc2-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.117/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-SPINE2_Ethernet4 + description P2P_dc2-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -119,7 +119,7 @@ interface Ethernet5 channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_dc1-leaf2b_Ethernet6 + description P2P_dc1-leaf2b_Ethernet6 no shutdown mtu 1500 no switchport @@ -183,27 +183,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.129.121/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.129.121/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.129.121/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -288,15 +288,15 @@ router bgp 65202 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.6 peer group EVPN-OVERLAY-CORE neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.128.11 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.11 remote-as 65200 - neighbor 10.255.128.11 description dc2-spine1 + neighbor 10.255.128.11 description dc2-spine1_Loopback0 neighbor 10.255.128.12 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.12 remote-as 65200 - neighbor 10.255.128.12 description dc2-spine2 + neighbor 10.255.128.12 description dc2-spine2_Loopback0 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan4093 neighbor 10.255.255.116 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.116 remote-as 65200 neighbor 10.255.255.116 description dc2-spine1_Ethernet4 @@ -368,7 +368,7 @@ router bgp 65202 route-target export evpn 10:10 router-id 10.255.128.16 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -377,7 +377,7 @@ router bgp 65202 route-target export evpn 11:11 router-id 10.255.128.16 neighbor 10.255.129.120 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.129.120 description dc2-leaf2a + neighbor 10.255.129.120 description dc2-leaf2a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine1.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine1.cfg index 7a485bd0e37..a5fbe03ae30 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine1.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine1.cfg @@ -25,28 +25,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-LEAF1A_Ethernet1 + description P2P_dc2-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.104/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-LEAF1B_Ethernet1 + description P2P_dc2-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.108/31 ! interface Ethernet3 - description P2P_LINK_TO_DC2-LEAF2A_Ethernet1 + description P2P_dc2-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.112/31 ! interface Ethernet4 - description P2P_LINK_TO_DC2-LEAF2B_Ethernet1 + description P2P_dc2-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -95,16 +95,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.128.13 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.13 remote-as 65201 - neighbor 10.255.128.13 description dc2-leaf1a + neighbor 10.255.128.13 description dc2-leaf1a_Loopback0 neighbor 10.255.128.14 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.14 remote-as 65201 - neighbor 10.255.128.14 description dc2-leaf1b + neighbor 10.255.128.14 description dc2-leaf1b_Loopback0 neighbor 10.255.128.15 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.128.16 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.105 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.105 remote-as 65201 neighbor 10.255.255.105 description dc2-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine2.cfg b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine2.cfg index 7ae008bde7d..ee34965f197 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine2.cfg +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/configs/dc2-spine2.cfg @@ -25,28 +25,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-LEAF1A_Ethernet2 + description P2P_dc2-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.106/31 ! interface Ethernet2 - description P2P_LINK_TO_DC2-LEAF1B_Ethernet2 + description P2P_dc2-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.110/31 ! interface Ethernet3 - description P2P_LINK_TO_DC2-LEAF2A_Ethernet2 + description P2P_dc2-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.114/31 ! interface Ethernet4 - description P2P_LINK_TO_DC2-LEAF2B_Ethernet2 + description P2P_dc2-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -95,16 +95,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.128.13 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.13 remote-as 65201 - neighbor 10.255.128.13 description dc2-leaf1a + neighbor 10.255.128.13 description dc2-leaf1a_Loopback0 neighbor 10.255.128.14 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.14 remote-as 65201 - neighbor 10.255.128.14 description dc2-leaf1b + neighbor 10.255.128.14 description dc2-leaf1b_Loopback0 neighbor 10.255.128.15 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.15 remote-as 65202 - neighbor 10.255.128.15 description dc2-leaf2a + neighbor 10.255.128.15 description dc2-leaf2a_Loopback0 neighbor 10.255.128.16 peer group EVPN-OVERLAY-PEERS neighbor 10.255.128.16 remote-as 65202 - neighbor 10.255.128.16 description dc2-leaf2b + neighbor 10.255.128.16 description dc2-leaf2b_Loopback0 neighbor 10.255.255.107 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.107 remote-as 65201 neighbor 10.255.255.107 description dc2-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml index 9fb14a2ab4f..d7f057f1787 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Vlan4093 - ip_address: 10.255.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3009 - name: VRF11 rd: 10.255.0.3:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -214,12 +214,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -229,7 +229,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -240,7 +240,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -252,12 +252,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.96/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -278,7 +278,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.96/31 @@ -298,7 +298,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.96/31 @@ -355,7 +355,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_dc1-spine1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -365,7 +365,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_dc1-spine2_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml index ec11cc79778..9c150480fe1 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Vlan4093 - ip_address: 10.255.255.4 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3009 - name: VRF11 rd: 10.255.0.4:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -214,12 +214,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -229,7 +229,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -240,7 +240,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -252,12 +252,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.97/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -278,7 +278,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.97/31 @@ -298,7 +298,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.97/31 @@ -355,7 +355,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_dc1-spine1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -365,7 +365,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_dc1-spine2_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml index 5e598fc6716..73861aa0f1c 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Vlan4093 - ip_address: 10.255.255.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-CORE peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 172.16.100.1 remote_as: '65202' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.0.5:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3009 - name: VRF11 rd: 10.255.0.5:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -276,12 +276,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -291,7 +291,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -302,7 +302,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -314,12 +314,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.100/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -340,7 +340,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.100/31 @@ -360,7 +360,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.100/31 @@ -417,7 +417,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_dc1-spine1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -427,7 +427,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_dc1-spine2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -446,12 +446,12 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc2-leaf2a_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 172.16.100.0/31 + description: P2P_dc2-leaf2a_Ethernet6 - name: Ethernet5 peer: dc1-leaf2-server1 peer_interface: PCI1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml index afa25d6bd43..5023249e233 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Vlan4093 - ip_address: 10.255.255.12 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-CORE peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' - ip_address: 172.16.100.3 remote_as: '65202' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.0.6:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3009 - name: VRF11 rd: 10.255.0.6:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -276,12 +276,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -291,7 +291,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -302,7 +302,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -314,12 +314,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.101/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -340,7 +340,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.101/31 @@ -360,7 +360,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.101/31 @@ -417,7 +417,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_dc1-spine1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -427,7 +427,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_dc1-spine2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -446,12 +446,12 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc2-leaf2b_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 172.16.100.2/31 + description: P2P_dc2-leaf2b_Ethernet6 - name: Ethernet5 peer: dc1-leaf2-server1 peer_interface: PCI2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine1.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine1.yml index 60d507039b5..065ff738ce1 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine1.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine1.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -126,7 +126,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_dc1-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -136,7 +136,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description: P2P_dc1-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_dc1-leaf2a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -156,7 +156,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_dc1-leaf2b_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine2.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine2.yml index 5cf1e8b8407..2904a00b544 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine2.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-spine2.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -126,7 +126,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_dc1-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -136,7 +136,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description: P2P_dc1-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_dc1-leaf2a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -156,7 +156,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_dc1-leaf2b_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1a.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1a.yml index 11c7cdf1f93..d61e45ef7c2 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1a.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Vlan4093 - ip_address: 10.255.255.104 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1b + description: dc2-leaf1b_Vlan3009 - name: VRF11 rd: 10.255.128.13:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1b + description: dc2-leaf1b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -214,12 +214,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -229,7 +229,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -240,7 +240,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -252,12 +252,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.116/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -278,7 +278,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.116/31 @@ -298,7 +298,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.116/31 @@ -355,7 +355,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet1 + description: P2P_dc2-spine1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -365,7 +365,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet1 + description: P2P_dc2-spine2_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1b.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1b.yml index 3c34950183c..dfea8ef1bc8 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1b.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Vlan4093 - ip_address: 10.255.255.108 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1a + description: dc2-leaf1a_Vlan3009 - name: VRF11 rd: 10.255.128.14:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1a + description: dc2-leaf1a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -214,12 +214,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -229,7 +229,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -240,7 +240,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -252,12 +252,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.117/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -278,7 +278,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.117/31 @@ -298,7 +298,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.117/31 @@ -355,7 +355,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet2 + description: P2P_dc2-spine1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -365,7 +365,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet2 + description: P2P_dc2-spine2_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2a.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2a.yml index a3b4577bfae..49e2725cf5a 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2a.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2a.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Vlan4093 - ip_address: 10.255.255.112 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-CORE peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 172.16.100.0 remote_as: '65102' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.128.15:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2b + description: dc2-leaf2b_Vlan3009 - name: VRF11 rd: 10.255.128.15:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2b + description: dc2-leaf2b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -276,12 +276,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -291,7 +291,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -302,7 +302,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -314,12 +314,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.120/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -340,7 +340,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.120/31 @@ -360,7 +360,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.120/31 @@ -417,7 +417,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet3 + description: P2P_dc2-spine1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -427,7 +427,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet3 + description: P2P_dc2-spine2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -446,12 +446,12 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc1-leaf2a_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 172.16.100.1/31 + description: P2P_dc1-leaf2a_Ethernet6 - name: Ethernet5 peer: dc2-leaf2-server1 peer_interface: PCI1 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2b.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2b.yml index eee3a428ce3..991b1590399 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2b.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2b.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Vlan4093 - ip_address: 10.255.255.116 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-CORE peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' - ip_address: 172.16.100.2 remote_as: '65102' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.128.16:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2a + description: dc2-leaf2a_Vlan3009 - name: VRF11 rd: 10.255.128.16:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2a + description: dc2-leaf2a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -276,12 +276,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -291,7 +291,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -302,7 +302,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -314,12 +314,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.121/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -340,7 +340,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.121/31 @@ -360,7 +360,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.121/31 @@ -417,7 +417,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet4 + description: P2P_dc2-spine1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -427,7 +427,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet4 + description: P2P_dc2-spine2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -446,12 +446,12 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc1-leaf2b_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 172.16.100.3/31 + description: P2P_dc1-leaf2b_Ethernet6 - name: Ethernet5 peer: dc2-leaf2-server1 peer_interface: PCI2 diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine1.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine1.yml index ee3f601ed95..13b1c63f5cc 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine1.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine1.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.128.13 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Loopback0 remote_as: '65201' - ip_address: 10.255.128.14 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Loopback0 remote_as: '65201' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' address_family_evpn: peer_groups: @@ -126,7 +126,7 @@ ethernet_interfaces: peer: dc2-leaf1a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1A_Ethernet1 + description: P2P_dc2-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -136,7 +136,7 @@ ethernet_interfaces: peer: dc2-leaf1b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1B_Ethernet1 + description: P2P_dc2-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2A_Ethernet1 + description: P2P_dc2-leaf2a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -156,7 +156,7 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2B_Ethernet1 + description: P2P_dc2-leaf2b_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine2.yml b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine2.yml index 819d9a0c4ea..417e970db00 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine2.yml +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-spine2.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.128.13 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Loopback0 remote_as: '65201' - ip_address: 10.255.128.14 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Loopback0 remote_as: '65201' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' address_family_evpn: peer_groups: @@ -126,7 +126,7 @@ ethernet_interfaces: peer: dc2-leaf1a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1A_Ethernet2 + description: P2P_dc2-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -136,7 +136,7 @@ ethernet_interfaces: peer: dc2-leaf1b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1B_Ethernet2 + description: P2P_dc2-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2A_Ethernet2 + description: P2P_dc2-leaf2a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -156,7 +156,7 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2B_Ethernet2 + description: P2P_dc2-leaf2b_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md index 6ef30119b49..2013f63a538 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md @@ -172,10 +172,10 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_pe1_Ethernet1 | - | 10.255.3.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_pe2_Ethernet2 | - | 10.255.3.7/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_rr1_Ethernet3 | - | 10.255.3.11/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_p2_Ethernet4 | - | 10.255.3.8/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_pe1_Ethernet1 | - | 10.255.3.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_pe2_Ethernet2 | - | 10.255.3.7/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_rr1_Ethernet3 | - | 10.255.3.11/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_p2_Ethernet4 | - | 10.255.3.8/31 | default | 1500 | False | - | - | ##### ISIS @@ -191,7 +191,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_pe1_Ethernet1 + description P2P_pe1_Ethernet1 no shutdown mtu 1500 no switchport @@ -208,7 +208,7 @@ interface Ethernet1 isis authentication key 7 ! interface Ethernet2 - description P2P_LINK_TO_pe2_Ethernet2 + description P2P_pe2_Ethernet2 no shutdown mtu 1500 no switchport @@ -225,7 +225,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet3 - description P2P_LINK_TO_rr1_Ethernet3 + description P2P_rr1_Ethernet3 no shutdown mtu 1500 no switchport @@ -242,7 +242,7 @@ interface Ethernet3 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_p2_Ethernet4 + description P2P_p2_Ethernet4 no shutdown mtu 1500 no switchport @@ -413,10 +413,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md index 5a715b6e20b..502ce108a81 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md @@ -172,10 +172,10 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_pe2_Ethernet1 | - | 10.255.3.5/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_pe1_Ethernet2 | - | 10.255.3.3/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_rr2_Ethernet3 | - | 10.255.3.17/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_p1_Ethernet4 | - | 10.255.3.9/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_pe2_Ethernet1 | - | 10.255.3.5/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_pe1_Ethernet2 | - | 10.255.3.3/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_rr2_Ethernet3 | - | 10.255.3.17/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_p1_Ethernet4 | - | 10.255.3.9/31 | default | 1500 | False | - | - | ##### ISIS @@ -191,7 +191,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_pe2_Ethernet1 + description P2P_pe2_Ethernet1 no shutdown mtu 1500 no switchport @@ -208,7 +208,7 @@ interface Ethernet1 isis authentication key 7 ! interface Ethernet2 - description P2P_LINK_TO_pe1_Ethernet2 + description P2P_pe1_Ethernet2 no shutdown mtu 1500 no switchport @@ -225,7 +225,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet3 - description P2P_LINK_TO_rr2_Ethernet3 + description P2P_rr2_Ethernet3 no shutdown mtu 1500 no switchport @@ -242,7 +242,7 @@ interface Ethernet3 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_p1_Ethernet4 + description P2P_p1_Ethernet4 no shutdown mtu 1500 no switchport @@ -413,10 +413,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md index e7ba9e17727..1c925a363a0 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md @@ -172,9 +172,9 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_pe3_Ethernet1 | - | 10.255.3.23/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_rr1_Ethernet2 | - | 10.255.3.13/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_p4_Ethernet4 | - | 10.255.3.20/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_pe3_Ethernet1 | - | 10.255.3.23/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_rr1_Ethernet2 | - | 10.255.3.13/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_p4_Ethernet4 | - | 10.255.3.20/31 | default | 1500 | False | - | - | ##### ISIS @@ -189,7 +189,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_pe3_Ethernet1 + description P2P_pe3_Ethernet1 no shutdown mtu 1500 no switchport @@ -206,7 +206,7 @@ interface Ethernet1 isis authentication key 7 ! interface Ethernet2 - description P2P_LINK_TO_rr1_Ethernet2 + description P2P_rr1_Ethernet2 no shutdown mtu 1500 no switchport @@ -223,7 +223,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_p4_Ethernet4 + description P2P_p4_Ethernet4 no shutdown mtu 1500 no switchport @@ -393,10 +393,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md index 2abd8df767c..76492369a57 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md @@ -172,9 +172,9 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet2 | P2P_LINK_TO_rr2_Ethernet2 | - | 10.255.3.19/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_pe3_Ethernet3 | - | 10.255.3.25/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_p3_Ethernet4 | - | 10.255.3.21/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_rr2_Ethernet2 | - | 10.255.3.19/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_pe3_Ethernet3 | - | 10.255.3.25/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_p3_Ethernet4 | - | 10.255.3.21/31 | default | 1500 | False | - | - | ##### ISIS @@ -189,7 +189,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet2 - description P2P_LINK_TO_rr2_Ethernet2 + description P2P_rr2_Ethernet2 no shutdown mtu 1500 no switchport @@ -206,7 +206,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet3 - description P2P_LINK_TO_pe3_Ethernet3 + description P2P_pe3_Ethernet3 no shutdown mtu 1500 no switchport @@ -223,7 +223,7 @@ interface Ethernet3 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_p3_Ethernet4 + description P2P_p3_Ethernet4 no shutdown mtu 1500 no switchport @@ -393,10 +393,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.4 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md index ecf10422af7..a015fd12778 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md @@ -186,8 +186,8 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_p1_Ethernet1 | - | 10.255.3.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_p2_Ethernet2 | - | 10.255.3.2/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_p1_Ethernet1 | - | 10.255.3.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_p2_Ethernet2 | - | 10.255.3.2/31 | default | 1500 | False | - | - | | Ethernet3.10 | C1_L3_SERVICE | - | 10.0.1.1/29 | C1_VRF1 | - | False | - | - | | Ethernet3.20 | C2_L3_SERVICE | - | 10.1.1.1/29 | C2_VRF1 | - | False | - | - | @@ -203,7 +203,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_p1_Ethernet1 + description P2P_p1_Ethernet1 no shutdown mtu 1500 no switchport @@ -220,7 +220,7 @@ interface Ethernet1 isis authentication key 7 ! interface Ethernet2 - description P2P_LINK_TO_p2_Ethernet2 + description P2P_p2_Ethernet2 no shutdown mtu 1500 no switchport @@ -506,9 +506,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate @@ -579,10 +579,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md index 8b38c646ed9..166ea10d12d 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md @@ -186,8 +186,8 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_p2_Ethernet1 | - | 10.255.3.4/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_p1_Ethernet2 | - | 10.255.3.6/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_p2_Ethernet1 | - | 10.255.3.4/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_p1_Ethernet2 | - | 10.255.3.6/31 | default | 1500 | False | - | - | | Ethernet4.10 | C1_L3_SERVICE | - | 10.0.1.2/29 | C1_VRF1 | - | False | - | - | | Ethernet4.20 | C2_L3_SERVICE | - | 10.1.1.2/29 | C2_VRF1 | - | False | - | - | @@ -203,7 +203,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_p2_Ethernet1 + description P2P_p2_Ethernet1 no shutdown mtu 1500 no switchport @@ -220,7 +220,7 @@ interface Ethernet1 isis authentication key 7 ! interface Ethernet2 - description P2P_LINK_TO_p1_Ethernet2 + description P2P_p1_Ethernet2 no shutdown mtu 1500 no switchport @@ -506,9 +506,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate @@ -579,10 +579,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md index 8c898901f4e..b64a527b562 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md @@ -179,9 +179,9 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_p3_Ethernet1 | - | 10.255.3.22/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_p3_Ethernet1 | - | 10.255.3.22/31 | default | 1500 | False | - | - | | Ethernet2 | C1_L3_SERVICE | - | 10.0.1.9/30 | C1_VRF1 | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_p4_Ethernet3 | - | 10.255.3.24/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_p4_Ethernet3 | - | 10.255.3.24/31 | default | 1500 | False | - | - | | Ethernet4 | C2_L3_SERVICE | - | 10.1.1.9/30 | C2_VRF1 | - | False | - | - | ##### ISIS @@ -196,7 +196,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_p3_Ethernet1 + description P2P_p3_Ethernet1 no shutdown mtu 1500 no switchport @@ -221,7 +221,7 @@ interface Ethernet2 ip ospf area 0 ! interface Ethernet3 - description P2P_LINK_TO_p4_Ethernet3 + description P2P_p4_Ethernet3 no shutdown mtu 1500 no switchport @@ -495,9 +495,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate @@ -568,10 +568,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md index dacf19cddc3..3f4c8155aab 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md @@ -175,9 +175,9 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet2 | P2P_LINK_TO_p3_Ethernet2 | - | 10.255.3.12/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_p1_Ethernet3 | - | 10.255.3.10/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_rr2_Ethernet4 | - | 10.255.3.14/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_p3_Ethernet2 | - | 10.255.3.12/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_p1_Ethernet3 | - | 10.255.3.10/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_rr2_Ethernet4 | - | 10.255.3.14/31 | default | 1500 | False | - | - | ##### ISIS @@ -192,7 +192,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet2 - description P2P_LINK_TO_p3_Ethernet2 + description P2P_p3_Ethernet2 no shutdown mtu 1500 no switchport @@ -209,7 +209,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet3 - description P2P_LINK_TO_p1_Ethernet3 + description P2P_p1_Ethernet3 no shutdown mtu 1500 no switchport @@ -226,7 +226,7 @@ interface Ethernet3 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_rr2_Ethernet4 + description P2P_rr2_Ethernet4 no shutdown mtu 1500 no switchport @@ -464,13 +464,13 @@ router bgp 65001 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.1.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.1 description pe1 + neighbor 10.255.1.1 description pe1_Loopback0 neighbor 10.255.1.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.2 description pe2 + neighbor 10.255.1.2 description pe2_Loopback0 neighbor 10.255.1.3 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.3 description pe3 + neighbor 10.255.1.3 description pe3_Loopback0 neighbor 10.255.2.2 peer group RR-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate @@ -520,10 +520,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 10.255.2.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md index 84a3bb71d22..8d37c10941a 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md @@ -175,9 +175,9 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet2 | P2P_LINK_TO_p4_Ethernet2 | - | 10.255.3.18/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_p2_Ethernet3 | - | 10.255.3.16/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_rr1_Ethernet4 | - | 10.255.3.15/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_p4_Ethernet2 | - | 10.255.3.18/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_p2_Ethernet3 | - | 10.255.3.16/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_rr1_Ethernet4 | - | 10.255.3.15/31 | default | 1500 | False | - | - | ##### ISIS @@ -192,7 +192,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet2 - description P2P_LINK_TO_p4_Ethernet2 + description P2P_p4_Ethernet2 no shutdown mtu 1500 no switchport @@ -209,7 +209,7 @@ interface Ethernet2 isis authentication key 7 ! interface Ethernet3 - description P2P_LINK_TO_p2_Ethernet3 + description P2P_p2_Ethernet3 no shutdown mtu 1500 no switchport @@ -226,7 +226,7 @@ interface Ethernet3 isis authentication key 7 ! interface Ethernet4 - description P2P_LINK_TO_rr1_Ethernet4 + description P2P_rr1_Ethernet4 no shutdown mtu 1500 no switchport @@ -464,13 +464,13 @@ router bgp 65001 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.1.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.1 description pe1 + neighbor 10.255.1.1 description pe1_Loopback0 neighbor 10.255.1.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.2 description pe2 + neighbor 10.255.1.2 description pe2_Loopback0 neighbor 10.255.1.3 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.3 description pe3 + neighbor 10.255.1.3 description pe3_Loopback0 neighbor 10.255.2.1 peer group RR-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate @@ -520,10 +520,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 10.255.2.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg index f6c73156200..e43e3fa3653 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_pe1_Ethernet1 + description P2P_pe1_Ethernet1 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_pe2_Ethernet2 + description P2P_pe2_Ethernet2 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet3 - description P2P_LINK_TO_rr1_Ethernet3 + description P2P_rr1_Ethernet3 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_p2_Ethernet4 + description P2P_p2_Ethernet4 no shutdown mtu 1500 no switchport @@ -117,10 +117,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0102.5500.0001.00 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg index 17615b52683..18b40f8660b 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_pe2_Ethernet1 + description P2P_pe2_Ethernet1 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_pe1_Ethernet2 + description P2P_pe1_Ethernet2 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet3 - description P2P_LINK_TO_rr2_Ethernet3 + description P2P_rr2_Ethernet3 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_p1_Ethernet4 + description P2P_p1_Ethernet4 no shutdown mtu 1500 no switchport @@ -117,10 +117,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0102.5500.0002.00 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg index cdd6d8a5269..cff65c00ce3 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_pe3_Ethernet1 + description P2P_pe3_Ethernet1 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_rr1_Ethernet2 + description P2P_rr1_Ethernet2 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_p4_Ethernet4 + description P2P_p4_Ethernet4 no shutdown mtu 1500 no switchport @@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0102.5500.0003.00 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg index 3e93aa69226..ce95057fe1e 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet2 - description P2P_LINK_TO_rr2_Ethernet2 + description P2P_rr2_Ethernet2 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet3 - description P2P_LINK_TO_pe3_Ethernet3 + description P2P_pe3_Ethernet3 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_p3_Ethernet4 + description P2P_p3_Ethernet4 no shutdown mtu 1500 no switchport @@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.0.4 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0102.5500.0004.00 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg index e53f96cd734..03ed429aef0 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg @@ -32,7 +32,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_p1_Ethernet1 + description P2P_p1_Ethernet1 no shutdown mtu 1500 no switchport @@ -49,7 +49,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_p2_Ethernet2 + description P2P_p2_Ethernet2 no shutdown mtu 1500 no switchport @@ -110,10 +110,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -131,9 +131,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg index 620fc6b0986..18e952c1834 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg @@ -32,7 +32,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_p2_Ethernet1 + description P2P_p2_Ethernet1 no shutdown mtu 1500 no switchport @@ -49,7 +49,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_p1_Ethernet2 + description P2P_p1_Ethernet2 no shutdown mtu 1500 no switchport @@ -110,10 +110,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -131,9 +131,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg index 575c8fd8776..a6ac67b9bab 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg @@ -32,7 +32,7 @@ management security password encryption-key common ! interface Ethernet1 - description P2P_LINK_TO_p3_Ethernet1 + description P2P_p3_Ethernet1 no shutdown mtu 1500 no switchport @@ -57,7 +57,7 @@ interface Ethernet2 ip ospf area 0 ! interface Ethernet3 - description P2P_LINK_TO_p4_Ethernet3 + description P2P_p4_Ethernet3 no shutdown mtu 1500 no switchport @@ -106,10 +106,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.1.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -127,9 +127,9 @@ router bgp 65001 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.2.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 neighbor 10.255.2.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg index bf94917b23b..fc809ddcd82 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet2 - description P2P_LINK_TO_p3_Ethernet2 + description P2P_p3_Ethernet2 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet3 - description P2P_LINK_TO_p1_Ethernet3 + description P2P_p1_Ethernet3 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_rr2_Ethernet4 + description P2P_rr2_Ethernet4 no shutdown mtu 1500 no switchport @@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.2.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -130,13 +130,13 @@ router bgp 65001 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.1.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.1 description pe1 + neighbor 10.255.1.1 description pe1_Loopback0 neighbor 10.255.1.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.2 description pe2 + neighbor 10.255.1.2 description pe2_Loopback0 neighbor 10.255.1.3 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.3 description pe3 + neighbor 10.255.1.3 description pe3_Loopback0 neighbor 10.255.2.2 peer group RR-OVERLAY-PEERS - neighbor 10.255.2.2 description rr2 + neighbor 10.255.2.2 description rr2_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg index 4ac5968c67a..076b7aec410 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg @@ -28,7 +28,7 @@ management security password encryption-key common ! interface Ethernet2 - description P2P_LINK_TO_p4_Ethernet2 + description P2P_p4_Ethernet2 no shutdown mtu 1500 no switchport @@ -45,7 +45,7 @@ interface Ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet3 - description P2P_LINK_TO_p2_Ethernet3 + description P2P_p2_Ethernet3 no shutdown mtu 1500 no switchport @@ -62,7 +62,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_rr1_Ethernet4 + description P2P_rr1_Ethernet4 no shutdown mtu 1500 no switchport @@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1 mpls ip ! mpls ldp - interface disabled default router-id 10.255.2.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -130,13 +130,13 @@ router bgp 65001 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 10.255.1.1 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.1 description pe1 + neighbor 10.255.1.1 description pe1_Loopback0 neighbor 10.255.1.2 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.2 description pe2 + neighbor 10.255.1.2 description pe2_Loopback0 neighbor 10.255.1.3 peer group MPLS-OVERLAY-PEERS - neighbor 10.255.1.3 description pe3 + neighbor 10.255.1.3 description pe3_Loopback0 neighbor 10.255.2.1 peer group RR-OVERLAY-PEERS - neighbor 10.255.2.1 description rr1 + neighbor 10.255.2.1 description rr1_Loopback0 ! address-family ipv4 no neighbor MPLS-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p1.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p1.yml index 8488dc06f62..364db88a015 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p1.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p1.yml @@ -75,7 +75,6 @@ ethernet_interfaces: peer: pe1 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_pe1_Ethernet1 switchport: enabled: false shutdown: false @@ -93,11 +92,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe1_Ethernet1 - name: Ethernet2 peer: pe2 peer_interface: Ethernet2 peer_type: pe - description: P2P_LINK_TO_pe2_Ethernet2 switchport: enabled: false shutdown: false @@ -115,11 +114,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe2_Ethernet2 - name: Ethernet4 peer: p2 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_p2_Ethernet4 switchport: enabled: false shutdown: false @@ -137,11 +136,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p2_Ethernet4 - name: Ethernet3 peer: rr1 peer_interface: Ethernet3 peer_type: rr - description: P2P_LINK_TO_rr1_Ethernet3 switchport: enabled: false shutdown: false @@ -159,5 +158,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr1_Ethernet3 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p2.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p2.yml index f2f8946740d..9ac26a6f82e 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p2.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p2.yml @@ -75,7 +75,6 @@ ethernet_interfaces: peer: pe1 peer_interface: Ethernet2 peer_type: pe - description: P2P_LINK_TO_pe1_Ethernet2 switchport: enabled: false shutdown: false @@ -93,11 +92,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe1_Ethernet2 - name: Ethernet1 peer: pe2 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_pe2_Ethernet1 switchport: enabled: false shutdown: false @@ -115,11 +114,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe2_Ethernet1 - name: Ethernet4 peer: p1 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_p1_Ethernet4 switchport: enabled: false shutdown: false @@ -137,11 +136,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p1_Ethernet4 - name: Ethernet3 peer: rr2 peer_interface: Ethernet3 peer_type: rr - description: P2P_LINK_TO_rr2_Ethernet3 switchport: enabled: false shutdown: false @@ -159,5 +158,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr2_Ethernet3 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p3.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p3.yml index 9f3072f4f83..0b0212f5801 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p3.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p3.yml @@ -75,7 +75,6 @@ ethernet_interfaces: peer: rr1 peer_interface: Ethernet2 peer_type: rr - description: P2P_LINK_TO_rr1_Ethernet2 switchport: enabled: false shutdown: false @@ -93,11 +92,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr1_Ethernet2 - name: Ethernet4 peer: p4 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_p4_Ethernet4 switchport: enabled: false shutdown: false @@ -115,11 +114,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p4_Ethernet4 - name: Ethernet1 peer: pe3 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_pe3_Ethernet1 switchport: enabled: false shutdown: false @@ -137,5 +136,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe3_Ethernet1 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p4.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p4.yml index f2daf8d79dc..c97994f5e80 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p4.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/p4.yml @@ -75,7 +75,6 @@ ethernet_interfaces: peer: rr2 peer_interface: Ethernet2 peer_type: rr - description: P2P_LINK_TO_rr2_Ethernet2 switchport: enabled: false shutdown: false @@ -93,11 +92,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr2_Ethernet2 - name: Ethernet4 peer: p3 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_p3_Ethernet4 switchport: enabled: false shutdown: false @@ -115,11 +114,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p3_Ethernet4 - name: Ethernet3 peer: pe3 peer_interface: Ethernet3 peer_type: pe - description: P2P_LINK_TO_pe3_Ethernet3 switchport: enabled: false shutdown: false @@ -137,5 +136,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_pe3_Ethernet3 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml index 3a41535d8f9..9b7d7771aa4 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 10.255.2.1 peer_group: MPLS-OVERLAY-PEERS peer: rr1 - description: rr1 + description: rr1_Loopback0 - ip_address: 10.255.2.2 peer_group: MPLS-OVERLAY-PEERS peer: rr2 - description: rr2 + description: rr2_Loopback0 vrfs: - name: C1_VRF1 rd: 10.255.1.1:10 @@ -167,7 +167,6 @@ ethernet_interfaces: peer: p1 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_p1_Ethernet1 switchport: enabled: false shutdown: false @@ -185,11 +184,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p1_Ethernet1 - name: Ethernet2 peer: p2 peer_interface: Ethernet2 peer_type: p - description: P2P_LINK_TO_p2_Ethernet2 switchport: enabled: false shutdown: false @@ -207,6 +206,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p2_Ethernet2 - name: Ethernet3.10 peer_type: l3_interface ip_address: 10.0.1.1/29 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml index 60aac491c49..c23cc31841f 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 10.255.2.1 peer_group: MPLS-OVERLAY-PEERS peer: rr1 - description: rr1 + description: rr1_Loopback0 - ip_address: 10.255.2.2 peer_group: MPLS-OVERLAY-PEERS peer: rr2 - description: rr2 + description: rr2_Loopback0 vrfs: - name: C1_VRF1 rd: 10.255.1.2:10 @@ -167,7 +167,6 @@ ethernet_interfaces: peer: p2 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_p2_Ethernet1 switchport: enabled: false shutdown: false @@ -185,11 +184,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p2_Ethernet1 - name: Ethernet2 peer: p1 peer_interface: Ethernet2 peer_type: p - description: P2P_LINK_TO_p1_Ethernet2 switchport: enabled: false shutdown: false @@ -207,6 +206,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p1_Ethernet2 - name: Ethernet4.10 peer_type: l3_interface ip_address: 10.0.1.2/29 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml index 45d172b82b3..ff01ec7dad3 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 10.255.2.1 peer_group: MPLS-OVERLAY-PEERS peer: rr1 - description: rr1 + description: rr1_Loopback0 - ip_address: 10.255.2.2 peer_group: MPLS-OVERLAY-PEERS peer: rr2 - description: rr2 + description: rr2_Loopback0 vrfs: - name: C1_VRF1 rd: 10.255.1.3:10 @@ -167,7 +167,6 @@ ethernet_interfaces: peer: p3 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_p3_Ethernet1 switchport: enabled: false shutdown: false @@ -185,11 +184,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p3_Ethernet1 - name: Ethernet3 peer: p4 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_p4_Ethernet3 switchport: enabled: false shutdown: false @@ -207,6 +206,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p4_Ethernet3 - name: Ethernet2 peer_type: l3_interface ip_address: 10.0.1.9/30 diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr1.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr1.yml index 0f24a581916..e06d0531d73 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr1.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr1.yml @@ -48,19 +48,19 @@ router_bgp: - ip_address: 10.255.1.1 peer_group: MPLS-OVERLAY-PEERS peer: pe1 - description: pe1 + description: pe1_Loopback0 - ip_address: 10.255.1.2 peer_group: MPLS-OVERLAY-PEERS peer: pe2 - description: pe2 + description: pe2_Loopback0 - ip_address: 10.255.1.3 peer_group: MPLS-OVERLAY-PEERS peer: pe3 - description: pe3 + description: pe3_Loopback0 - ip_address: 10.255.2.2 peer_group: RR-OVERLAY-PEERS peer: rr2 - description: rr2 + description: rr2_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -141,7 +141,6 @@ ethernet_interfaces: peer: p1 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_p1_Ethernet3 switchport: enabled: false shutdown: false @@ -159,11 +158,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p1_Ethernet3 - name: Ethernet2 peer: p3 peer_interface: Ethernet2 peer_type: p - description: P2P_LINK_TO_p3_Ethernet2 switchport: enabled: false shutdown: false @@ -181,11 +180,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p3_Ethernet2 - name: Ethernet4 peer: rr2 peer_interface: Ethernet4 peer_type: rr - description: P2P_LINK_TO_rr2_Ethernet4 switchport: enabled: false shutdown: false @@ -203,5 +202,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr2_Ethernet4 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr2.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr2.yml index 887e49fa17d..a5ab5aba861 100644 --- a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr2.yml +++ b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/rr2.yml @@ -48,19 +48,19 @@ router_bgp: - ip_address: 10.255.1.1 peer_group: MPLS-OVERLAY-PEERS peer: pe1 - description: pe1 + description: pe1_Loopback0 - ip_address: 10.255.1.2 peer_group: MPLS-OVERLAY-PEERS peer: pe2 - description: pe2 + description: pe2_Loopback0 - ip_address: 10.255.1.3 peer_group: MPLS-OVERLAY-PEERS peer: pe3 - description: pe3 + description: pe3_Loopback0 - ip_address: 10.255.2.1 peer_group: RR-OVERLAY-PEERS peer: rr1 - description: rr1 + description: rr1_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -141,7 +141,6 @@ ethernet_interfaces: peer: rr1 peer_interface: Ethernet4 peer_type: rr - description: P2P_LINK_TO_rr1_Ethernet4 switchport: enabled: false shutdown: false @@ -159,11 +158,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_rr1_Ethernet4 - name: Ethernet3 peer: p2 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_p2_Ethernet3 switchport: enabled: false shutdown: false @@ -181,11 +180,11 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p2_Ethernet3 - name: Ethernet2 peer: p4 peer_interface: Ethernet2 peer_type: p - description: P2P_LINK_TO_p4_Ethernet2 switchport: enabled: false shutdown: false @@ -203,5 +202,6 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_p4_Ethernet2 metadata: platform: vEOS-lab diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF1.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF1.md index 0da5da694bf..29d9c233bd1 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF1.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF1.md @@ -263,7 +263,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 10 | BLUE-NET | - | | 20 | GREEN-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -276,7 +276,7 @@ vlan 20 name GREEN-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -368,7 +368,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -381,7 +381,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF2.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF2.md index 9481f669b1e..fed8e1917f0 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF2.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF2.md @@ -263,7 +263,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 10 | BLUE-NET | - | | 20 | GREEN-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -276,7 +276,7 @@ vlan 20 name GREEN-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -368,7 +368,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -381,7 +381,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF3.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF3.md index af3abf8a635..5713d7936e6 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF3.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF3.md @@ -263,7 +263,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 10 | BLUE-NET | - | | 30 | ORANGE-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -276,7 +276,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -368,7 +368,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -381,7 +381,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF4.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF4.md index a9f77c4d61e..5e3e19333a3 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF4.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/LEAF4.md @@ -263,7 +263,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 10 | BLUE-NET | - | | 30 | ORANGE-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -276,7 +276,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -368,7 +368,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -381,7 +381,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE1.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE1.md index 13f7c26b6ca..a5c5670c5b5 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE1.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE1.md @@ -264,7 +264,7 @@ vlan internal order ascending range 1006 1199 | 10 | BLUE-NET | - | | 20 | GREEN-NET | - | | 30 | ORANGE-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -280,7 +280,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -399,7 +399,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -412,7 +412,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE2.md b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE2.md index dc79db9e0be..a126702d827 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE2.md +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/documentation/devices/SPINE2.md @@ -264,7 +264,7 @@ vlan internal order ascending range 1006 1199 | 10 | BLUE-NET | - | | 20 | GREEN-NET | - | | 30 | ORANGE-NET | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -280,7 +280,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -399,7 +399,7 @@ interface Port-Channel47 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -412,7 +412,7 @@ interface Port-Channel47 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF1.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF1.cfg index 980dece5c8b..bcf6ef8e878 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF1.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF1.cfg @@ -33,7 +33,7 @@ vlan 20 name GREEN-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -91,7 +91,7 @@ interface Management0 ip address 172.16.100.105/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF2.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF2.cfg index b8cc4f73ff0..d11dfebc7fb 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF2.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF2.cfg @@ -33,7 +33,7 @@ vlan 20 name GREEN-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -91,7 +91,7 @@ interface Management0 ip address 172.16.100.106/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF3.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF3.cfg index 7b30481b4fd..0dda61ca1d7 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF3.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF3.cfg @@ -33,7 +33,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -91,7 +91,7 @@ interface Management0 ip address 172.16.100.107/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF4.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF4.cfg index 843ae4f607a..9f91c1fd549 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF4.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/LEAF4.cfg @@ -33,7 +33,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -91,7 +91,7 @@ interface Management0 ip address 172.16.100.108/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE1.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE1.cfg index 078a58a3c71..c9e4275e343 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE1.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE1.cfg @@ -36,7 +36,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -117,7 +117,7 @@ interface Management0 ip address 172.16.100.101/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE2.cfg b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE2.cfg index 5672a159583..90752bb44da 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE2.cfg +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/configs/SPINE2.cfg @@ -36,7 +36,7 @@ vlan 30 name ORANGE-NET ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -117,7 +117,7 @@ interface Management0 ip address 172.16.100.102/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml index 689c6f7d1ae..4d14cfca557 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -75,7 +75,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml index 153b41b70dc..75310f12866 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -75,7 +75,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml index 6d472298405..8db7b84de10 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -75,7 +75,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml index 74e6615af65..b33c74ce8cd 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -75,7 +75,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE1.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE1.yml index aa857265304..2a728155343 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE1.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE1.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -78,7 +78,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE2.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE2.yml index 82edf81b84d..ce8ce792a8e 100644 --- a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE2.yml +++ b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/SPINE2.yml @@ -64,7 +64,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 @@ -78,7 +78,7 @@ vlans: tenant: MY_FABRIC vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md index 5d74f0ffd78..3d59fff5948 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md @@ -259,12 +259,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -283,11 +283,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -297,11 +297,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -326,22 +326,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_dc1-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_dc1-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -469,10 +469,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -516,27 +516,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.96/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.96/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.96/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -774,12 +774,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan4093 neighbor 10.255.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.0 remote-as 65100 neighbor 10.255.255.0 description dc1-spine1_Ethernet1 @@ -832,7 +832,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -841,7 +841,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md index 105e875d986..e9ab0308f99 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md @@ -259,12 +259,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -283,11 +283,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -297,11 +297,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -326,22 +326,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_dc1-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.5/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_dc1-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -469,10 +469,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -516,27 +516,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.97/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.97/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.97/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -774,12 +774,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan4093 neighbor 10.255.255.4 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.4 remote-as 65100 neighbor 10.255.255.4 description dc1-spine1_Ethernet2 @@ -832,7 +832,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -841,7 +841,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md index 21456c7e555..beb356d454e 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md @@ -259,12 +259,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -283,11 +283,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -297,11 +297,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -326,22 +326,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_dc1-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_dc1-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -469,10 +469,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -516,27 +516,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.100/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.100/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.100/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -774,12 +774,12 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan4093 neighbor 10.255.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.8 remote-as 65100 neighbor 10.255.255.8 description dc1-spine1_Ethernet3 @@ -832,7 +832,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -841,7 +841,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md index ebc3c047e63..a805ae9e74f 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md @@ -259,12 +259,12 @@ vlan internal order ascending range 1006 1199 | 12 | VRF10_VLAN12 | - | | 21 | VRF11_VLAN21 | - | | 22 | VRF11_VLAN22 | - | -| 3009 | MLAG_iBGP_VRF10 | MLAG | -| 3010 | MLAG_iBGP_VRF11 | MLAG | +| 3009 | MLAG_L3_VRF_VRF10 | MLAG | +| 3010 | MLAG_L3_VRF_VRF11 | MLAG | | 3401 | L2_VLAN3401 | - | | 3402 | L2_VLAN3402 | - | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -283,11 +283,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -297,11 +297,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -326,22 +326,22 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-spine1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-spine2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_dc1-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.13/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_dc1-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -469,10 +469,10 @@ interface Loopback11 | Vlan12 | VRF10_VLAN12 | VRF10 | - | False | | Vlan21 | VRF11_VLAN21 | VRF11 | - | False | | Vlan22 | VRF11_VLAN22 | VRF11 | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf VRF10 | VRF10 | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf VRF11 | VRF11 | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_VRF10 | VRF10 | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_VRF11 | VRF11 | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -516,27 +516,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.101/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.101/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.101/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -774,12 +774,12 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan4093 neighbor 10.255.255.12 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.12 remote-as 65100 neighbor 10.255.255.12 description dc1-spine1_Ethernet4 @@ -832,7 +832,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -841,7 +841,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3010 redistribute connected ``` diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md index c8a1ab8ef00..ff54a1d8a85 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md @@ -216,38 +216,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-leaf1a_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-leaf1b_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc1-leaf2a_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc1-leaf2b_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_dc1-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description P2P_dc1-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.4/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_dc1-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.8/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_dc1-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -412,16 +412,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.1 remote-as 65101 neighbor 10.255.255.1 description dc1-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md index 75baf92ba81..11401cc17a4 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md @@ -216,38 +216,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_dc1-leaf1a_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_dc1-leaf1b_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_dc1-leaf2a_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_dc1-leaf2b_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_dc1-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description P2P_dc1-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.6/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_dc1-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.10/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_dc1-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -412,16 +412,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.3 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.3 remote-as 65101 neighbor 10.255.255.3 description dc1-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg index 39c484ff166..535306f8e11 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg @@ -42,11 +42,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -56,11 +56,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -95,14 +95,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_dc1-spine1_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_dc1-spine2_Ethernet1 no shutdown mtu 1500 no switchport @@ -181,27 +181,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.96/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.96/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.96/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -283,12 +283,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan4093 neighbor 10.255.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.0 remote-as 65100 neighbor 10.255.255.0 description dc1-spine1_Ethernet1 @@ -341,7 +341,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3009 redistribute connected ! vrf VRF11 @@ -350,7 +350,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.97 description dc1-leaf1b + neighbor 10.255.1.97 description dc1-leaf1b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg index 6da16ec608a..681a10812e9 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg @@ -42,11 +42,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -56,11 +56,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -95,14 +95,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_dc1-spine1_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.5/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_dc1-spine2_Ethernet2 no shutdown mtu 1500 no switchport @@ -181,27 +181,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.97/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.97/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.97/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -283,12 +283,12 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan4093 neighbor 10.255.255.4 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.4 remote-as 65100 neighbor 10.255.255.4 description dc1-spine1_Ethernet2 @@ -341,7 +341,7 @@ router bgp 65101 route-target export evpn 10:10 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3009 redistribute connected ! vrf VRF11 @@ -350,7 +350,7 @@ router bgp 65101 route-target export evpn 11:11 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.96 description dc1-leaf1a + neighbor 10.255.1.96 description dc1-leaf1a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg index f1d9a696f77..fb929351393 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg @@ -42,11 +42,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -56,11 +56,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -95,14 +95,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_dc1-spine1_Ethernet3 no shutdown mtu 1500 no switchport ip address 10.255.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_dc1-spine2_Ethernet3 no shutdown mtu 1500 no switchport @@ -181,27 +181,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.100/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.100/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.100/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -283,12 +283,12 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan4093 neighbor 10.255.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.8 remote-as 65100 neighbor 10.255.255.8 description dc1-spine1_Ethernet3 @@ -341,7 +341,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3009 redistribute connected ! vrf VRF11 @@ -350,7 +350,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.101 description dc1-leaf2b + neighbor 10.255.1.101 description dc1-leaf2b_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg index ac6fc630957..05bb298af42 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg @@ -42,11 +42,11 @@ vlan 22 name VRF11_VLAN22 ! vlan 3009 - name MLAG_iBGP_VRF10 + name MLAG_L3_VRF_VRF10 trunk group MLAG ! vlan 3010 - name MLAG_iBGP_VRF11 + name MLAG_L3_VRF_VRF11 trunk group MLAG ! vlan 3401 @@ -56,11 +56,11 @@ vlan 3402 name L2_VLAN3402 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -95,14 +95,14 @@ interface Port-Channel8 mlag 8 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_dc1-spine1_Ethernet4 no shutdown mtu 1500 no switchport ip address 10.255.255.13/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_dc1-spine2_Ethernet4 no shutdown mtu 1500 no switchport @@ -181,27 +181,27 @@ interface Vlan22 ip address virtual 10.10.22.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf VRF10 + description MLAG_L3_VRF_VRF10 no shutdown mtu 1500 vrf VRF10 ip address 10.255.1.101/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf VRF11 + description MLAG_L3_VRF_VRF11 no shutdown mtu 1500 vrf VRF11 ip address 10.255.1.101/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.1.101/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -283,12 +283,12 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65100 - neighbor 10.255.0.1 description dc1-spine1 + neighbor 10.255.0.1 description dc1-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65100 - neighbor 10.255.0.2 description dc1-spine2 + neighbor 10.255.0.2 description dc1-spine2_Loopback0 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan4093 neighbor 10.255.255.12 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.12 remote-as 65100 neighbor 10.255.255.12 description dc1-spine1_Ethernet4 @@ -341,7 +341,7 @@ router bgp 65102 route-target export evpn 10:10 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3009 redistribute connected ! vrf VRF11 @@ -350,7 +350,7 @@ router bgp 65102 route-target export evpn 11:11 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.1.100 description dc1-leaf2a + neighbor 10.255.1.100 description dc1-leaf2a_Vlan3010 redistribute connected ! end diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine1.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine1.cfg index 9d41fda2cc0..7670f95b0d3 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine1.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine1.cfg @@ -30,28 +30,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_dc1-leaf1a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description P2P_dc1-leaf1b_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.4/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_dc1-leaf2a_Ethernet1 no shutdown mtu 1500 no switchport ip address 10.255.255.8/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_dc1-leaf2b_Ethernet1 no shutdown mtu 1500 no switchport @@ -103,16 +103,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.1 remote-as 65101 neighbor 10.255.255.1 description dc1-leaf1a_Ethernet1 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine2.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine2.cfg index 2370f2a3e8f..2b5d251c23e 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine2.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-spine2.cfg @@ -30,28 +30,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_dc1-leaf1a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description P2P_dc1-leaf1b_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.6/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_dc1-leaf2a_Ethernet2 no shutdown mtu 1500 no switchport ip address 10.255.255.10/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_dc1-leaf2b_Ethernet2 no shutdown mtu 1500 no switchport @@ -103,16 +103,16 @@ router bgp 65100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.0.3 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.3 remote-as 65101 - neighbor 10.255.0.3 description dc1-leaf1a + neighbor 10.255.0.3 description dc1-leaf1a_Loopback0 neighbor 10.255.0.4 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.4 remote-as 65101 - neighbor 10.255.0.4 description dc1-leaf1b + neighbor 10.255.0.4 description dc1-leaf1b_Loopback0 neighbor 10.255.0.5 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.5 remote-as 65102 - neighbor 10.255.0.5 description dc1-leaf2a + neighbor 10.255.0.5 description dc1-leaf2a_Loopback0 neighbor 10.255.0.6 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.6 remote-as 65102 - neighbor 10.255.0.6 description dc1-leaf2b + neighbor 10.255.0.6 description dc1-leaf2b_Loopback0 neighbor 10.255.255.3 peer group IPv4-UNDERLAY-PEERS neighbor 10.255.255.3 remote-as 65101 neighbor 10.255.255.3 description dc1-leaf1a_Ethernet2 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml index d65858b5754..2dfdcc6ef91 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Vlan4093 - ip_address: 10.255.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3009 - name: VRF11 rd: 10.255.0.3:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -235,12 +235,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -250,7 +250,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -261,7 +261,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -273,12 +273,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.96/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.96/31 @@ -319,7 +319,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.96/31 @@ -376,7 +376,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_dc1-spine1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -386,7 +386,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_dc1-spine2_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml index d52c1544b10..5cfe51f373e 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Vlan4093 - ip_address: 10.255.255.4 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3009 - name: VRF11 rd: 10.255.0.4:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -235,12 +235,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -250,7 +250,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -261,7 +261,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -273,12 +273,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.97/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.97/31 @@ -319,7 +319,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.97/31 @@ -376,7 +376,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_dc1-spine1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -386,7 +386,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_dc1-spine2_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml index 64714145a91..0d189aa4ce8 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Vlan4093 - ip_address: 10.255.255.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3009 - name: VRF11 rd: 10.255.0.5:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -235,12 +235,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -250,7 +250,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -261,7 +261,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -273,12 +273,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.100/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.100/31 @@ -319,7 +319,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.100/31 @@ -376,7 +376,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_dc1-spine1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -386,7 +386,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_dc1-spine2_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml index 8854254b893..e38ee8e9b27 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Vlan4093 - ip_address: 10.255.255.12 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3009 - name: VRF11 rd: 10.255.0.6:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -235,12 +235,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -250,7 +250,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -261,7 +261,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -273,12 +273,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.101/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.101/31 @@ -319,7 +319,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.101/31 @@ -376,7 +376,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_dc1-spine1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -386,7 +386,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_dc1-spine2_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine1.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine1.yml index 7f7af36cc92..b72a19a72bb 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine1.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine1.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_dc1-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -157,7 +157,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description: P2P_dc1-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -167,7 +167,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_dc1-leaf2a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_dc1-leaf2b_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine2.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine2.yml index 4b8627b5f63..e16a09ccd02 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine2.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-spine2.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_dc1-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -157,7 +157,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description: P2P_dc1-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -167,7 +167,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_dc1-leaf2a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_dc1-leaf2b_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/galaxy.yml b/ansible_collections/arista/avd/galaxy.yml index 0935f11cf13..364c700ea31 100644 --- a/ansible_collections/arista/avd/galaxy.yml +++ b/ansible_collections/arista/avd/galaxy.yml @@ -9,7 +9,7 @@ namespace: arista name: avd # The version of the collection. Must be compatible with semantic versioning -version: 5.0.0-dev7 +version: 5.0.0-dev8 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/ansible_collections/arista/avd/media/wan_direct_ha_no_lan.png b/ansible_collections/arista/avd/media/wan_direct_ha_no_lan.png index a432ff94970..4cb249fbee0 100644 Binary files a/ansible_collections/arista/avd/media/wan_direct_ha_no_lan.png and b/ansible_collections/arista/avd/media/wan_direct_ha_no_lan.png differ diff --git a/ansible_collections/arista/avd/media/wan_ebgp_lan_ha.png b/ansible_collections/arista/avd/media/wan_ebgp_lan_ha.png index 064ca774ffb..fc5cf666919 100644 Binary files a/ansible_collections/arista/avd/media/wan_ebgp_lan_ha.png and b/ansible_collections/arista/avd/media/wan_ebgp_lan_ha.png differ diff --git a/ansible_collections/arista/avd/media/wan_ebgp_lan_ha_direct.png b/ansible_collections/arista/avd/media/wan_ebgp_lan_ha_direct.png index 6607b8ae323..561855696f2 100644 Binary files a/ansible_collections/arista/avd/media/wan_ebgp_lan_ha_direct.png and b/ansible_collections/arista/avd/media/wan_ebgp_lan_ha_direct.png differ diff --git a/ansible_collections/arista/avd/media/wan_ebgp_lan_single_router.png b/ansible_collections/arista/avd/media/wan_ebgp_lan_single_router.png index b77bd592644..3c19b65a12c 100644 Binary files a/ansible_collections/arista/avd/media/wan_ebgp_lan_single_router.png and b/ansible_collections/arista/avd/media/wan_ebgp_lan_single_router.png differ diff --git a/ansible_collections/arista/avd/media/wan_lan_common.png b/ansible_collections/arista/avd/media/wan_lan_common.png index dc580ee4ef5..6bfa177b2d8 100644 Binary files a/ansible_collections/arista/avd/media/wan_lan_common.png and b/ansible_collections/arista/avd/media/wan_lan_common.png differ diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md index a10de91e142..45c329a6987 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md @@ -80,11 +80,11 @@ Global timeout: 10 seconds ```eos ! +tacacs-server timeout 10 tacacs-server host 10.10.10.157 single-connection vrf mgt key 7 tacacs-server host 10.10.10.249 timeout 23 key 7 tacacs-server host 10.10.10.158 key 7 tacacs-server host 10.10.10.159 key 8a -tacacs-server timeout 10 ``` ### RADIUS Server diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md index 38c1237cad6..0f8fb280a02 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md @@ -64,14 +64,14 @@ interface Management1 ! management tech-support policy show tech-support - exclude command show platform fap ip route - exclude command show platform fap ipv6 route exclude command show ip bgp vrf all + exclude command show ip route vrf all detail exclude command show ipv6 bgp vrf all + exclude command show ipv6 route vrf all detail exclude command show kernel ip route vrf all exclude command show kernel ipv6 route vrf all - exclude command show ip route vrf all detail - exclude command show ipv6 route vrf all detail + exclude command show platform fap ip route + exclude command show platform fap ipv6 route exclude command json show version detail include command show version detail | grep TerminAttr exit diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md index a99b9254689..e6e57d396a3 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md @@ -64,14 +64,14 @@ interface Management1 ```eos ! +match-list input string molecule + 10 match regex ^.*MOLECULE.*$ + 20 match regex ^.*TESTING.*$ +! match-list input prefix-ipv4 molecule_v4 match prefix-ipv4 10.10.10.0/24 match prefix-ipv4 10.10.20.0/24 ! match-list input prefix-ipv6 molecule_v6 match prefix-ipv6 2001:0DB8::/32 -! -match-list input string molecule - 10 match regex ^.*MOLECULE.*$ - 20 match regex ^.*TESTING.*$ ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md index 9d94a4ba77d..ac25a28047a 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md @@ -114,33 +114,6 @@ interface Management1 ```eos ! monitor connectivity - interval 5 - no shutdown - interface set GLOBAL_SET Ethernet1-4 - interface set HOST_SET Loopback2-4, Loopback10-12 - local-interfaces GLOBAL_SET address-only default - ! - host server1 - description - server1_connectivity_monitor - local-interfaces HOST_SET address-only - ip 10.10.10.1 - url https://server1.local.com - ! - host server2 - description - server2_connectivity_monitor - local-interfaces HOST_SET address-only - ip 10.10.10.2 - url https://server2.local.com - ! - host server3 - description - server3_connectivity_monitor - local-interfaces HOST_SET - ip 10.10.10.3 - ! - host server4 vrf blue interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32 local-interfaces VRF_GLOBAL_SET default @@ -160,12 +133,13 @@ monitor connectivity url https://server5.local.com ! host server6 + ! vrf red interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32 interface set VRF_HOST_SET Loopback12-14, 19-23 - local-interfaces VRF_GLOBAL_SET address-only default description vrf_connectivity_monitor + local-interfaces VRF_GLOBAL_SET address-only default ! host server2 description @@ -173,5 +147,33 @@ monitor connectivity local-interfaces VRF_HOST_SET address-only ip 10.10.20.1 url https://server2.local.com + ! vrf yellow + interval 5 + no shutdown + interface set GLOBAL_SET Ethernet1-4 + interface set HOST_SET Loopback2-4, Loopback10-12 + local-interfaces GLOBAL_SET address-only default + ! + host server1 + description + server1_connectivity_monitor + local-interfaces HOST_SET address-only + ip 10.10.10.1 + url https://server1.local.com + ! + host server2 + description + server2_connectivity_monitor + local-interfaces HOST_SET address-only + ip 10.10.10.2 + url https://server2.local.com + ! + host server3 + description + server3_connectivity_monitor + local-interfaces HOST_SET + ip 10.10.10.3 + ! + host server4 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md index bf377f01d64..4141714e799 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md @@ -101,17 +101,17 @@ interface Management1 monitor session myMonitoringSession1 source Ethernet0 ipv6 access-group ipv6ACL monitor session myMonitoringSession1 source Ethernet5 both ip access-group ipv4ACL priority 10 monitor session myMonitoringSession1 destination Ethernet48 -monitor session myMonitoringSession1 encapsulation gre metadata tx -monitor session myMonitoringSession1 header remove size 32 monitor session myMonitoringSession1 truncate +monitor session myMonitoringSession1 header remove size 32 +monitor session myMonitoringSession1 encapsulation gre metadata tx +monitor session myMonitoringSession2 ip access-group ipv4ACL monitor session myMonitoringSession2 source Ethernet3, Ethernet5 rx monitor session myMonitoringSession2 source Ethernet10-15 rx monitor session myMonitoringSession2 source Ethernet12 rx monitor session myMonitoringSession2 source Ethernet18 tx mac access-group macACL priority 100 monitor session myMonitoringSession2 destination Cpu monitor session myMonitoringSession2 destination Ethernet50 -monitor session myMonitoringSession2 encapsulation gre metadata tx -monitor session myMonitoringSession2 ip access-group ipv4ACL monitor session myMonitoringSession2 sample 50 +monitor session myMonitoringSession2 encapsulation gre metadata tx monitor session myMonitoringSession3 source Ethernet20 both ip access-group ipv4ACL priority 10 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md index 7bbbd6d4300..d8608e69a60 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md @@ -56,6 +56,6 @@ interface Management1 mpls ip ! mpls ldp - interface disabled default router-id 192.168.1.2 + interface disabled default ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md index 6652c779285..873a6158a63 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md @@ -117,10 +117,10 @@ interface Loopback0 mpls ip ! mpls ldp - interface disabled default router-id 192.168.1.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! mpls icmp fragmentation-needed tunneling ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md index fb66c809fd3..121a5efcd3f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md @@ -59,13 +59,13 @@ patch panel connector interface recovery review delay 10 900 connector interface patch bgp vpws remote-failure errdisable ! - patch TEN_B_site2_site5_eline - connector 1 interface Ethernet5 - connector 2 pseudowire bgp vpws TENANT_A pseudowire TEN_B_site2_site5_eline - ! patch TEN_A_site2_site5_eline shutdown connector 1 interface Ethernet6 dot1q vlan 123 connector 2 pseudowire ldp LDP_PW_1 ! + patch TEN_B_site2_site5_eline + connector 1 interface Ethernet5 + connector 2 pseudowire bgp vpws TENANT_A pseudowire TEN_B_site2_site5_eline + ! ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md index be0899c6ff6..a985d67b1ea 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md @@ -52,28 +52,28 @@ PTP Profile: g8275.1 ```eos ! ptp clock-identity 11:11:11:11:11:11 -ptp source ip 1.1.2.3 +ptp domain 17 +ptp message-type event dscp 46 default +ptp message-type general dscp 36 default +ptp mode boundary one-step ptp priority1 101 ptp priority2 102 ptp profile g8275.1 +ptp source ip 1.1.2.3 ptp ttl 12 -ptp domain 17 -ptp message-type general dscp 36 default -ptp message-type event dscp 46 default -ptp mode boundary one-step ptp forward-unicast ptp monitor threshold offset-from-master 11 ptp monitor threshold mean-path-delay 12 -ptp monitor threshold offset-from-master 13 nanoseconds drop ptp monitor threshold mean-path-delay 14 nanoseconds drop -ptp monitor threshold missing-message announce 101 intervals -ptp monitor threshold missing-message follow-up 102 intervals +ptp monitor threshold offset-from-master 13 nanoseconds drop ptp monitor threshold missing-message sync 103 intervals +ptp monitor threshold missing-message follow-up 102 intervals +ptp monitor threshold missing-message announce 101 intervals ptp monitor sequence-id -ptp monitor threshold missing-message announce 201 sequence-ids -ptp monitor threshold missing-message delay-resp 202 sequence-ids -ptp monitor threshold missing-message follow-up 203 sequence-ids ptp monitor threshold missing-message sync 204 sequence-ids +ptp monitor threshold missing-message follow-up 203 sequence-ids +ptp monitor threshold missing-message delay-resp 202 sequence-ids +ptp monitor threshold missing-message announce 201 sequence-ids ``` ## Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md index 123908ef6a6..dbd61fd888e 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md @@ -699,8 +699,8 @@ Priority Flow Control is **Off** on all interfaces. ```eos ! priority-flow-control all off -priority-flow-control pause watchdog action no-drop priority-flow-control pause watchdog default timeout 0.05 -priority-flow-control pause watchdog default polling-interval 10.001 priority-flow-control pause watchdog default recovery-time 1.22 +priority-flow-control pause watchdog default polling-interval 10.001 +priority-flow-control pause watchdog action no-drop ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length-notifying.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length-notifying.md index 8907e1f98da..e5a1c9beff1 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length-notifying.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length-notifying.md @@ -49,6 +49,6 @@ interface Management1 ```eos ! queue-monitor length -queue-monitor length default threshold 100 no queue-monitor length notifying +queue-monitor length default threshold 100 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length.md index 4da507e363d..9c02c148a41 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/queue-monitor-length.md @@ -49,9 +49,10 @@ interface Management1 ```eos ! queue-monitor length -queue-monitor length default thresholds 100 10 -queue-monitor length log 100 queue-monitor length notifying queue-monitor length tx-latency +queue-monitor length default thresholds 100 10 queue-monitor length cpu thresholds 200000 100000 +! +queue-monitor length log 100 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology-2.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology-2.md new file mode 100644 index 00000000000..4db2e262568 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology-2.md @@ -0,0 +1,54 @@ +# router-adaptive-virtual-topology-2 + +## Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) +- [Routing](#routing) + - [Router Adaptive Virtual Topology](#router-adaptive-virtual-topology) + +## Management + +### Management Interfaces + +#### Management Interfaces Summary + +##### IPv4 + +| Management Interface | Description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | OOB_MANAGEMENT | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | + +##### IPv6 + +| Management Interface | Description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | OOB_MANAGEMENT | oob | MGMT | - | - | + +#### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 +``` + +## Routing + +### Router Adaptive Virtual Topology + +#### Router Adaptive Virtual Topology Summary + +Topology role: edge + +VXLAN gateway: Enabled + +#### Router Adaptive Virtual Topology Configuration + +```eos +! +router adaptive-virtual-topology + topology role edge gateway vxlan +``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology.md index 42dc441f177..4e40f827e68 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-adaptive-virtual-topology.md @@ -41,7 +41,7 @@ interface Management1 #### Router Adaptive Virtual Topology Summary -Topology role: transit region +Topology role: pathfinder | Hierarchy | Name | ID | | --------- | ---- | -- | @@ -94,7 +94,7 @@ Topology role: transit region ```eos ! router adaptive-virtual-topology - topology role transit region + topology role pathfinder region North_America id 1 zone Canada id 2 site Ottawa id 99 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-additional-paths.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-additional-paths.md new file mode 100644 index 00000000000..ec6cd5480d8 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-additional-paths.md @@ -0,0 +1,63 @@ +# router-bgp-additional-paths + +## Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) +- [Routing](#routing) + - [Router BGP](#router-bgp) + +## Management + +### Management Interfaces + +#### Management Interfaces Summary + +##### IPv4 + +| Management Interface | Description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | OOB_MANAGEMENT | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | + +##### IPv6 + +| Management Interface | Description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | OOB_MANAGEMENT | oob | MGMT | - | - | + +#### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 +``` + +## Routing + +### Router BGP + +ASN Notation: asplain + +#### Router BGP Summary + +| BGP AS | Router ID | +| ------ | --------- | +| 65101 | 192.168.255.42 | + +| BGP Tuning | +| ---------- | +| no bgp additional-paths receive | +| bgp additional-paths send ecmp limit 30 | + +#### Router BGP Device Configuration + +```eos +! +router bgp 65101 + router-id 192.168.255.42 + no bgp additional-paths receive + bgp additional-paths send ecmp limit 30 +``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md index 54f7fdc6837..a4b663331bd 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md @@ -98,6 +98,13 @@ ASN Notation: asplain | ---------- | -------- | ------------- | | EVPN-OVERLAY-PEERS | True | default | +##### EVPN Neighbors + +| Neighbor | Activate | Encapsulation | +| -------- | -------- | ------------- | +| 192.168.255.3 | True | default | +| 192.168.255.4 | False | default | + ##### EVPN Neighbor Default Encapsulation | Neighbor Default Encapsulation | Next-hop-self Source Interface | diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md index 38325299009..bc092a4d884 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md @@ -117,6 +117,24 @@ ASN Notation: asplain | ADDITIONAL-PATH-PG-6 | True | default | | EVPN-OVERLAY-PEERS | True | vxlan | | MLAG-IPv4-UNDERLAY-PEER | False | default | +| TEST-ENCAPSULATION | True | mpls | +| TEST-ENCAPSULATION-2 | True | path-selection | + +##### EVPN Neighbors + +| Neighbor | Activate | Encapsulation | +| -------- | -------- | ------------- | +| 10.100.100.1 | True | default | +| 10.100.100.2 | True | default | +| 10.100.100.3 | True | default | +| 10.100.100.4 | True | path-selection | +| 10.100.100.5 | True | mpls | + +##### EVPN Neighbor Default Encapsulation + +| Neighbor Default Encapsulation | Next-hop-self Source Interface | +| ------------------------------ | ------------------------------ | +| path-selection | - | ##### EVPN Host Flapping Settings @@ -257,6 +275,7 @@ router bgp 65101 bgp next-hop-unchanged host-flap detection window 10 threshold 1 expiry timeout 3 seconds domain identifier 65101:0 + neighbor default encapsulation path-selection neighbor ADDITIONAL-PATH-PG-1 activate neighbor ADDITIONAL-PATH-PG-1 additional-paths receive neighbor ADDITIONAL-PATH-PG-1 additional-paths send any @@ -275,12 +294,20 @@ router bgp 65101 neighbor EVPN-OVERLAY-PEERS domain remote neighbor EVPN-OVERLAY-PEERS encapsulation vxlan no neighbor MLAG-IPv4-UNDERLAY-PEER activate + neighbor TEST-ENCAPSULATION activate + neighbor TEST-ENCAPSULATION encapsulation mpls + neighbor TEST-ENCAPSULATION-2 activate + neighbor TEST-ENCAPSULATION-2 encapsulation path-selection neighbor 10.100.100.1 activate neighbor 10.100.100.1 default-route neighbor 10.100.100.2 activate neighbor 10.100.100.2 default-route route-map RM_DEFAULT_ROUTE neighbor 10.100.100.3 activate neighbor 10.100.100.3 default-route rcf RCF_DEFAULT_ROUTE() + neighbor 10.100.100.4 activate + neighbor 10.100.100.4 encapsulation path-selection + neighbor 10.100.100.5 activate + neighbor 10.100.100.5 encapsulation mpls next-hop resolution disabled neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain route import ethernet-segment ip mass-withdraw diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md new file mode 100644 index 00000000000..a416c8b5e0a --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md @@ -0,0 +1,106 @@ +# router-bgp-ipv4-labeled-unicast + +## Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) +- [Routing](#routing) + - [Router BGP](#router-bgp) + +## Management + +### Management Interfaces + +#### Management Interfaces Summary + +##### IPv4 + +| Management Interface | Description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | OOB_MANAGEMENT | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | + +##### IPv6 + +| Management Interface | Description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | OOB_MANAGEMENT | oob | MGMT | - | - | + +#### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 +``` + +## Routing + +### Router BGP + +ASN Notation: asplain + +#### Router BGP Summary + +| BGP AS | Router ID | +| ------ | --------- | +| 65101 | - | + +#### Router BGP IPv4 Labeled Unicast + +##### General Settings + +| Settings | Value | +| -------- | ----- | +| Update wait-for-convergence | Enabled | +| Next-hop Unchanged | True | +| Label local-termination | implicit-null | + +##### IPv4 BGP-LU Peer-groups + +| Peer-group | Activate | Route-map In | Route-map Out | RCF In | RCF Out | +| ---------- | -------- | ------------ | ------------- | ------ | ------- | +| PG-BGP-LU | True | - | - | - | - | + +##### IPv4 BGP-LU Neighbors + +| Neighbor | Activate | Route-map In | Route-map Out | RCF In | RCF Out | +| -------- | -------- | ------------ | ------------- | ------ | ------- | +| 198.51.100.1 | True | - | - | RCF_TEST(ARGS) | - | +| 198.51.100.2 | False | - | RM_OUT_TEST | - | - | + +#### Router BGP Device Configuration + +```eos +! +router bgp 65101 + ! + address-family ipv4 labeled-unicast + update wait-for-convergence + bgp missing-policy include community-list direction in action deny + bgp additional-paths receive + bgp additional-paths send ecmp limit 20 + bgp next-hop-unchanged + next-hop resolution ribs tunnel-rib colored system-colored-tunnel-rib tunnel-rib test-rib system-connected + neighbor PG-BGP-LU activate + neighbor 198.51.100.1 activate + neighbor 198.51.100.1 additional-paths receive + neighbor 198.51.100.1 graceful-restart + neighbor 198.51.100.1 rcf in RCF_TEST(ARGS) + neighbor 198.51.100.1 additional-paths send ecmp + neighbor 198.51.100.1 maximum-advertised-routes 0 + no neighbor 198.51.100.2 activate + neighbor 198.51.100.2 graceful-restart-helper stale-route route-map RM_STALE + neighbor 198.51.100.2 route-map RM_OUT_TEST out + neighbor 198.51.100.2 next-hop-unchanged + neighbor 198.51.100.2 aigp-session + neighbor 198.51.100.2 multi-path + network 203.0.113.0/25 route-map RM-TEST + network 203.0.113.128/25 + label local-termination implicit-null + tunnel source-protocol isis segment-routing + tunnel source-protocol ldp rcf TEST(ARGS) + aigp-session confederation + aigp-session ebgp +``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-internet-exit.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-internet-exit.md index 8b1a8596519..66f19fcfa2a 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-internet-exit.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-internet-exit.md @@ -58,31 +58,30 @@ interface Management1 ```eos ! router internet-exit - ! - exit-group eg_01 - ! - exit-group eg_02 - fib-default - ! - exit-group eg_03 - local connection eg_03_lo_01 - local connection eg_03_lo_02 - fib-default - ! - exit-group eg_04 - local connection eg_04_lo_01 - local connection eg_04_lo_02 - local connection eg_04_lo_03 - ! - policy po_01 - exit-group po_eg_01_02 - exit-group po_eg_01_04 - exit-group po_eg_01_01 - exit-group po_eg_01_03 - exit-group system-default-exit-group - ! - policy po_02 - ! - policy po_03 - exit-group po_eg_03_01 + exit-group eg_01 + ! + exit-group eg_02 + fib-default + ! + exit-group eg_03 + local connection eg_03_lo_01 + local connection eg_03_lo_02 + fib-default + ! + exit-group eg_04 + local connection eg_04_lo_01 + local connection eg_04_lo_02 + local connection eg_04_lo_03 + ! + policy po_01 + exit-group po_eg_01_02 + exit-group po_eg_01_04 + exit-group po_eg_01_01 + exit-group po_eg_01_03 + exit-group system-default-exit-group + ! + policy po_02 + ! + policy po_03 + exit-group po_eg_03_01 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-path-selection.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-path-selection.md index 3a8f855c36a..dc4e6027136 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-path-selection.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-path-selection.md @@ -223,16 +223,16 @@ router path-selection load-balance policy LB-EMPTY ! load-balance policy LB-P-1 - hop count lowest loss-rate 17 + hop count lowest path-group PG-5 path-group PG-2 priority 42 path-group PG-4 priority 42 path-group PG-3 priority 666 ! load-balance policy LB-P-2 - jitter 666 latency 42 + jitter 666 loss-rate 42.42 path-group PG-1 priority 1 path-group PG-3 @@ -240,6 +240,7 @@ router path-selection policy DPS-P-1 default-match load-balance LB-P-1 + ! 42 application-profile AP-3 load-balance LB-P-1 ! @@ -249,6 +250,7 @@ router path-selection ! policy DPS-P-3 42 application-profile AP-2 + ! 66 application-profile AP-1 load-balance LB-P-1 ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md index 2a84dadc254..89178293a5d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md @@ -79,6 +79,7 @@ BFD enabled: True ! router pim sparse-mode ipv4 + ssm range standard bfd rp address 10.238.1.161 239.12.12.12/32 priority 20 rp address 10.238.1.161 239.12.12.13/32 priority 20 @@ -91,7 +92,6 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.17/32 rp address 10.238.1.161 access-list RP_ACL3 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 - ssm range standard ! vrf MCAST_VRF1 ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/sflow.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/sflow.md index bf96eedd8d5..c8b9626a812 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/sflow.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/sflow.md @@ -98,7 +98,6 @@ sFlow hardware accelerated Sample Rate: 1024 ```eos ! sflow sample dangerous 1000 -sflow sample input subinterface sflow polling-interval 10 sflow vrf AAA destination 10.6.75.62 123 sflow vrf AAA destination 10.6.75.63 333 @@ -114,6 +113,7 @@ sflow vrf MGMT source-interface Ethernet3 sflow destination 10.6.75.61 sflow destination 10.6.75.62 123 sflow source-interface Management0 +sflow sample input subinterface sflow sample output subinterface sflow extension bgp sflow extension router diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/snmp.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/snmp.md index 3d955808d10..7e4bbcf03e9 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/snmp.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/snmp.md @@ -129,41 +129,41 @@ interface Management1 ```eos ! -snmp-server engineID local 424242424242424242 -snmp-server contact DC1_OPS -snmp-server location DC1 -snmp-server engineID remote 1.1.1.1 6172697374615F6970 -snmp-server engineID remote 2.2.2.2 udp-port 1337 DEADBEEFCAFE123456 snmp-server ipv4 access-list SNMP-MGMT vrf MGMT snmp-server ipv4 access-list onur snmp-server ipv6 access-list SNMP-MGMT vrf MGMT snmp-server ipv6 access-list onur_v6 -snmp-server vrf MGMT local-interface Management1 +snmp-server engineID local 424242424242424242 +snmp-server contact DC1_OPS +snmp-server location DC1 snmp-server local-interface Loopback0 snmp-server vrf Tenant_A_APP_Zone local-interface Loopback12 -snmp-server view VW-WRITE iso included +snmp-server vrf MGMT local-interface Management1 snmp-server view VW-READ iso included +snmp-server view VW-WRITE iso included snmp-server community ro onur snmp-server community view VW-READ rw ipv6 SNMP-MGMT SNMP-MGMT snmp-server community ro snmp-server group GRP-READ-ONLY v3 priv read v3read snmp-server group GRP-READ-WRITE v3 auth read v3read write v3write -snmp-server user USER-READ-NO-AUTH-NO-PRIV GRP-READ-ONLY v3 +snmp-server user REMOTE-USER-IP-LOCALIZED GRP-REMOTE remote 42.42.42.42 v3 localized DEADBEEFCAFE123456 auth sha +snmp-server user REMOTE-USER-IP-ONLY GRP-REMOTE remote 42.42.42.42 v3 +snmp-server user REMOTE-USER-IP-PORT GRP-REMOTE remote 42.42.42.42 udp-port 666 v3 snmp-server user USER-READ-AUTH-NO-PRIV GRP-READ-ONLY v3 auth sha -snmp-server user USER-READ-AUTH-PRIV GRP-READ-ONLY v3 auth sha priv aes -snmp-server user USER-READ-NO-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 snmp-server user USER-READ-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 localized 424242424242424242 auth sha +snmp-server user USER-READ-AUTH-PRIV GRP-READ-ONLY v3 auth sha priv aes snmp-server user USER-READ-AUTH-PRIV-LOC GRP-READ-ONLY v3 localized 424242424242424242 auth sha priv aes +snmp-server user USER-READ-NO-AUTH-NO-PRIV GRP-READ-ONLY v3 +snmp-server user USER-READ-NO-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 snmp-server user USER-WRITE GRP-READ-WRITE v3 auth sha priv aes -snmp-server user REMOTE-USER-IP-ONLY GRP-REMOTE remote 42.42.42.42 v3 -snmp-server user REMOTE-USER-IP-PORT GRP-REMOTE remote 42.42.42.42 udp-port 666 v3 -snmp-server user REMOTE-USER-IP-LOCALIZED GRP-REMOTE remote 42.42.42.42 v3 localized DEADBEEFCAFE123456 auth sha -snmp-server host 10.6.75.121 vrf MGMT version 1 -snmp-server host 10.6.75.121 vrf MGMT version 2c -snmp-server host 10.6.75.122 vrf MGMT version 2c +snmp-server engineID remote 1.1.1.1 6172697374615F6970 +snmp-server engineID remote 2.2.2.2 udp-port 1337 DEADBEEFCAFE123456 snmp-server host 10.6.75.99 vrf MGMT version 3 auth USER-READ-AUTH-NO-PRIV snmp-server host 10.6.75.99 vrf MGMT version 3 auth USER-WRITE snmp-server host 10.6.75.100 vrf MGMT version 3 priv USER-READ-AUTH-PRIV +snmp-server host 10.6.75.121 vrf MGMT version 1 +snmp-server host 10.6.75.121 vrf MGMT version 2c +snmp-server host 10.6.75.122 vrf MGMT version 2c snmp-server enable traps no snmp-server vrf default snmp-server vrf MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface-false.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface-false.md index dca03eb1391..db36583b04f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface-false.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface-false.md @@ -53,7 +53,7 @@ interface Management1 ```eos ! interface Vxlan1 - no vxlan qos dscp propagation encapsulation no vxlan qos ecn propagation + no vxlan qos dscp propagation encapsulation no vxlan qos map dscp to traffic-class decapsulation ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md index 2ff0fb3b5f3..e3b9e6b1f76 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md @@ -94,20 +94,20 @@ interface Vxlan1 vxlan flood vtep learned data-plane vxlan vlan 110 vni 10110 vxlan vlan 111 vni 10111 - vxlan vlan 111 flood vtep 10.1.1.10 10.1.1.11 vxlan vrf Tenant_A_OP_Zone vni 10 vxlan vrf Tenant_A_WEB_Zone vni 11 vxlan mlag source-interface Loopback1 bfd vtep evpn interval 300 min-rx 300 multiplier 3 bfd vtep evpn prefix-list PL-TEST vxlan flood vtep 10.1.0.10 10.1.0.11 - vxlan qos dscp propagation encapsulation - vxlan qos ecn propagation - vxlan qos map dscp to traffic-class decapsulation + vxlan vlan 111 flood vtep 10.1.1.10 10.1.1.11 vxlan vlan 110 multicast group 239.9.1.4 vxlan vlan 112 multicast group 239.9.1.6 vxlan vrf Tenant_A_OP_Zone multicast group 232.0.0.10 vxlan multicast headend-replication + vxlan qos ecn propagation + vxlan qos dscp propagation encapsulation + vxlan qos map dscp to traffic-class decapsulation vxlan encapsulation ipv4 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg index b3192be957c..41e9a48888d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg @@ -9,11 +9,11 @@ radius-server host 10.10.10.157 vrf mgt key 7 071B245F5A radius-server host 10.10.10.249 key 7 071B245F5A radius-server host 10.10.10.158 key 7 071B245F5A ! +tacacs-server timeout 10 tacacs-server host 10.10.10.157 single-connection vrf mgt key 7 071B245F5A tacacs-server host 10.10.10.249 timeout 23 key 7 071B245F5A tacacs-server host 10.10.10.158 key 7 071B245F5A tacacs-server host 10.10.10.159 key 8a $kUVyoj7FVQ//yw9D2lbqjA==$kxxohBiofI46IX3pw18KYQ==$DOOM0l9uU4TrQt2kyA7XCKtjUA== -tacacs-server timeout 10 ! aaa group server tacacs+ TACACS1 server 10.10.10.157 vrf mgt diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/management-tech-support.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/management-tech-support.cfg index 40393f38e19..443a3e28b81 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/management-tech-support.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/management-tech-support.cfg @@ -6,14 +6,14 @@ interface Management1 ! management tech-support policy show tech-support - exclude command show platform fap ip route - exclude command show platform fap ipv6 route exclude command show ip bgp vrf all + exclude command show ip route vrf all detail exclude command show ipv6 bgp vrf all + exclude command show ipv6 route vrf all detail exclude command show kernel ip route vrf all exclude command show kernel ipv6 route vrf all - exclude command show ip route vrf all detail - exclude command show ipv6 route vrf all detail + exclude command show platform fap ip route + exclude command show platform fap ipv6 route exclude command json show version detail include command show version detail | grep TerminAttr exit diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/match-lists.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/match-lists.cfg index d18fb176b8c..3a94dec71a7 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/match-lists.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/match-lists.cfg @@ -1,4 +1,8 @@ ! +match-list input string molecule + 10 match regex ^.*MOLECULE.*$ + 20 match regex ^.*TESTING.*$ +! match-list input prefix-ipv4 molecule_v4 match prefix-ipv4 10.10.10.0/24 match prefix-ipv4 10.10.20.0/24 @@ -6,10 +10,6 @@ match-list input prefix-ipv4 molecule_v4 match-list input prefix-ipv6 molecule_v6 match prefix-ipv6 2001:0DB8::/32 ! -match-list input string molecule - 10 match regex ^.*MOLECULE.*$ - 20 match regex ^.*TESTING.*$ -! interface Management1 description OOB_MANAGEMENT vrf MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-connectivity.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-connectivity.cfg index d2812d5b675..2edd354667d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-connectivity.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-connectivity.cfg @@ -5,33 +5,6 @@ interface Management1 ip address 10.73.255.122/24 ! monitor connectivity - interval 5 - no shutdown - interface set GLOBAL_SET Ethernet1-4 - interface set HOST_SET Loopback2-4, Loopback10-12 - local-interfaces GLOBAL_SET address-only default - ! - host server1 - description - server1_connectivity_monitor - local-interfaces HOST_SET address-only - ip 10.10.10.1 - url https://server1.local.com - ! - host server2 - description - server2_connectivity_monitor - local-interfaces HOST_SET address-only - ip 10.10.10.2 - url https://server2.local.com - ! - host server3 - description - server3_connectivity_monitor - local-interfaces HOST_SET - ip 10.10.10.3 - ! - host server4 vrf blue interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32 local-interfaces VRF_GLOBAL_SET default @@ -51,12 +24,13 @@ monitor connectivity url https://server5.local.com ! host server6 + ! vrf red interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32 interface set VRF_HOST_SET Loopback12-14, 19-23 - local-interfaces VRF_GLOBAL_SET address-only default description vrf_connectivity_monitor + local-interfaces VRF_GLOBAL_SET address-only default ! host server2 description @@ -64,4 +38,32 @@ monitor connectivity local-interfaces VRF_HOST_SET address-only ip 10.10.20.1 url https://server2.local.com + ! vrf yellow + interval 5 + no shutdown + interface set GLOBAL_SET Ethernet1-4 + interface set HOST_SET Loopback2-4, Loopback10-12 + local-interfaces GLOBAL_SET address-only default + ! + host server1 + description + server1_connectivity_monitor + local-interfaces HOST_SET address-only + ip 10.10.10.1 + url https://server1.local.com + ! + host server2 + description + server2_connectivity_monitor + local-interfaces HOST_SET address-only + ip 10.10.10.2 + url https://server2.local.com + ! + host server3 + description + server3_connectivity_monitor + local-interfaces HOST_SET + ip 10.10.10.3 + ! + host server4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-sessions.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-sessions.cfg index 2b7c01e7a28..8e8616e2d79 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-sessions.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/monitor-sessions.cfg @@ -7,16 +7,16 @@ interface Management1 monitor session myMonitoringSession1 source Ethernet0 ipv6 access-group ipv6ACL monitor session myMonitoringSession1 source Ethernet5 both ip access-group ipv4ACL priority 10 monitor session myMonitoringSession1 destination Ethernet48 -monitor session myMonitoringSession1 encapsulation gre metadata tx -monitor session myMonitoringSession1 header remove size 32 monitor session myMonitoringSession1 truncate +monitor session myMonitoringSession1 header remove size 32 +monitor session myMonitoringSession1 encapsulation gre metadata tx +monitor session myMonitoringSession2 ip access-group ipv4ACL monitor session myMonitoringSession2 source Ethernet3, Ethernet5 rx monitor session myMonitoringSession2 source Ethernet10-15 rx monitor session myMonitoringSession2 source Ethernet12 rx monitor session myMonitoringSession2 source Ethernet18 tx mac access-group macACL priority 100 monitor session myMonitoringSession2 destination Cpu monitor session myMonitoringSession2 destination Ethernet50 -monitor session myMonitoringSession2 encapsulation gre metadata tx -monitor session myMonitoringSession2 ip access-group ipv4ACL monitor session myMonitoringSession2 sample 50 +monitor session myMonitoringSession2 encapsulation gre metadata tx monitor session myMonitoringSession3 source Ethernet20 both ip access-group ipv4ACL priority 10 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls-3.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls-3.cfg index 9bf5af600d7..c5cf1779079 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls-3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls-3.cfg @@ -7,5 +7,5 @@ interface Management1 mpls ip ! mpls ldp - interface disabled default router-id 192.168.1.2 + interface disabled default diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg index cdba47875b5..a60504954f9 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg @@ -18,9 +18,9 @@ interface Management1 mpls ip ! mpls ldp - interface disabled default router-id 192.168.1.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! mpls icmp fragmentation-needed tunneling diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/patch-panel.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/patch-panel.cfg index a92744d36b2..ad2dc911324 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/patch-panel.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/patch-panel.cfg @@ -8,12 +8,12 @@ patch panel connector interface recovery review delay 10 900 connector interface patch bgp vpws remote-failure errdisable ! - patch TEN_B_site2_site5_eline - connector 1 interface Ethernet5 - connector 2 pseudowire bgp vpws TENANT_A pseudowire TEN_B_site2_site5_eline - ! patch TEN_A_site2_site5_eline shutdown connector 1 interface Ethernet6 dot1q vlan 123 connector 2 pseudowire ldp LDP_PW_1 ! + patch TEN_B_site2_site5_eline + connector 1 interface Ethernet5 + connector 2 pseudowire bgp vpws TENANT_A pseudowire TEN_B_site2_site5_eline + ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ptp.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ptp.cfg index a27dc6bff5c..6c51d046106 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ptp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ptp.cfg @@ -1,27 +1,27 @@ ! ptp clock-identity 11:11:11:11:11:11 -ptp source ip 1.1.2.3 +ptp domain 17 +ptp message-type event dscp 46 default +ptp message-type general dscp 36 default +ptp mode boundary one-step ptp priority1 101 ptp priority2 102 ptp profile g8275.1 +ptp source ip 1.1.2.3 ptp ttl 12 -ptp domain 17 -ptp message-type general dscp 36 default -ptp message-type event dscp 46 default -ptp mode boundary one-step ptp forward-unicast ptp monitor threshold offset-from-master 11 ptp monitor threshold mean-path-delay 12 -ptp monitor threshold offset-from-master 13 nanoseconds drop ptp monitor threshold mean-path-delay 14 nanoseconds drop -ptp monitor threshold missing-message announce 101 intervals -ptp monitor threshold missing-message follow-up 102 intervals +ptp monitor threshold offset-from-master 13 nanoseconds drop ptp monitor threshold missing-message sync 103 intervals +ptp monitor threshold missing-message follow-up 102 intervals +ptp monitor threshold missing-message announce 101 intervals ptp monitor sequence-id -ptp monitor threshold missing-message announce 201 sequence-ids -ptp monitor threshold missing-message delay-resp 202 sequence-ids -ptp monitor threshold missing-message follow-up 203 sequence-ids ptp monitor threshold missing-message sync 204 sequence-ids +ptp monitor threshold missing-message follow-up 203 sequence-ids +ptp monitor threshold missing-message delay-resp 202 sequence-ids +ptp monitor threshold missing-message announce 201 sequence-ids ! interface Port-Channel5 description DC1_L2LEAF1_Po1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/qos.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/qos.cfg index 5bf11a609cd..32861576754 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/qos.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/qos.cfg @@ -272,7 +272,7 @@ policy-map type quality-of-service pmap_test1 set traffic-class 1 ! priority-flow-control all off -priority-flow-control pause watchdog action no-drop priority-flow-control pause watchdog default timeout 0.05 -priority-flow-control pause watchdog default polling-interval 10.001 priority-flow-control pause watchdog default recovery-time 1.22 +priority-flow-control pause watchdog default polling-interval 10.001 +priority-flow-control pause watchdog action no-drop diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length-notifying.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length-notifying.cfg index 9b9c3823c85..2973f825915 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length-notifying.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length-notifying.cfg @@ -1,7 +1,7 @@ ! queue-monitor length -queue-monitor length default threshold 100 no queue-monitor length notifying +queue-monitor length default threshold 100 ! interface Management1 description OOB_MANAGEMENT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length.cfg index a194d05037d..4d7535a769f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/queue-monitor-length.cfg @@ -1,11 +1,12 @@ ! queue-monitor length -queue-monitor length default thresholds 100 10 -queue-monitor length log 100 queue-monitor length notifying queue-monitor length tx-latency +queue-monitor length default thresholds 100 10 queue-monitor length cpu thresholds 200000 100000 ! +queue-monitor length log 100 +! interface Management1 description OOB_MANAGEMENT vrf MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology-2.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology-2.cfg new file mode 100644 index 00000000000..dee019b8612 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology-2.cfg @@ -0,0 +1,8 @@ +! +router adaptive-virtual-topology + topology role edge gateway vxlan +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology.cfg index e9a948c5c49..43db9a5d488 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-adaptive-virtual-topology.cfg @@ -1,6 +1,6 @@ ! router adaptive-virtual-topology - topology role transit region + topology role pathfinder region North_America id 1 zone Canada id 2 site Ottawa id 99 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-additional-paths.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-additional-paths.cfg new file mode 100644 index 00000000000..96bcb87b8ae --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-additional-paths.cfg @@ -0,0 +1,10 @@ +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 +! +router bgp 65101 + router-id 192.168.255.42 + no bgp additional-paths receive + bgp additional-paths send ecmp limit 30 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg index 12712f7c156..ac624966de6 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg @@ -98,6 +98,7 @@ router bgp 65101 bgp next-hop-unchanged host-flap detection window 10 threshold 1 expiry timeout 3 seconds domain identifier 65101:0 + neighbor default encapsulation path-selection neighbor ADDITIONAL-PATH-PG-1 activate neighbor ADDITIONAL-PATH-PG-1 additional-paths receive neighbor ADDITIONAL-PATH-PG-1 additional-paths send any @@ -116,12 +117,20 @@ router bgp 65101 neighbor EVPN-OVERLAY-PEERS domain remote neighbor EVPN-OVERLAY-PEERS encapsulation vxlan no neighbor MLAG-IPv4-UNDERLAY-PEER activate + neighbor TEST-ENCAPSULATION activate + neighbor TEST-ENCAPSULATION encapsulation mpls + neighbor TEST-ENCAPSULATION-2 activate + neighbor TEST-ENCAPSULATION-2 encapsulation path-selection neighbor 10.100.100.1 activate neighbor 10.100.100.1 default-route neighbor 10.100.100.2 activate neighbor 10.100.100.2 default-route route-map RM_DEFAULT_ROUTE neighbor 10.100.100.3 activate neighbor 10.100.100.3 default-route rcf RCF_DEFAULT_ROUTE() + neighbor 10.100.100.4 activate + neighbor 10.100.100.4 encapsulation path-selection + neighbor 10.100.100.5 activate + neighbor 10.100.100.5 encapsulation mpls next-hop resolution disabled neighbor default next-hop-self received-evpn-routes route-type ip-prefix inter-domain route import ethernet-segment ip mass-withdraw diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg new file mode 100644 index 00000000000..6edb13b7e19 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg @@ -0,0 +1,35 @@ +! +interface Management1 + description OOB_MANAGEMENT + vrf MGMT + ip address 10.73.255.122/24 +! +router bgp 65101 + ! + address-family ipv4 labeled-unicast + update wait-for-convergence + bgp missing-policy include community-list direction in action deny + bgp additional-paths receive + bgp additional-paths send ecmp limit 20 + bgp next-hop-unchanged + next-hop resolution ribs tunnel-rib colored system-colored-tunnel-rib tunnel-rib test-rib system-connected + neighbor PG-BGP-LU activate + neighbor 198.51.100.1 activate + neighbor 198.51.100.1 additional-paths receive + neighbor 198.51.100.1 graceful-restart + neighbor 198.51.100.1 rcf in RCF_TEST(ARGS) + neighbor 198.51.100.1 additional-paths send ecmp + neighbor 198.51.100.1 maximum-advertised-routes 0 + no neighbor 198.51.100.2 activate + neighbor 198.51.100.2 graceful-restart-helper stale-route route-map RM_STALE + neighbor 198.51.100.2 route-map RM_OUT_TEST out + neighbor 198.51.100.2 next-hop-unchanged + neighbor 198.51.100.2 aigp-session + neighbor 198.51.100.2 multi-path + network 203.0.113.0/25 route-map RM-TEST + network 203.0.113.128/25 + label local-termination implicit-null + tunnel source-protocol isis segment-routing + tunnel source-protocol ldp rcf TEST(ARGS) + aigp-session confederation + aigp-session ebgp diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-internet-exit.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-internet-exit.cfg index d496dc01a87..dd2af1a866f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-internet-exit.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-internet-exit.cfg @@ -1,32 +1,31 @@ ! router internet-exit - ! - exit-group eg_01 - ! - exit-group eg_02 - fib-default - ! - exit-group eg_03 - local connection eg_03_lo_01 - local connection eg_03_lo_02 - fib-default - ! - exit-group eg_04 - local connection eg_04_lo_01 - local connection eg_04_lo_02 - local connection eg_04_lo_03 - ! - policy po_01 - exit-group po_eg_01_02 - exit-group po_eg_01_04 - exit-group po_eg_01_01 - exit-group po_eg_01_03 - exit-group system-default-exit-group - ! - policy po_02 - ! - policy po_03 - exit-group po_eg_03_01 + exit-group eg_01 + ! + exit-group eg_02 + fib-default + ! + exit-group eg_03 + local connection eg_03_lo_01 + local connection eg_03_lo_02 + fib-default + ! + exit-group eg_04 + local connection eg_04_lo_01 + local connection eg_04_lo_02 + local connection eg_04_lo_03 + ! + policy po_01 + exit-group po_eg_01_02 + exit-group po_eg_01_04 + exit-group po_eg_01_01 + exit-group po_eg_01_03 + exit-group system-default-exit-group + ! + policy po_02 + ! + policy po_03 + exit-group po_eg_03_01 ! interface Management1 description OOB_MANAGEMENT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-path-selection.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-path-selection.cfg index cd7c86e5593..6571e3e1be9 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-path-selection.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-path-selection.cfg @@ -60,16 +60,16 @@ router path-selection load-balance policy LB-EMPTY ! load-balance policy LB-P-1 - hop count lowest loss-rate 17 + hop count lowest path-group PG-5 path-group PG-2 priority 42 path-group PG-4 priority 42 path-group PG-3 priority 666 ! load-balance policy LB-P-2 - jitter 666 latency 42 + jitter 666 loss-rate 42.42 path-group PG-1 priority 1 path-group PG-3 @@ -77,6 +77,7 @@ router path-selection policy DPS-P-1 default-match load-balance LB-P-1 + ! 42 application-profile AP-3 load-balance LB-P-1 ! @@ -86,6 +87,7 @@ router path-selection ! policy DPS-P-3 42 application-profile AP-2 + ! 66 application-profile AP-1 load-balance LB-P-1 ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg index 88a4b1d4e6f..840e54fcfc0 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg @@ -6,6 +6,7 @@ interface Management1 ! router pim sparse-mode ipv4 + ssm range standard bfd rp address 10.238.1.161 239.12.12.12/32 priority 20 rp address 10.238.1.161 239.12.12.13/32 priority 20 @@ -18,7 +19,6 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.17/32 rp address 10.238.1.161 access-list RP_ACL3 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 - ssm range standard ! vrf MCAST_VRF1 ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/sflow.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/sflow.cfg index 1daeab925b7..555ceeff12b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/sflow.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/sflow.cfg @@ -1,6 +1,5 @@ ! sflow sample dangerous 1000 -sflow sample input subinterface sflow polling-interval 10 sflow vrf AAA destination 10.6.75.62 123 sflow vrf AAA destination 10.6.75.63 333 @@ -16,6 +15,7 @@ sflow vrf MGMT source-interface Ethernet3 sflow destination 10.6.75.61 sflow destination 10.6.75.62 123 sflow source-interface Management0 +sflow sample input subinterface sflow sample output subinterface sflow extension bgp sflow extension router diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/snmp.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/snmp.cfg index 02a777aa83b..84f68936385 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/snmp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/snmp.cfg @@ -1,39 +1,39 @@ ! -snmp-server engineID local 424242424242424242 -snmp-server contact DC1_OPS -snmp-server location DC1 -snmp-server engineID remote 1.1.1.1 6172697374615F6970 -snmp-server engineID remote 2.2.2.2 udp-port 1337 DEADBEEFCAFE123456 snmp-server ipv4 access-list SNMP-MGMT vrf MGMT snmp-server ipv4 access-list onur snmp-server ipv6 access-list SNMP-MGMT vrf MGMT snmp-server ipv6 access-list onur_v6 -snmp-server vrf MGMT local-interface Management1 +snmp-server engineID local 424242424242424242 +snmp-server contact DC1_OPS +snmp-server location DC1 snmp-server local-interface Loopback0 snmp-server vrf Tenant_A_APP_Zone local-interface Loopback12 -snmp-server view VW-WRITE iso included +snmp-server vrf MGMT local-interface Management1 snmp-server view VW-READ iso included +snmp-server view VW-WRITE iso included snmp-server community SNMP-COMMUNITY-1 ro onur snmp-server community SNMP-COMMUNITY-2 view VW-READ rw ipv6 SNMP-MGMT SNMP-MGMT snmp-server community SNMP-COMMUNITY-3 ro snmp-server group GRP-READ-ONLY v3 priv read v3read snmp-server group GRP-READ-WRITE v3 auth read v3read write v3write -snmp-server user USER-READ-NO-AUTH-NO-PRIV GRP-READ-ONLY v3 +snmp-server user REMOTE-USER-IP-LOCALIZED GRP-REMOTE remote 42.42.42.42 v3 localized DEADBEEFCAFE123456 auth sha ShouldBeEncryptedPassword +snmp-server user REMOTE-USER-IP-ONLY GRP-REMOTE remote 42.42.42.42 v3 +snmp-server user REMOTE-USER-IP-PORT GRP-REMOTE remote 42.42.42.42 udp-port 666 v3 snmp-server user USER-READ-AUTH-NO-PRIV GRP-READ-ONLY v3 auth sha clearPassword -snmp-server user USER-READ-AUTH-PRIV GRP-READ-ONLY v3 auth sha clearPassword priv aes clearPassword -snmp-server user USER-READ-NO-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 snmp-server user USER-READ-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 localized 424242424242424242 auth sha 8da526cd35b9ea9b42d819036f7fad058576ea0a +snmp-server user USER-READ-AUTH-PRIV GRP-READ-ONLY v3 auth sha clearPassword priv aes clearPassword snmp-server user USER-READ-AUTH-PRIV-LOC GRP-READ-ONLY v3 localized 424242424242424242 auth sha 8da526cd35b9ea9b42d819036f7fad058576ea0a priv aes 8da526cd35b9ea9b42d819036f7fad05 +snmp-server user USER-READ-NO-AUTH-NO-PRIV GRP-READ-ONLY v3 +snmp-server user USER-READ-NO-AUTH-NO-PRIV-LOC GRP-READ-ONLY v3 snmp-server user USER-WRITE GRP-READ-WRITE v3 auth sha clearPassword priv aes clearPassword -snmp-server user REMOTE-USER-IP-ONLY GRP-REMOTE remote 42.42.42.42 v3 -snmp-server user REMOTE-USER-IP-PORT GRP-REMOTE remote 42.42.42.42 udp-port 666 v3 -snmp-server user REMOTE-USER-IP-LOCALIZED GRP-REMOTE remote 42.42.42.42 v3 localized DEADBEEFCAFE123456 auth sha ShouldBeEncryptedPassword -snmp-server host 10.6.75.121 vrf MGMT version 1 SNMP-COMMUNITY-1 -snmp-server host 10.6.75.121 vrf MGMT version 2c SNMP-COMMUNITY-2 -snmp-server host 10.6.75.122 vrf MGMT version 2c SNMP-COMMUNITY-2 +snmp-server engineID remote 1.1.1.1 6172697374615F6970 +snmp-server engineID remote 2.2.2.2 udp-port 1337 DEADBEEFCAFE123456 snmp-server host 10.6.75.99 vrf MGMT version 3 auth USER-READ-AUTH-NO-PRIV snmp-server host 10.6.75.99 vrf MGMT version 3 auth USER-WRITE snmp-server host 10.6.75.100 vrf MGMT version 3 priv USER-READ-AUTH-PRIV +snmp-server host 10.6.75.121 vrf MGMT version 1 SNMP-COMMUNITY-1 +snmp-server host 10.6.75.121 vrf MGMT version 2c SNMP-COMMUNITY-2 +snmp-server host 10.6.75.122 vrf MGMT version 2c SNMP-COMMUNITY-2 snmp-server enable traps no snmp-server vrf default snmp-server vrf MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/terminal.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/terminal.cfg index dd975586aa1..e2ad04bfd72 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/terminal.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/terminal.cfg @@ -1,6 +1,6 @@ ! -terminal width 1000 terminal length 1000 +terminal width 1000 ! interface Management1 description OOB_MANAGEMENT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface-false.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface-false.cfg index fa15284e5a6..fab96673304 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface-false.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface-false.cfg @@ -5,6 +5,6 @@ interface Management1 ip address 10.73.255.122/24 ! interface Vxlan1 - no vxlan qos dscp propagation encapsulation no vxlan qos ecn propagation + no vxlan qos dscp propagation encapsulation no vxlan qos map dscp to traffic-class decapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg index 510fec353b7..b6d60b36377 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg @@ -14,19 +14,19 @@ interface Vxlan1 vxlan flood vtep learned data-plane vxlan vlan 110 vni 10110 vxlan vlan 111 vni 10111 - vxlan vlan 111 flood vtep 10.1.1.10 10.1.1.11 vxlan vrf Tenant_A_OP_Zone vni 10 vxlan vrf Tenant_A_WEB_Zone vni 11 vxlan mlag source-interface Loopback1 bfd vtep evpn interval 300 min-rx 300 multiplier 3 bfd vtep evpn prefix-list PL-TEST vxlan flood vtep 10.1.0.10 10.1.0.11 - vxlan qos dscp propagation encapsulation - vxlan qos ecn propagation - vxlan qos map dscp to traffic-class decapsulation + vxlan vlan 111 flood vtep 10.1.1.10 10.1.1.11 vxlan vlan 110 multicast group 239.9.1.4 vxlan vlan 112 multicast group 239.9.1.6 vxlan vrf Tenant_A_OP_Zone multicast group 232.0.0.10 vxlan multicast headend-replication + vxlan qos ecn propagation + vxlan qos dscp propagation encapsulation + vxlan qos map dscp to traffic-class decapsulation vxlan encapsulation ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology-2.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology-2.yml new file mode 100644 index 00000000000..2991872e79f --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology-2.yml @@ -0,0 +1,5 @@ +--- +# Testing gateway VXLAN feature +router_adaptive_virtual_topology: + topology_role: edge + gateway_vxlan: true diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology.yml index f3c0d80884f..e8cb4bd3204 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-adaptive-virtual-topology.yml @@ -1,5 +1,6 @@ router_adaptive_virtual_topology: - topology_role: transit region + topology_role: pathfinder + gateway_vxlan: true region: name: North_America id: 1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-additional-paths.yaml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-additional-paths.yaml new file mode 100644 index 00000000000..2d1679689ce --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-additional-paths.yaml @@ -0,0 +1,10 @@ +### Routing - BGP ### +# Testing for additional-paths new datamodel model +router_bgp: + as: 65101 + router_id: 192.168.255.42 + bgp: + additional_paths: + receive: false + send: ecmp + send_ecmp_limit: 30 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml index b084a4fdb90..5def441a464 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml @@ -76,6 +76,7 @@ router_bgp: next_hop_self_received_evpn_routes: enable: true inter_domain: true + encapsulation: path-selection domain_identifier: "65101:0" neighbors: - ip_address: 10.100.100.1 @@ -92,6 +93,12 @@ router_bgp: default_route: enabled: true rcf: RCF_DEFAULT_ROUTE() + - ip_address: 10.100.100.4 + activate: true + encapsulation: path-selection + - ip_address: 10.100.100.5 + activate: true + encapsulation: mpls peer_groups: - name: EVPN-OVERLAY-PEERS activate: true @@ -133,6 +140,12 @@ router_bgp: additional_paths: send: any: false + - name: TEST-ENCAPSULATION + activate: true + encapsulation: mpls + - name: TEST-ENCAPSULATION-2 + activate: true + encapsulation: path-selection evpn_hostflap_detection: enabled: true window: 10 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml new file mode 100644 index 00000000000..912999844e5 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml @@ -0,0 +1,50 @@ +router_bgp: + as: 65101 + address_family_ipv4_labeled_unicast: + update_wait_for_convergence: true + aigp_session: + ebgp: true + confederation: true + bgp: + additional_paths: + receive: true + send: ecmp + send_ecmp_limit: 20 + missing_policy: + direction_in: + action: deny + include_community_list: true + next_hop_unchanged: true + next_hop_resolution_ribs: + - rib_type: "tunnel-rib-colored" + - rib_type: "tunnel-rib" + rib_name: "test-rib" + - rib_type: "system-connected" + label_local_termination: implicit-null + networks: + - prefix: 203.0.113.0/25 + route_map: RM-TEST + - prefix: 203.0.113.128/25 + tunnel_source_protocols: + - protocol: isis segment-routing + - protocol: ldp + rcf: TEST(ARGS) + neighbors: + - ip_address: 198.51.100.1 + activate: true + additional_paths: + receive: true + send: ecmp + graceful_restart: true + maximum_advertised_routes: 0 + rcf_in: RCF_TEST(ARGS) + - ip_address: 198.51.100.2 + aigp_session: true + multi_path: true + graceful_restart_helper: + stale_route_map: RM_STALE + next_hop_unchanged: true + route_map_out: RM_OUT_TEST + peer_groups: + - name: PG-BGP-LU + activate: true diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/snmp.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/snmp.yml index deadbe18fa4..4daca5cd790 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/snmp.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/snmp.yml @@ -3,8 +3,9 @@ snmp_server: engine_ids: local: 424242424242424242 remotes: + # TODO: make address as primary key # First one without IP should not be rendered - - id: 1234567890ABCDEF12 + # - id: 1234567890ABCDEF12 - id: 6172697374615F6970 address: 1.1.1.1 - id: DEADBEEFCAFE123456 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini index 6e849b98f90..17762982798 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini @@ -129,12 +129,15 @@ redundancy roles route-maps router-adaptive-virtual-topology +router-adaptive-virtual-topology-2 router-bfd-1 router-bfd-2 +router-bgp-additional-paths router-bgp-base router-bgp-evpn router-bgp-evpn-vpn-import-pruning router-bgp-evpn-mpls +router-bgp-ipv4-labeled-unicast router-bgp-link-state router-bgp-path-selection router-bgp-rtc diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host2.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host2.md index 8f181cd6bbe..0eea64af2ee 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host2.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host2.md @@ -23,7 +23,7 @@ ```eos ! interface Vxlan1 - no vxlan qos dscp propagation encapsulation no vxlan qos ecn propagation + no vxlan qos dscp propagation encapsulation no vxlan qos map dscp to traffic-class decapsulation ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host2.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host2.cfg index 6e21b92d795..299cdca6a82 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host2.cfg @@ -1,5 +1,5 @@ ! interface Vxlan1 - no vxlan qos dscp propagation encapsulation no vxlan qos ecn propagation + no vxlan qos dscp propagation encapsulation no vxlan qos map dscp to traffic-class decapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md index c001d79cfb5..b2810ef86a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md @@ -257,11 +257,11 @@ vlan internal order ascending range 1006 1199 | 150 | Tenant_A_WAN_Zone_1 | - | | 250 | Tenant_B_WAN_Zone_1 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -277,23 +277,23 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -316,38 +316,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.41/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.43/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.45/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -428,11 +428,11 @@ interface Loopback1 | Vlan150 | Tenant_A_WAN_Zone_1 | Tenant_A_WAN_Zone | - | False | | Vlan250 | Tenant_B_WAN_Zone_1 | Tenant_B_WAN_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -470,34 +470,34 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -740,7 +740,7 @@ router bgp 65104 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan4093 neighbor 172.31.255.40 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.40 remote-as 65001 neighbor 172.31.255.40 description DC1-SPINE1_Ethernet6 @@ -755,16 +755,16 @@ router bgp 65104 neighbor 172.31.255.46 description DC1-SPINE4_Ethernet6 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -800,7 +800,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3013 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -810,7 +810,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3020 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -820,7 +820,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3030 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md index 4f78cfdb8f1..4eb50a5a546 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md @@ -257,11 +257,11 @@ vlan internal order ascending range 1006 1199 | 150 | Tenant_A_WAN_Zone_1 | - | | 250 | Tenant_B_WAN_Zone_1 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -277,23 +277,23 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -316,38 +316,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.49/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.51/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.53/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -428,11 +428,11 @@ interface Loopback1 | Vlan150 | Tenant_A_WAN_Zone_1 | Tenant_A_WAN_Zone | - | False | | Vlan250 | Tenant_B_WAN_Zone_1 | Tenant_B_WAN_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -470,34 +470,34 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -740,7 +740,7 @@ router bgp 65104 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan4093 neighbor 172.31.255.48 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.48 remote-as 65001 neighbor 172.31.255.48 description DC1-SPINE1_Ethernet7 @@ -755,16 +755,16 @@ router bgp 65104 neighbor 172.31.255.54 description DC1-SPINE4_Ethernet7 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -800,7 +800,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3013 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -810,7 +810,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3020 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -820,7 +820,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3030 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md index dc9376d5f82..bfb94b9a100 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md @@ -260,7 +260,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -312,7 +312,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -395,7 +395,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -408,7 +408,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md index 9e74240df86..157d6aa58ed 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md @@ -260,7 +260,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -312,7 +312,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -395,7 +395,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -408,7 +408,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md index 5ad13b1b781..5ec5b0d31ed 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md @@ -263,38 +263,38 @@ vlan 131 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.3/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.5/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -619,16 +619,16 @@ router bgp 65101 neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md index 3375698ae0e..b54b1ba5a55 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md @@ -269,14 +269,14 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3029 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -319,35 +319,35 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -372,38 +372,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.11/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.13/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -529,14 +529,14 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3029 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -643,55 +643,55 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.2/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.2/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.2/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -976,7 +976,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan4093 neighbor 172.31.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.8 remote-as 65001 neighbor 172.31.255.8 description DC1-SPINE1_Ethernet2 @@ -991,16 +991,16 @@ router bgp 65102 neighbor 172.31.255.14 description DC1-SPINE4_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1054,7 +1054,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1064,7 +1064,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1074,7 +1074,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -1084,7 +1084,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1094,7 +1094,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1104,7 +1104,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3029 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md index 74ed8932657..f36899aefe1 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md @@ -269,14 +269,14 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3029 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -319,35 +319,35 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -372,38 +372,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.17/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.19/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.21/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -529,14 +529,14 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3029 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -643,55 +643,55 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.3/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.3/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.3/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -976,7 +976,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan4093 neighbor 172.31.255.16 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.16 remote-as 65001 neighbor 172.31.255.16 description DC1-SPINE1_Ethernet3 @@ -991,16 +991,16 @@ router bgp 65102 neighbor 172.31.255.22 description DC1-SPINE4_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1054,7 +1054,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1064,7 +1064,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1074,7 +1074,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -1084,7 +1084,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1094,7 +1094,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1104,7 +1104,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3029 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md index cf91fe4ef2a..7f34c3b6c5c 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | True | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | True | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | True | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | True | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.8/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.16/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 shutdown mtu 1500 no switchport ip address 172.31.255.24/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 shutdown mtu 1500 no switchport ip address 172.31.255.32/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.40/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -471,27 +471,27 @@ router bgp 65001 neighbor 172.31.255.49 description DC1-BL1B_Ethernet1 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md index eb19a155d69..bf7ecd4f4a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | True | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | True | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | True | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | True | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.10/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.18/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 shutdown mtu 1500 no switchport ip address 172.31.255.26/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 shutdown mtu 1500 no switchport ip address 172.31.255.34/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.42/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -471,27 +471,27 @@ router bgp 65001 neighbor 172.31.255.51 description DC1-BL1B_Ethernet2 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md index 029198d2760..313144047ee 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | True | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | True | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | True | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | True | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.4/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.12/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.20/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 shutdown mtu 1500 no switchport ip address 172.31.255.28/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 shutdown mtu 1500 no switchport ip address 172.31.255.36/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.44/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -471,27 +471,27 @@ router bgp 65001 neighbor 172.31.255.53 description DC1-BL1B_Ethernet3 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md index 4f9a815224e..e1e2361ba03 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | True | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | True | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | True | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | True | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.6/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.14/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.22/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 shutdown mtu 1500 no switchport ip address 172.31.255.30/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 shutdown mtu 1500 no switchport ip address 172.31.255.38/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.46/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -471,27 +471,27 @@ router bgp 65001 neighbor 172.31.255.55 description DC1-BL1B_Ethernet4 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md index 46116aed6a1..d6e71023d61 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md @@ -272,17 +272,17 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3029 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -334,47 +334,47 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -400,38 +400,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.25/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.27/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.29/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -576,17 +576,17 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3029 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -717,76 +717,76 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.6/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.6/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.6/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.6/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1101,7 +1101,7 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan4093 neighbor 172.31.255.24 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.24 remote-as 65001 neighbor 172.31.255.24 description DC1-SPINE1_Ethernet4 @@ -1116,16 +1116,16 @@ router bgp 65103 neighbor 172.31.255.30 description DC1-SPINE4_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1197,7 +1197,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1207,7 +1207,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1217,7 +1217,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -1227,7 +1227,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3013 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -1237,7 +1237,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1247,7 +1247,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -1257,7 +1257,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1267,7 +1267,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3029 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -1277,7 +1277,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3030 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md index 2af24e41535..81af75bfb16 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md @@ -272,17 +272,17 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3029 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -334,47 +334,47 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -399,38 +399,38 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.33/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.35/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.37/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -550,17 +550,17 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3029 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3029 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -691,76 +691,76 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.7/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.7/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.7/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.7/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1075,7 +1075,7 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan4093 neighbor 172.31.255.32 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.32 remote-as 65001 neighbor 172.31.255.32 description DC1-SPINE1_Ethernet5 @@ -1090,16 +1090,16 @@ router bgp 65103 neighbor 172.31.255.38 description DC1-SPINE4_Ethernet5 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1171,7 +1171,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1181,7 +1181,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1191,7 +1191,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -1201,7 +1201,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3013 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -1211,7 +1211,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1221,7 +1221,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -1231,7 +1231,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1241,7 +1241,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3029 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -1251,7 +1251,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3030 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg index 1cb0b051231..9396b227484 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg @@ -40,23 +40,23 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,28 +75,28 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.41/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.43/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport ip address 172.31.255.45/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -147,34 +147,34 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.10/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -253,7 +253,7 @@ router bgp 65104 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan4093 neighbor 172.31.255.40 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.40 remote-as 65001 neighbor 172.31.255.40 description DC1-SPINE1_Ethernet6 @@ -268,16 +268,16 @@ router bgp 65104 neighbor 172.31.255.46 description DC1-SPINE4_Ethernet6 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -313,7 +313,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3013 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -323,7 +323,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3020 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -333,7 +333,7 @@ router bgp 65104 router-id 192.168.255.10 update wait-install neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description DC1-BL1B + neighbor 10.255.251.11 description DC1-BL1B_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg index 55d8832b0b9..da900e7addb 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg @@ -40,23 +40,23 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,28 +75,28 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.49/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.51/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport ip address 172.31.255.53/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -147,34 +147,34 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.11/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -253,7 +253,7 @@ router bgp 65104 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan4093 neighbor 172.31.255.48 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.48 remote-as 65001 neighbor 172.31.255.48 description DC1-SPINE1_Ethernet7 @@ -268,16 +268,16 @@ router bgp 65104 neighbor 172.31.255.54 description DC1-SPINE4_Ethernet7 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -313,7 +313,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3013 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -323,7 +323,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3020 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -333,7 +333,7 @@ router bgp 65104 router-id 192.168.255.11 update wait-install neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description DC1-BL1A + neighbor 10.255.251.10 description DC1-BL1A_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg index 5fbfc07b5c4..b60814c005c 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg @@ -78,7 +78,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -125,7 +125,7 @@ interface Management1 ip address 192.168.200.113/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg index eea31cfcce2..c68e5d36aa0 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg @@ -78,7 +78,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -125,7 +125,7 @@ interface Management1 ip address 192.168.200.114/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF1A.cfg index 7b9381f9c5a..fe49f3eeb5f 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF1A.cfg @@ -50,28 +50,28 @@ vrf instance Tenant_A_APP_Zone vrf instance Tenant_A_WEB_Zone ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.3/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.5/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -197,16 +197,16 @@ router bgp 65101 neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg index b6763141d61..21e695619b1 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg @@ -69,35 +69,35 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -138,28 +138,28 @@ interface Port-Channel10 mlag 10 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.9/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.11/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.13/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -283,55 +283,55 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.2/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.2/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.2/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -427,7 +427,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan4093 neighbor 172.31.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.8 remote-as 65001 neighbor 172.31.255.8 description DC1-SPINE1_Ethernet2 @@ -442,16 +442,16 @@ router bgp 65102 neighbor 172.31.255.14 description DC1-SPINE4_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -505,7 +505,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -515,7 +515,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -525,7 +525,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -535,7 +535,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -545,7 +545,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ! vrf Tenant_C_OP_Zone @@ -555,7 +555,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3029 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg index eaa3d3e555b..12cce642327 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg @@ -69,35 +69,35 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -138,28 +138,28 @@ interface Port-Channel10 mlag 10 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.17/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.19/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.21/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -283,55 +283,55 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.3/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.3/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.3/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -427,7 +427,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan4093 neighbor 172.31.255.16 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.16 remote-as 65001 neighbor 172.31.255.16 description DC1-SPINE1_Ethernet3 @@ -442,16 +442,16 @@ router bgp 65102 neighbor 172.31.255.22 description DC1-SPINE4_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -505,7 +505,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -515,7 +515,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -525,7 +525,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -535,7 +535,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -545,7 +545,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ! vrf Tenant_C_OP_Zone @@ -555,7 +555,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3029 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg index 9ef8d4648b7..5e676823ae3 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.8/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.16/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 shutdown mtu 1500 no switchport ip address 172.31.255.24/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 shutdown mtu 1500 no switchport ip address 172.31.255.32/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport ip address 172.31.255.40/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -150,27 +150,27 @@ router bgp 65001 neighbor 172.31.255.49 description DC1-BL1B_Ethernet1 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg index 2900315c187..d3c0b9feac8 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.10/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.18/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 shutdown mtu 1500 no switchport ip address 172.31.255.26/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 shutdown mtu 1500 no switchport ip address 172.31.255.34/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport ip address 172.31.255.42/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -150,27 +150,27 @@ router bgp 65001 neighbor 172.31.255.51 description DC1-BL1B_Ethernet2 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg index c5f3d0f2c57..2101e0eb94c 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.4/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.12/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.20/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 shutdown mtu 1500 no switchport ip address 172.31.255.28/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 shutdown mtu 1500 no switchport ip address 172.31.255.36/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport ip address 172.31.255.44/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -150,27 +150,27 @@ router bgp 65001 neighbor 172.31.255.53 description DC1-BL1B_Ethernet3 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg index 28acfbb8238..68d33d7da54 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.6/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.14/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.22/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 shutdown mtu 1500 no switchport ip address 172.31.255.30/31 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 shutdown mtu 1500 no switchport ip address 172.31.255.38/31 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.46/31 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -150,27 +150,27 @@ router bgp 65001 neighbor 172.31.255.55 description DC1-BL1B_Ethernet4 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 neighbor 192.168.255.8 shutdown - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 neighbor 192.168.255.9 shutdown - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg index 5d7f9b6765f..70fcb63bf15 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg @@ -78,47 +78,47 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -168,28 +168,28 @@ interface Port-Channel10 lacp system-id 0303.0202.0101 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.25/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.27/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport ip address 172.31.255.29/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -336,76 +336,76 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.6/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.6/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.6/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.6/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.6/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.6/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -510,7 +510,7 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan4093 neighbor 172.31.255.24 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.24 remote-as 65001 neighbor 172.31.255.24 description DC1-SPINE1_Ethernet4 @@ -525,16 +525,16 @@ router bgp 65103 neighbor 172.31.255.30 description DC1-SPINE4_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -606,7 +606,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -616,7 +616,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -626,7 +626,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -636,7 +636,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3013 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -646,7 +646,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -656,7 +656,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -666,7 +666,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -676,7 +676,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3029 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -686,7 +686,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.7 description DC1-SVC3B + neighbor 10.255.251.7 description DC1-SVC3B_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg index 36141321b1f..129e51becdf 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg @@ -78,47 +78,47 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3029 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -157,28 +157,28 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.33/31 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.35/31 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport ip address 172.31.255.37/31 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -320,76 +320,76 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.7/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.7/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.7/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan3029 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone ip address 10.255.251.7/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.251.7/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.7/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -494,7 +494,7 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan4093 neighbor 172.31.255.32 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.32 remote-as 65001 neighbor 172.31.255.32 description DC1-SPINE1_Ethernet5 @@ -509,16 +509,16 @@ router bgp 65103 neighbor 172.31.255.38 description DC1-SPINE4_Ethernet5 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -590,7 +590,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -600,7 +600,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -610,7 +610,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -620,7 +620,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3013 redistribute connected ! vrf Tenant_A_WEB_Zone @@ -630,7 +630,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -640,7 +640,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -650,7 +650,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -660,7 +660,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3029 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -670,7 +670,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.6 description DC1-SVC3A + neighbor 10.255.251.6 description DC1-SVC3A_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml index 051e3280c38..b18737a7d83 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Vlan4093 - ip_address: 172.31.255.40 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1B + description: DC1-BL1B_Vlan3013 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1B + description: DC1-BL1B_Vlan3020 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1B + description: DC1-BL1B_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -264,19 +264,19 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 150 name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -284,7 +284,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -292,18 +292,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.10/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -320,7 +320,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.251.10/31 @@ -336,7 +336,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.251.10/31 @@ -352,7 +352,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.251.10/31 @@ -389,7 +389,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description: P2P_DC1-SPINE1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -399,7 +399,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description: P2P_DC1-SPINE2_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -409,7 +409,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description: P2P_DC1-SPINE3_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -419,7 +419,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description: P2P_DC1-SPINE4_Ethernet6 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml index b7452565d49..bdf383db030 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Vlan4093 - ip_address: 172.31.255.48 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1A + description: DC1-BL1A_Vlan3013 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1A + description: DC1-BL1A_Vlan3020 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-BL1A + description: DC1-BL1A_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -264,19 +264,19 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 150 name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -284,7 +284,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -292,18 +292,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.11/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -320,7 +320,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.251.11/31 @@ -336,7 +336,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.251.11/31 @@ -352,7 +352,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.251.11/31 @@ -389,7 +389,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description: P2P_DC1-SPINE1_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -399,7 +399,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description: P2P_DC1-SPINE2_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -409,7 +409,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description: P2P_DC1-SPINE3_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -419,7 +419,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description: P2P_DC1-SPINE4_Ethernet7 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml index ff01f8b0ce3..98e7fe2c727 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -122,7 +122,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml index 2a01ced2144..45757aeecc1 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -122,7 +122,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml index 51b355ed52e..087f211dc78 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_DC1-SPINE1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_DC1-SPINE2_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -227,7 +227,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description: P2P_DC1-SPINE3_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -237,7 +237,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description: P2P_DC1-SPINE4_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml index 0cc6ff15cc6..aca5ed9c347 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan4093 - ip_address: 172.31.255.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3009 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -174,7 +174,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -194,7 +194,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3019 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -214,7 +214,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3029 updates: wait_install: true vlan_aware_bundles: @@ -357,12 +357,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -372,7 +372,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -383,7 +383,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -394,7 +394,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -405,7 +405,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -416,7 +416,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -427,18 +427,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 3029 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.2/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -464,7 +464,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -489,7 +489,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -517,7 +517,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -547,7 +547,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -571,7 +571,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -595,7 +595,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -650,7 +650,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_DC1-SPINE1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -660,7 +660,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_DC1-SPINE2_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -670,7 +670,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description: P2P_DC1-SPINE3_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -680,7 +680,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description: P2P_DC1-SPINE4_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml index 32a0dfcf463..071c24b2c17 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan4093 - ip_address: 172.31.255.16 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3009 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -174,7 +174,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -194,7 +194,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3019 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -214,7 +214,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3029 updates: wait_install: true vlan_aware_bundles: @@ -357,12 +357,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -372,7 +372,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -383,7 +383,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -394,7 +394,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -405,7 +405,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -416,7 +416,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -427,18 +427,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 3029 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.3/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -464,7 +464,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -489,7 +489,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -517,7 +517,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -547,7 +547,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -571,7 +571,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -595,7 +595,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -650,7 +650,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_DC1-SPINE1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -660,7 +660,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_DC1-SPINE2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -670,7 +670,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description: P2P_DC1-SPINE3_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -680,7 +680,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description: P2P_DC1-SPINE4_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml index 77fcc8bfef0..e90c43f2f92 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml @@ -78,38 +78,38 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' shutdown: true - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' shutdown: true address_family_evpn: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_DC1-LEAF1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_DC1-LEAF2A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_DC1-LEAF2B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description: P2P_DC1-SVC3A_Ethernet1 shutdown: true mtu: 1500 switchport: @@ -227,7 +227,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description: P2P_DC1-SVC3B_Ethernet1 shutdown: true mtu: 1500 switchport: @@ -237,7 +237,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet1 + description: P2P_DC1-BL1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -247,7 +247,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet1 + description: P2P_DC1-BL1B_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml index a37e8d75af2..3b46265bc22 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml @@ -78,38 +78,38 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' shutdown: true - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' shutdown: true address_family_evpn: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_DC1-LEAF1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_DC1-LEAF2A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_DC1-LEAF2B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description: P2P_DC1-SVC3A_Ethernet2 shutdown: true mtu: 1500 switchport: @@ -227,7 +227,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description: P2P_DC1-SVC3B_Ethernet2 shutdown: true mtu: 1500 switchport: @@ -237,7 +237,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet2 + description: P2P_DC1-BL1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -247,7 +247,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet2 + description: P2P_DC1-BL1B_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml index b162bb78375..e78ef76df42 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml @@ -78,38 +78,38 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' shutdown: true - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' shutdown: true address_family_evpn: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description: P2P_DC1-LEAF1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description: P2P_DC1-LEAF2A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description: P2P_DC1-LEAF2B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description: P2P_DC1-SVC3A_Ethernet3 shutdown: true mtu: 1500 switchport: @@ -227,7 +227,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description: P2P_DC1-SVC3B_Ethernet3 shutdown: true mtu: 1500 switchport: @@ -237,7 +237,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet3 + description: P2P_DC1-BL1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -247,7 +247,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet3 + description: P2P_DC1-BL1B_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml index 4cc24e751b8..6c92ce3087c 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml @@ -78,38 +78,38 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' shutdown: true - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' shutdown: true address_family_evpn: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description: P2P_DC1-LEAF1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description: P2P_DC1-LEAF2A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description: P2P_DC1-LEAF2B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description: P2P_DC1-SVC3A_Ethernet4 shutdown: true mtu: 1500 switchport: @@ -227,7 +227,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description: P2P_DC1-SVC3B_Ethernet4 shutdown: true mtu: 1500 switchport: @@ -237,7 +237,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet4 + description: P2P_DC1-BL1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -247,7 +247,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet4 + description: P2P_DC1-BL1B_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml index ee9620dc672..8f0e9efccc5 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Vlan4093 - ip_address: 172.31.255.24 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3009 updates: wait_install: true - name: Tenant_A_WAN_Zone @@ -174,7 +174,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3013 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -194,7 +194,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -214,7 +214,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3019 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -234,7 +234,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3020 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -254,7 +254,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3029 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -274,7 +274,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -450,12 +450,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -465,7 +465,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -476,7 +476,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -487,7 +487,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -495,7 +495,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -506,7 +506,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -517,7 +517,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -525,7 +525,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -536,7 +536,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 3029 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -544,18 +544,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.6/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -581,7 +581,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -606,7 +606,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -634,7 +634,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -650,7 +650,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -680,7 +680,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -704,7 +704,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -720,7 +720,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -744,7 +744,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -760,7 +760,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.251.6/31 @@ -818,7 +818,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_DC1-SPINE1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -828,7 +828,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_DC1-SPINE2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -838,7 +838,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description: P2P_DC1-SPINE3_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -848,7 +848,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description: P2P_DC1-SPINE4_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml index 6b65b9ebc67..434bd6281e6 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Vlan4093 - ip_address: 172.31.255.32 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -114,7 +114,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3009 updates: wait_install: true - name: Tenant_A_WAN_Zone @@ -174,7 +174,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3013 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -194,7 +194,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -214,7 +214,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3019 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -234,7 +234,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3020 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -254,7 +254,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3029 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -274,7 +274,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -450,12 +450,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -465,7 +465,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -476,7 +476,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -487,7 +487,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -495,7 +495,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -506,7 +506,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -517,7 +517,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -525,7 +525,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -536,7 +536,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 3029 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -544,18 +544,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.7/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -581,7 +581,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -606,7 +606,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -634,7 +634,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -650,7 +650,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -680,7 +680,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -704,7 +704,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -720,7 +720,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -744,7 +744,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -760,7 +760,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.251.7/31 @@ -806,7 +806,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description: P2P_DC1-SPINE1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -816,7 +816,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description: P2P_DC1-SPINE2_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -826,7 +826,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description: P2P_DC1-SPINE3_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -836,7 +836,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description: P2P_DC1-SPINE4_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml index 7e94fc11608..8dbeb69de33 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml @@ -11,54 +11,53 @@ cvp_configlets: MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode mstp\nno spanning-tree vlan-id 4093-4094\nspanning-tree mst 0 priority 4096\n!\nvlan 150\n \ name Tenant_A_WAN_Zone_1\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n - \ trunk group MLAG\n!\nvlan 3020\n name MLAG_iBGP_Tenant_B_WAN_Zone\n trunk - group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk group - MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_WAN_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface - Port-Channel5\n description MLAG_DC1-BL1B_Port-Channel5\n no shutdown\n switchport - mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n - \ description P2P_LINK_TO_DC1-SPINE1_Ethernet6\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.41/31\n!\ninterface Ethernet2\n description - P2P_LINK_TO_DC1-SPINE2_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.43/31\n!\ninterface Ethernet3\n description P2P_LINK_TO_DC1-SPINE3_Ethernet6\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.45/31\n!\ninterface - Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet6\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.47/31\n!\ninterface Ethernet5\n - \ description MLAG_DC1-BL1B_Ethernet5\n no shutdown\n channel-group 5 mode - active\n!\ninterface Ethernet6\n description MLAG_DC1-BL1B_Ethernet6\n no - shutdown\n channel-group 5 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.10/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ trunk group MLAG\n!\nvlan 3020\n name MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk + group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n + \ description MLAG_DC1-BL1B_Port-Channel5\n no shutdown\n switchport mode + trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n + \ description P2P_DC1-SPINE1_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n + \ ip address 172.31.255.41/31\n!\ninterface Ethernet2\n description P2P_DC1-SPINE2_Ethernet6\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.43/31\n!\ninterface + Ethernet3\n description P2P_DC1-SPINE3_Ethernet6\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.45/31\n!\ninterface Ethernet4\n description + P2P_DC1-SPINE4_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.47/31\n!\ninterface Ethernet5\n description MLAG_DC1-BL1B_Ethernet5\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description + MLAG_DC1-BL1B_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.10/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.110/24\n!\ninterface Vlan150\n description Tenant_A_WAN_Zone_1\n \ no shutdown\n vrf Tenant_A_WAN_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface Vlan250\n description Tenant_B_WAN_Zone_1\n no shutdown\n vrf Tenant_B_WAN_Zone\n \ ip address virtual 10.2.50.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n \ no shutdown\n vrf Tenant_C_WAN_Zone\n ip address virtual 10.3.50.1/24\n!\ninterface - Vlan3013\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan3020\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan3030\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.10/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.10/31\n!\ninterface - Vxlan1\n description DC1-BL1A_VTEP\n vxlan source-interface Loopback1\n vxlan - virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n - \ vxlan vlan 150 vni 10150\n vxlan vlan 250 vni 20250\n vxlan vlan 350 vni - 30350\n vxlan vrf Tenant_A_WAN_Zone vni 14\n vxlan vrf Tenant_B_WAN_Zone vni - 21\n vxlan vrf Tenant_C_WAN_Zone vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip - routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing - vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n - \ peer-address 10.255.252.11\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map + Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface Vlan3030\n description + MLAG_L3_VRF_Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n + \ ip address 10.255.251.10/31\n!\ninterface Vlan4093\n description MLAG_L3\n + \ no shutdown\n mtu 1500\n ip address 10.255.251.10/31\n!\ninterface Vlan4094\n + \ description MLAG\n no shutdown\n mtu 1500\n no autostate\n ip address + 10.255.252.10/31\n!\ninterface Vxlan1\n description DC1-BL1A_VTEP\n vxlan + source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 150 vni 10150\n vxlan + vlan 250 vni 20250\n vxlan vlan 350 vni 30350\n vxlan vrf Tenant_A_WAN_Zone + vni 14\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_WAN_Zone + vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip routing\nno + ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing vrf Tenant_B_WAN_Zone\nip + routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq + 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag + configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n peer-address + 10.255.252.11\n peer-link Port-Channel5\n reload-delay mlag 300\n reload-delay + non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface + vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP + permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65104\n @@ -76,8 +75,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n neighbor 172.31.255.40 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.40 remote-as 65001\n neighbor + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan4093\n neighbor 172.31.255.40 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.40 remote-as 65001\n neighbor 172.31.255.40 description DC1-SPINE1_Ethernet6\n neighbor 172.31.255.42 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.42 remote-as 65001\n neighbor 172.31.255.42 description DC1-SPINE2_Ethernet6\n neighbor 172.31.255.44 peer @@ -86,33 +85,34 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.46 remote-as 65001\n neighbor 172.31.255.46 description DC1-SPINE4_Ethernet6\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n - \ rd 192.168.255.10:14\n route-target both 14:14\n redistribute - learned\n vlan 150\n !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd - 192.168.255.10:21\n route-target both 21:21\n redistribute learned\n - \ vlan 250\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n - \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n - \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family - ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS - activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_WAN_Zone\n - \ rd 192.168.255.10:14\n route-target import evpn 14:14\n route-target - export evpn 14:14\n router-id 192.168.255.10\n update wait-install\n - \ neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor - 10.255.251.11 description DC1-BL1B\n redistribute connected\n !\n vrf - Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target import evpn - 21:21\n route-target export evpn 21:21\n router-id 192.168.255.10\n + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd 192.168.255.10:14\n + \ route-target both 14:14\n redistribute learned\n vlan 150\n !\n + \ vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target + both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle + Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target both 31:31\n + \ redistribute learned\n vlan 350\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER + activate\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.10:14\n route-target + import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.10\n + \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3013\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target + import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.10\n \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.10\n \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-BL1B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -125,54 +125,53 @@ cvp_configlets: MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode mstp\nno spanning-tree vlan-id 4093-4094\nspanning-tree mst 0 priority 4096\n!\nvlan 150\n \ name Tenant_A_WAN_Zone_1\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n - \ trunk group MLAG\n!\nvlan 3020\n name MLAG_iBGP_Tenant_B_WAN_Zone\n trunk - group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk group - MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_WAN_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface - Port-Channel5\n description MLAG_DC1-BL1A_Port-Channel5\n no shutdown\n switchport - mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n - \ description P2P_LINK_TO_DC1-SPINE1_Ethernet7\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.49/31\n!\ninterface Ethernet2\n description - P2P_LINK_TO_DC1-SPINE2_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.51/31\n!\ninterface Ethernet3\n description P2P_LINK_TO_DC1-SPINE3_Ethernet7\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.53/31\n!\ninterface - Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet7\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.55/31\n!\ninterface Ethernet5\n - \ description MLAG_DC1-BL1A_Ethernet5\n no shutdown\n channel-group 5 mode - active\n!\ninterface Ethernet6\n description MLAG_DC1-BL1A_Ethernet6\n no - shutdown\n channel-group 5 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.11/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ trunk group MLAG\n!\nvlan 3020\n name MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk + group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n + \ description MLAG_DC1-BL1A_Port-Channel5\n no shutdown\n switchport mode + trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n + \ description P2P_DC1-SPINE1_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n + \ ip address 172.31.255.49/31\n!\ninterface Ethernet2\n description P2P_DC1-SPINE2_Ethernet7\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.51/31\n!\ninterface + Ethernet3\n description P2P_DC1-SPINE3_Ethernet7\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.53/31\n!\ninterface Ethernet4\n description + P2P_DC1-SPINE4_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.55/31\n!\ninterface Ethernet5\n description MLAG_DC1-BL1A_Ethernet5\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description + MLAG_DC1-BL1A_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.11/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.111/24\n!\ninterface Vlan150\n description Tenant_A_WAN_Zone_1\n \ no shutdown\n vrf Tenant_A_WAN_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface Vlan250\n description Tenant_B_WAN_Zone_1\n no shutdown\n vrf Tenant_B_WAN_Zone\n \ ip address virtual 10.2.50.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n \ no shutdown\n vrf Tenant_C_WAN_Zone\n ip address virtual 10.3.50.1/24\n!\ninterface - Vlan3013\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan3020\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan3030\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.11/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.11/31\n!\ninterface - Vxlan1\n description DC1-BL1B_VTEP\n vxlan source-interface Loopback1\n vxlan - virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n - \ vxlan vlan 150 vni 10150\n vxlan vlan 250 vni 20250\n vxlan vlan 350 vni - 30350\n vxlan vrf Tenant_A_WAN_Zone vni 14\n vxlan vrf Tenant_B_WAN_Zone vni - 21\n vxlan vrf Tenant_C_WAN_Zone vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip - routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing - vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n - \ peer-address 10.255.252.10\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map + Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface Vlan3030\n description + MLAG_L3_VRF_Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n + \ ip address 10.255.251.11/31\n!\ninterface Vlan4093\n description MLAG_L3\n + \ no shutdown\n mtu 1500\n ip address 10.255.251.11/31\n!\ninterface Vlan4094\n + \ description MLAG\n no shutdown\n mtu 1500\n no autostate\n ip address + 10.255.252.11/31\n!\ninterface Vxlan1\n description DC1-BL1B_VTEP\n vxlan + source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 150 vni 10150\n vxlan + vlan 250 vni 20250\n vxlan vlan 350 vni 30350\n vxlan vrf Tenant_A_WAN_Zone + vni 14\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_WAN_Zone + vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip routing\nno + ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing vrf Tenant_B_WAN_Zone\nip + routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq + 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag + configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n peer-address + 10.255.252.10\n peer-link Port-Channel5\n reload-delay mlag 300\n reload-delay + non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface + vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP + permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65104\n @@ -190,8 +189,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n neighbor 172.31.255.48 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.48 remote-as 65001\n neighbor + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan4093\n neighbor 172.31.255.48 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.48 remote-as 65001\n neighbor 172.31.255.48 description DC1-SPINE1_Ethernet7\n neighbor 172.31.255.50 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.50 remote-as 65001\n neighbor 172.31.255.50 description DC1-SPINE2_Ethernet7\n neighbor 172.31.255.52 peer @@ -200,33 +199,34 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.54 remote-as 65001\n neighbor 172.31.255.54 description DC1-SPINE4_Ethernet7\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n - \ rd 192.168.255.11:14\n route-target both 14:14\n redistribute - learned\n vlan 150\n !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd - 192.168.255.11:21\n route-target both 21:21\n redistribute learned\n - \ vlan 250\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n - \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n - \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family - ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS - activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_WAN_Zone\n - \ rd 192.168.255.11:14\n route-target import evpn 14:14\n route-target - export evpn 14:14\n router-id 192.168.255.11\n update wait-install\n - \ neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor - 10.255.251.10 description DC1-BL1A\n redistribute connected\n !\n vrf - Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target import evpn - 21:21\n route-target export evpn 21:21\n router-id 192.168.255.11\n + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd 192.168.255.11:14\n + \ route-target both 14:14\n redistribute learned\n vlan 150\n !\n + \ vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target + both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle + Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target both 31:31\n + \ redistribute learned\n vlan 350\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER + activate\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.11:14\n route-target + import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.11\n \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3013\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target + import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.11\n + \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.11\n \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-L2LEAF1A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -267,9 +267,9 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG_PEER\n trunk group - MLAG\n!\nvrf instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n - \ no shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG\n trunk group MLAG\n!\nvrf + instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n no + shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 1\n!\ninterface Port-Channel3\n \ description MLAG_DC1-L2LEAF2B_Port-Channel3\n no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n @@ -279,9 +279,9 @@ cvp_configlets: \ no shutdown\n channel-group 3 mode active\n!\ninterface Ethernet4\n description MLAG_DC1-L2LEAF2B_Ethernet4\n no shutdown\n channel-group 3 mode active\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip - address 192.168.200.113/24\n!\ninterface Vlan4094\n description MLAG_PEER\n - \ no shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.16/31\nno - ip routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface + address 192.168.200.113/24\n!\ninterface Vlan4094\n description MLAG\n no + shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.16/31\nno ip + routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface Vlan4094\n peer-address 10.255.252.17\n peer-link Port-Channel3\n reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nend\n" @@ -303,9 +303,9 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG_PEER\n trunk group - MLAG\n!\nvrf instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n - \ no shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG\n trunk group MLAG\n!\nvrf + instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n no + shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 1\n!\ninterface Port-Channel3\n \ description MLAG_DC1-L2LEAF2A_Port-Channel3\n no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n @@ -315,9 +315,9 @@ cvp_configlets: \ no shutdown\n channel-group 3 mode active\n!\ninterface Ethernet4\n description MLAG_DC1-L2LEAF2A_Ethernet4\n no shutdown\n channel-group 3 mode active\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip - address 192.168.200.114/24\n!\ninterface Vlan4094\n description MLAG_PEER\n - \ no shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.17/31\nno - ip routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface + address 192.168.200.114/24\n!\ninterface Vlan4094\n description MLAG\n no + shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.17/31\nno ip + routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface Vlan4094\n peer-address 10.255.252.16\n peer-link Port-Channel3\n reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nend\n" @@ -334,18 +334,18 @@ cvp_configlets: mode mstp\nspanning-tree mst 0 priority 4096\n!\nvlan 120\n name Tenant_A_WEB_Zone_1\n!\nvlan 121\n name Tenant_A_WEBZone_2\n!\nvlan 130\n name Tenant_A_APP_Zone_1\n!\nvlan 131\n name Tenant_A_APP_Zone_2\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf - instance Tenant_A_WEB_Zone\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet1\n + instance Tenant_A_WEB_Zone\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet1\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.1/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.3/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet1\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.5/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.7/31\n!\ninterface Ethernet6\n description SERVER_server02_SINGLE_NODE_TRUNK_Eth1\n - \ no shutdown\n switchport trunk allowed vlan 110-111,210-211\n switchport - mode trunk\n switchport\n!\ninterface Ethernet7\n description SERVER_server02_SINGLE_NODE_Eth1\n - \ no shutdown\n switchport access vlan 110\n switchport mode access\n switchport\n!\ninterface - Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.5/32\n!\ninterface + Ethernet2\n description P2P_DC1-SPINE2_Ethernet1\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.3/31\n!\ninterface Ethernet3\n description + P2P_DC1-SPINE3_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.5/31\n!\ninterface Ethernet4\n description P2P_DC1-SPINE4_Ethernet1\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.7/31\n!\ninterface + Ethernet6\n description SERVER_server02_SINGLE_NODE_TRUNK_Eth1\n no shutdown\n + \ switchport trunk allowed vlan 110-111,210-211\n switchport mode trunk\n switchport\n!\ninterface + Ethernet7\n description SERVER_server02_SINGLE_NODE_Eth1\n no shutdown\n switchport + access vlan 110\n switchport mode access\n switchport\n!\ninterface Loopback0\n + \ description ROUTER_ID\n no shutdown\n ip address 192.168.255.5/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.5/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.105/24\n!\ninterface Vlan120\n description Tenant_A_WEB_Zone_1\n @@ -384,23 +384,24 @@ cvp_configlets: \ neighbor 172.31.255.6 remote-as 65001\n neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.1 remote-as 65001\n neighbor 192.168.255.1 description - DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description DC1-SPINE2\n - \ neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 - remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n neighbor - 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as - 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute connected - route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd - 192.168.255.5:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n - \ route-target both 11:11\n redistribute learned\n vlan 120-121\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.5:12\n - \ route-target import evpn 12:12\n route-target export evpn 12:12\n router-id - 192.168.255.5\n redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n - \ rd 192.168.255.5:11\n route-target import evpn 11:11\n route-target - export evpn 11:11\n router-id 192.168.255.5\n redistribute connected\n!\nend\n" + DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description + DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description + DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.4 remote-as 65001\n neighbor 192.168.255.4 description + DC1-SPINE4_Loopback0\n redistribute connected route-map RM-CONN-2-BGP\n !\n + \ vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.5:12\n route-target + both 12:12\n redistribute learned\n vlan 130-131\n !\n vlan-aware-bundle + Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n route-target both 11:11\n + \ redistribute learned\n vlan 120-121\n !\n address-family evpn\n + \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no + neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n + \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.5:12\n route-target + import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.5\n + \ redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n + \ route-target import evpn 11:11\n route-target export evpn 11:11\n router-id + 192.168.255.5\n redistribute connected\n!\nend\n" AVD_DC1-LEAF2A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -418,13 +419,13 @@ cvp_configlets: 140\n name Tenant_A_DB_BZone_1\n!\nvlan 141\n name Tenant_A_DB_Zone_2\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n - \ name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name - MLAG_iBGP_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n - \ trunk group MLAG\n!\nvlan 3019\n name MLAG_iBGP_Tenant_B_OP_Zone\n trunk - group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n trunk group MLAG\n!\nvlan - 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n name MLAG_PEER\n - \ trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n + \ name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name + MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ trunk group MLAG\n!\nvlan 3019\n name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk + group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\ninterface Port-Channel5\n \ description MLAG_DC1-LEAF2B_Port-Channel5\n no shutdown\n switchport mode @@ -433,26 +434,25 @@ cvp_configlets: 110-111,120-121,130-131\n switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server01_MLAG\n no shutdown\n switchport trunk allowed vlan 210-211\n switchport mode trunk\n switchport\n mlag 10\n!\ninterface - Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.9/31\n!\ninterface Ethernet2\n - \ description P2P_LINK_TO_DC1-SPINE2_Ethernet2\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.11/31\n!\ninterface Ethernet3\n description - P2P_LINK_TO_DC1-SPINE3_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.13/31\n!\ninterface Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet2\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.15/31\n!\ninterface - Ethernet5\n description MLAG_DC1-LEAF2B_Ethernet5\n no shutdown\n channel-group - 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-LEAF2B_Ethernet6\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description - DC1-L2LEAF1A_Ethernet1\n no shutdown\n channel-group 7 mode active\n!\ninterface - Ethernet10\n description SERVER_server01_MLAG_Eth2\n no shutdown\n channel-group - 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n - \ ip address 192.168.255.6/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n - \ no shutdown\n ip address 192.168.254.6/32\n!\ninterface Loopback100\n description - Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address 10.255.1.6/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n - \ no shutdown\n vrf MGMT\n ip address 192.168.200.106/24\n!\ninterface Vlan110\n - \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet1\n description P2P_DC1-SPINE1_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.9/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.11/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet2\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.13/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.15/31\n!\ninterface Ethernet5\n description + MLAG_DC1-LEAF2B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-LEAF2B_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF1A_Ethernet1\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description + SERVER_server01_MLAG_Eth2\n no shutdown\n channel-group 10 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.6/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface + Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n + \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.6/32\n!\ninterface Management1\n + \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.106/24\n!\ninterface + Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n + \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -471,50 +471,49 @@ cvp_configlets: Vlan310\n description Tenant_C_OP_Zone_1\n no shutdown\n vrf Tenant_C_OP_Zone\n \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface - Vlan3009\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3010\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3011\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_APP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3012\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3019\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3029\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.2/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.2/31\n!\ninterface - Vxlan1\n description DC1-LEAF2A_VTEP\n vxlan source-interface Loopback1\n - \ vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port - 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan - 120 vni 10120\n vxlan vlan 121 vni 10121\n vxlan vlan 130 vni 10130\n vxlan - vlan 131 vni 10131\n vxlan vlan 140 vni 10140\n vxlan vlan 141 vni 10141\n - \ vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 310 vni - 30310\n vxlan vlan 311 vni 30311\n vxlan vrf Tenant_A_APP_Zone vni 12\n vxlan - vrf Tenant_A_DB_Zone vni 13\n vxlan vrf Tenant_A_OP_Zone vni 10\n vxlan vrf - Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_C_OP_Zone - vni 30\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip address virtual - source-nat vrf Tenant_A_OP_Zone address 10.255.1.6\n!\nip routing\nno ip routing - vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip routing vrf Tenant_A_DB_Zone\nip - routing vrf Tenant_A_OP_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf - Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n local-interface Vlan4094\n - \ peer-address 10.255.252.3\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map - RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link - less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n - \ router-id 192.168.255.6\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor - EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor - EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS - send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS + Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3010\n + \ description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_WEB_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3011\n description + MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n + \ ip address 10.255.251.2/31\n!\ninterface Vlan3012\n description MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.2/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3029\n + \ description MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_C_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan4093\n description + MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.2/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.2/31\n!\ninterface Vxlan1\n description DC1-LEAF2A_VTEP\n + \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan + vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n + \ vxlan vlan 130 vni 10130\n vxlan vlan 131 vni 10131\n vxlan vlan 140 vni + 10140\n vxlan vlan 141 vni 10141\n vxlan vlan 210 vni 20210\n vxlan vlan + 211 vni 20211\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan + vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_DB_Zone vni 13\n vxlan vrf + Tenant_A_OP_Zone vni 10\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone + vni 20\n vxlan vrf Tenant_C_OP_Zone vni 30\n!\nip virtual-router mac-address + 00:dc:00:00:00:0a\n!\nip address virtual source-nat vrf Tenant_A_OP_Zone address + 10.255.1.6\n!\nip routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip + routing vrf Tenant_A_DB_Zone\nip routing vrf Tenant_A_OP_Zone\nip routing vrf + Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n + \ seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n + \ local-interface Vlan4094\n peer-address 10.255.252.3\n peer-link Port-Channel5\n + \ reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 + 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT + 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match ip address + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n + \ description Make routes learned over MLAG Peer-link less preferred on spines + to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop + interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n router-id 192.168.255.6\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n + \ neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS + password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS send-community\n + \ neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS password 7 AQQvKeimxJu+uGQ/yYvv9w==\n \ neighbor IPv4-UNDERLAY-PEERS send-community\n neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER peer group\n neighbor @@ -523,8 +522,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n neighbor 172.31.255.8 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.8 remote-as 65001\n neighbor + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan4093\n neighbor 172.31.255.8 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.8 remote-as 65001\n neighbor 172.31.255.8 description DC1-SPINE1_Ethernet2\n neighbor 172.31.255.10 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.10 remote-as 65001\n neighbor 172.31.255.10 description DC1-SPINE2_Ethernet2\n neighbor 172.31.255.12 peer @@ -533,50 +532,52 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.14 remote-as 65001\n neighbor 172.31.255.14 description DC1-SPINE4_Ethernet2\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.6:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.6:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target both 11:11\n - \ redistribute learned\n vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n - \ rd 192.168.255.6:20\n route-target both 20:20\n redistribute learned\n - \ vlan 210-211\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.6:30\n - \ route-target both 30:30\n redistribute learned\n vlan 310-311\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n - \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.6:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.6\n - \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.6:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd + 192.168.255.6:11\n route-target both 11:11\n redistribute learned\n + \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.6:20\n + \ route-target both 20:20\n redistribute learned\n vlan 210-211\n + \ !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target + both 30:30\n redistribute learned\n vlan 310-311\n !\n address-family + evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n + \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.6:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.6\n update wait-install\n + \ neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.3 description DC1-LEAF2B_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3029\n redistribute + connected\n!\nend\n" AVD_DC1-LEAF2B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -594,13 +595,13 @@ cvp_configlets: 140\n name Tenant_A_DB_BZone_1\n!\nvlan 141\n name Tenant_A_DB_Zone_2\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n - \ name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name - MLAG_iBGP_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n - \ trunk group MLAG\n!\nvlan 3019\n name MLAG_iBGP_Tenant_B_OP_Zone\n trunk - group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n trunk group MLAG\n!\nvlan - 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n name MLAG_PEER\n - \ trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n + \ name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name + MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ trunk group MLAG\n!\nvlan 3019\n name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk + group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\ninterface Port-Channel5\n \ description MLAG_DC1-LEAF2A_Port-Channel5\n no shutdown\n switchport mode @@ -609,26 +610,25 @@ cvp_configlets: 110-111,120-121,130-131\n switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server01_MLAG\n no shutdown\n switchport trunk allowed vlan 210-211\n switchport mode trunk\n switchport\n mlag 10\n!\ninterface - Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.17/31\n!\ninterface Ethernet2\n - \ description P2P_LINK_TO_DC1-SPINE2_Ethernet3\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.19/31\n!\ninterface Ethernet3\n description - P2P_LINK_TO_DC1-SPINE3_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.21/31\n!\ninterface Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet3\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.23/31\n!\ninterface - Ethernet5\n description MLAG_DC1-LEAF2A_Ethernet5\n no shutdown\n channel-group - 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-LEAF2A_Ethernet6\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description - DC1-L2LEAF1A_Ethernet2\n no shutdown\n channel-group 7 mode active\n!\ninterface - Ethernet10\n description SERVER_server01_MLAG_Eth3\n no shutdown\n channel-group - 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n - \ ip address 192.168.255.7/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n - \ no shutdown\n ip address 192.168.254.6/32\n!\ninterface Loopback100\n description - Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address 10.255.1.7/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n - \ no shutdown\n vrf MGMT\n ip address 192.168.200.107/24\n!\ninterface Vlan110\n - \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet1\n description P2P_DC1-SPINE1_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.17/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.19/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet3\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.21/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.23/31\n!\ninterface Ethernet5\n description + MLAG_DC1-LEAF2A_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-LEAF2A_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF1A_Ethernet2\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description + SERVER_server01_MLAG_Eth3\n no shutdown\n channel-group 10 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.7/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface + Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n + \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.7/32\n!\ninterface Management1\n + \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.107/24\n!\ninterface + Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n + \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -647,50 +647,49 @@ cvp_configlets: Vlan310\n description Tenant_C_OP_Zone_1\n no shutdown\n vrf Tenant_C_OP_Zone\n \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface - Vlan3009\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3010\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3011\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_APP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3012\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3019\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3029\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.3/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.3/31\n!\ninterface - Vxlan1\n description DC1-LEAF2B_VTEP\n vxlan source-interface Loopback1\n - \ vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port - 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan - 120 vni 10120\n vxlan vlan 121 vni 10121\n vxlan vlan 130 vni 10130\n vxlan - vlan 131 vni 10131\n vxlan vlan 140 vni 10140\n vxlan vlan 141 vni 10141\n - \ vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 310 vni - 30310\n vxlan vlan 311 vni 30311\n vxlan vrf Tenant_A_APP_Zone vni 12\n vxlan - vrf Tenant_A_DB_Zone vni 13\n vxlan vrf Tenant_A_OP_Zone vni 10\n vxlan vrf - Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_C_OP_Zone - vni 30\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip address virtual - source-nat vrf Tenant_A_OP_Zone address 10.255.1.7\n!\nip routing\nno ip routing - vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip routing vrf Tenant_A_DB_Zone\nip - routing vrf Tenant_A_OP_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf - Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n local-interface Vlan4094\n - \ peer-address 10.255.252.2\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map - RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link - less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n - \ router-id 192.168.255.7\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor - EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor - EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS - send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS + Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3010\n + \ description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_WEB_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3011\n description + MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n + \ ip address 10.255.251.3/31\n!\ninterface Vlan3012\n description MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.3/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3029\n + \ description MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_C_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan4093\n description + MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.3/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.3/31\n!\ninterface Vxlan1\n description DC1-LEAF2B_VTEP\n + \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan + vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n + \ vxlan vlan 130 vni 10130\n vxlan vlan 131 vni 10131\n vxlan vlan 140 vni + 10140\n vxlan vlan 141 vni 10141\n vxlan vlan 210 vni 20210\n vxlan vlan + 211 vni 20211\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan + vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_DB_Zone vni 13\n vxlan vrf + Tenant_A_OP_Zone vni 10\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone + vni 20\n vxlan vrf Tenant_C_OP_Zone vni 30\n!\nip virtual-router mac-address + 00:dc:00:00:00:0a\n!\nip address virtual source-nat vrf Tenant_A_OP_Zone address + 10.255.1.7\n!\nip routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip + routing vrf Tenant_A_DB_Zone\nip routing vrf Tenant_A_OP_Zone\nip routing vrf + Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n + \ seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n + \ local-interface Vlan4094\n peer-address 10.255.252.2\n peer-link Port-Channel5\n + \ reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 + 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT + 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match ip address + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n + \ description Make routes learned over MLAG Peer-link less preferred on spines + to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop + interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n router-id 192.168.255.7\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n + \ neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS + password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS send-community\n + \ neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS password 7 AQQvKeimxJu+uGQ/yYvv9w==\n \ neighbor IPv4-UNDERLAY-PEERS send-community\n neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER peer group\n neighbor @@ -699,8 +698,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n neighbor 172.31.255.16 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.16 remote-as 65001\n neighbor + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan4093\n neighbor 172.31.255.16 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.16 remote-as 65001\n neighbor 172.31.255.16 description DC1-SPINE1_Ethernet3\n neighbor 172.31.255.18 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.18 remote-as 65001\n neighbor 172.31.255.18 description DC1-SPINE2_Ethernet3\n neighbor 172.31.255.20 peer @@ -709,50 +708,52 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.22 remote-as 65001\n neighbor 172.31.255.22 description DC1-SPINE4_Ethernet3\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.7:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.7:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target both 11:11\n - \ redistribute learned\n vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n - \ rd 192.168.255.7:20\n route-target both 20:20\n redistribute learned\n - \ vlan 210-211\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.7:30\n - \ route-target both 30:30\n redistribute learned\n vlan 310-311\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n - \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.7:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.7\n - \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.7:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd + 192.168.255.7:11\n route-target both 11:11\n redistribute learned\n + \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.7:20\n + \ route-target both 20:20\n redistribute learned\n vlan 210-211\n + \ !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target + both 30:30\n redistribute learned\n vlan 310-311\n !\n address-family + evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n + \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.7:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.7\n update wait-install\n + \ neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.2 description DC1-LEAF2A_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3029\n redistribute + connected\n!\nend\n" AVD_DC1-SPINE1: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -763,30 +764,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE1\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet1\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet1\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.0/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.8/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet1\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.16/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet1\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.24/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet1\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.32/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.40/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet1\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.48/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.1/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.101/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.1\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet1\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.8/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.16/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet1\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.24/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet1\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.32/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.40/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet1\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.48/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.1/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.101/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.1\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -807,21 +808,22 @@ cvp_configlets: 172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.49 remote-as 65104\n neighbor 172.31.255.49 description DC1-BL1B_Ethernet1\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.5 remote-as 65101\n neighbor - 192.168.255.5 description DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description - DC1-LEAF2A\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n - \ neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 - remote-as 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 - description DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n - \ neighbor 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer - group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 remote-as 65104\n neighbor - 192.168.255.10 description DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n + 192.168.255.5 description DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.6 remote-as 65102\n neighbor + 192.168.255.6 description DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 remote-as 65102\n neighbor + 192.168.255.7 description DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as 65103\n neighbor + 192.168.255.8 shutdown\n neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n + \ neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 + remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor 192.168.255.9 + description DC1-SVC3B_Loopback0\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description + DC1-BL1A_Loopback0\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description - DC1-BL1B\n redistribute connected route-map RM-CONN-2-BGP\n !\n address-family - evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n - \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + DC1-BL1B_Loopback0\n redistribute connected route-map RM-CONN-2-BGP\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE2: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin @@ -833,30 +835,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE2\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet2\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet2\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.2/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.10/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet2\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.18/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet2\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.26/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet2\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.34/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.42/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet2\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.50/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.2/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.102/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.2\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.10/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.18/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet2\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.26/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet2\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.34/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.42/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet2\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.50/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.2/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.102/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.2\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -878,21 +880,22 @@ cvp_configlets: \ neighbor 172.31.255.51 remote-as 65104\n neighbor 172.31.255.51 description DC1-BL1B_Ethernet2\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE3: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -903,30 +906,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE3\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet3\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet3\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.4/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.12/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet3\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.20/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet3\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.28/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet3\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.36/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.44/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet3\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.52/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.3/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.103/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.3\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.12/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.20/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet3\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.28/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet3\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.36/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.44/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet3\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.52/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.3/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.103/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.3\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -948,21 +951,22 @@ cvp_configlets: \ neighbor 172.31.255.53 remote-as 65104\n neighbor 172.31.255.53 description DC1-BL1B_Ethernet3\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE4: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -973,30 +977,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE4\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet4\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet4\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.6/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.14/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet4\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.22/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet4\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.30/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet4\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.38/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.46/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet4\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.54/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.4/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.104/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.4\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.14/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.22/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet4\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.30/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet4\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.38/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.46/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet4\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.54/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.4/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.104/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.4\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -1018,21 +1022,22 @@ cvp_configlets: \ neighbor 172.31.255.55 remote-as 65104\n neighbor 172.31.255.55 description DC1-BL1B_Ethernet4\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SVC3A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -1051,48 +1056,48 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3010\n name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk - group MLAG\n!\nvlan 3011\n name MLAG_iBGP_Tenant_A_APP_Zone\n trunk group - MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan - 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n - \ name MLAG_iBGP_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name - MLAG_iBGP_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk - group MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf - instance Tenant_A_WAN_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance - Tenant_B_OP_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf - instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n description MLAG_DC1-SVC3B_Port-Channel5\n - \ no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface - Port-Channel7\n description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk - allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport - mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description - SERVER_server03_ESI\n no shutdown\n switchport trunk allowed vlan 110-111,210-211\n - \ switchport mode trunk\n switchport\n evpn ethernet-segment\n identifier - 0000:0000:0303:0202:0101\n route-target import 03:03:02:02:01:01\n lacp - system-id 0303.0202.0101\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet4\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.25/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.27/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet4\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.29/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.31/31\n!\ninterface Ethernet5\n description MLAG_DC1-SVC3B_Ethernet5\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description - MLAG_DC1-SVC3B_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface - Ethernet7\n description DC1-L2LEAF2A_Ethernet1\n no shutdown\n channel-group - 7 mode active\n!\ninterface Ethernet8\n description DC1-L2LEAF2B_Ethernet1\n - \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description - SERVER_server03_ESI_Eth1\n no shutdown\n channel-group 10 mode active\n!\ninterface - Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.8/32\n!\ninterface - Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface - Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n - \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.8/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.108/24\n!\ninterface - Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n - \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3010\n name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk + group MLAG\n!\nvlan 3011\n name MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group + MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan + 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n + \ name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name + MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk + group MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n + \ name MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance + Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface + Port-Channel5\n description MLAG_DC1-SVC3B_Port-Channel5\n no shutdown\n switchport + mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Port-Channel7\n + \ description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk allowed vlan + 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport mode + trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server03_ESI\n + \ no shutdown\n switchport trunk allowed vlan 110-111,210-211\n switchport + mode trunk\n switchport\n evpn ethernet-segment\n identifier 0000:0000:0303:0202:0101\n + \ route-target import 03:03:02:02:01:01\n lacp system-id 0303.0202.0101\n!\ninterface + Ethernet1\n description P2P_DC1-SPINE1_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.25/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.27/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet4\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.29/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.31/31\n!\ninterface Ethernet5\n description + MLAG_DC1-SVC3B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-SVC3B_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF2A_Ethernet1\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet8\n description + DC1-L2LEAF2B_Ethernet1\n no shutdown\n channel-group 7 mode active\n!\ninterface + Ethernet10\n description SERVER_server03_ESI_Eth1\n no shutdown\n channel-group + 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n + \ ip address 192.168.255.8/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n + \ no shutdown\n ip address 192.168.254.8/32\n!\ninterface Loopback100\n description + Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address 10.255.1.8/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n + \ no shutdown\n vrf MGMT\n ip address 192.168.200.108/24\n!\ninterface Vlan110\n + \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -1115,28 +1120,25 @@ cvp_configlets: \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n no shutdown\n vrf Tenant_C_WAN_Zone\n - \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3010\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WEB_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3011\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3012\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3013\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3019\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3020\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3029\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3030\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan4093\n description MLAG_PEER_L3_PEERING\n - \ no shutdown\n mtu 1500\n ip address 10.255.251.6/31\n!\ninterface Vlan4094\n - \ description MLAG_PEER\n no shutdown\n mtu 1500\n no autostate\n ip - address 10.255.252.6/31\n!\ninterface Vxlan1\n description DC1-SVC3A_VTEP\n + \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan3010\n description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3011\n + \ description MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_APP_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3012\n description + MLAG_L3_VRF_Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n + \ ip address 10.255.251.6/31\n!\ninterface Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3029\n description + MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n + \ ip address 10.255.251.6/31\n!\ninterface Vlan3030\n description MLAG_L3_VRF_Tenant_C_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan4093\n description MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.6/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.6/31\n!\ninterface Vxlan1\n description DC1-SVC3A_VTEP\n \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n @@ -1178,8 +1180,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n neighbor 172.31.255.24 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.24 remote-as 65001\n neighbor + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan4093\n neighbor 172.31.255.24 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.24 remote-as 65001\n neighbor 172.31.255.24 description DC1-SPINE1_Ethernet4\n neighbor 172.31.255.26 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.26 remote-as 65001\n neighbor 172.31.255.26 description DC1-SPINE2_Ethernet4\n neighbor 172.31.255.28 peer @@ -1188,67 +1190,69 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.30 remote-as 65001\n neighbor 172.31.255.30 description DC1-SPINE4_Ethernet4\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.8:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.8:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target both 14:14\n - \ redistribute learned\n vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n - \ rd 192.168.255.8:11\n route-target both 11:11\n redistribute learned\n - \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.8:20\n - \ route-target both 20:20\n redistribute learned\n vlan 210-211\n - \ !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target - both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle - Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target both 30:30\n redistribute - learned\n vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd - 192.168.255.8:31\n route-target both 31:31\n redistribute learned\n - \ vlan 350\n !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS - activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n - \ neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER - activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.8:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.8\n - \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.8:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd + 192.168.255.8:14\n route-target both 14:14\n redistribute learned\n + \ vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n + \ route-target both 11:11\n redistribute learned\n vlan 120-121\n + \ !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target + both 20:20\n redistribute learned\n vlan 210-211\n !\n vlan-aware-bundle + Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target both 21:21\n + \ redistribute learned\n vlan 250\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n + \ rd 192.168.255.8:30\n route-target both 30:30\n redistribute learned\n + \ vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n + \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.8:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.8\n update wait-install\n + \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.7 description DC1-SVC3B_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3013\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3019\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3029\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-SVC3B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -1267,43 +1271,43 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3010\n name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk - group MLAG\n!\nvlan 3011\n name MLAG_iBGP_Tenant_A_APP_Zone\n trunk group - MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan - 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n - \ name MLAG_iBGP_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name - MLAG_iBGP_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk - group MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf - instance Tenant_A_WAN_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance - Tenant_B_OP_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf - instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n description MLAG_DC1-SVC3A_Port-Channel5\n - \ no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface - Port-Channel7\n description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk - allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport - mode trunk\n switchport\n mlag 7\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet5\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3010\n name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk + group MLAG\n!\nvlan 3011\n name MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group + MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan + 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n + \ name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name + MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk + group MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n + \ name MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance + Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface + Port-Channel5\n description MLAG_DC1-SVC3A_Port-Channel5\n no shutdown\n switchport + mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Port-Channel7\n + \ description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk allowed vlan + 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport mode + trunk\n switchport\n mlag 7\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet5\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.33/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet5\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.35/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet5\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.37/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet5\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.39/31\n!\ninterface Ethernet5\n description MLAG_DC1-SVC3A_Ethernet5\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description - MLAG_DC1-SVC3A_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface - Ethernet7\n description DC1-L2LEAF2A_Ethernet2\n no shutdown\n channel-group - 7 mode active\n!\ninterface Ethernet8\n description DC1-L2LEAF2B_Ethernet2\n - \ no shutdown\n channel-group 7 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.9/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface - Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n - \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.9/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.109/24\n!\ninterface - Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n - \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet2\n description P2P_DC1-SPINE2_Ethernet5\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.35/31\n!\ninterface Ethernet3\n description + P2P_DC1-SPINE3_Ethernet5\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.37/31\n!\ninterface Ethernet4\n description P2P_DC1-SPINE4_Ethernet5\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.39/31\n!\ninterface + Ethernet5\n description MLAG_DC1-SVC3A_Ethernet5\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-SVC3A_Ethernet6\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description + DC1-L2LEAF2A_Ethernet2\n no shutdown\n channel-group 7 mode active\n!\ninterface + Ethernet8\n description DC1-L2LEAF2B_Ethernet2\n no shutdown\n channel-group + 7 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n + \ ip address 192.168.255.9/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n + \ no shutdown\n ip address 192.168.254.8/32\n!\ninterface Loopback100\n description + Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address 10.255.1.9/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n + \ no shutdown\n vrf MGMT\n ip address 192.168.200.109/24\n!\ninterface Vlan110\n + \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -1326,28 +1330,25 @@ cvp_configlets: \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n no shutdown\n vrf Tenant_C_WAN_Zone\n - \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3010\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WEB_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3011\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3012\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3013\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3019\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3020\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3029\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3030\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan4093\n description MLAG_PEER_L3_PEERING\n - \ no shutdown\n mtu 1500\n ip address 10.255.251.7/31\n!\ninterface Vlan4094\n - \ description MLAG_PEER\n no shutdown\n mtu 1500\n no autostate\n ip - address 10.255.252.7/31\n!\ninterface Vxlan1\n description DC1-SVC3B_VTEP\n + \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan3010\n description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3011\n + \ description MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_APP_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3012\n description + MLAG_L3_VRF_Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n + \ ip address 10.255.251.7/31\n!\ninterface Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3029\n description + MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n + \ ip address 10.255.251.7/31\n!\ninterface Vlan3030\n description MLAG_L3_VRF_Tenant_C_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan4093\n description MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.7/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.7/31\n!\ninterface Vxlan1\n description DC1-SVC3B_VTEP\n \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n @@ -1389,8 +1390,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n neighbor 172.31.255.32 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.32 remote-as 65001\n neighbor + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan4093\n neighbor 172.31.255.32 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.32 remote-as 65001\n neighbor 172.31.255.32 description DC1-SPINE1_Ethernet5\n neighbor 172.31.255.34 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.34 remote-as 65001\n neighbor 172.31.255.34 description DC1-SPINE2_Ethernet5\n neighbor 172.31.255.36 peer @@ -1399,67 +1400,69 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.38 remote-as 65001\n neighbor 172.31.255.38 description DC1-SPINE4_Ethernet5\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.9:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.9:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target both 14:14\n - \ redistribute learned\n vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n - \ rd 192.168.255.9:11\n route-target both 11:11\n redistribute learned\n - \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.9:20\n - \ route-target both 20:20\n redistribute learned\n vlan 210-211\n - \ !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target - both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle - Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target both 30:30\n redistribute - learned\n vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd - 192.168.255.9:31\n route-target both 31:31\n redistribute learned\n - \ vlan 350\n !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS - activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n - \ neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER - activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.9:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.9\n - \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.9:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd + 192.168.255.9:14\n route-target both 14:14\n redistribute learned\n + \ vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n + \ route-target both 11:11\n redistribute learned\n vlan 120-121\n + \ !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target + both 20:20\n redistribute learned\n vlan 210-211\n !\n vlan-aware-bundle + Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target both 21:21\n + \ redistribute learned\n vlan 250\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n + \ rd 192.168.255.9:30\n route-target both 30:30\n redistribute learned\n + \ vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n + \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.9:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.9\n update wait-install\n + \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.6 description DC1-SVC3A_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3013\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3019\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3029\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3030\n redistribute + connected\n!\nend\n" cvp_topology: DC1_BL1: devices: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml index 7e94fc11608..8dbeb69de33 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml @@ -11,54 +11,53 @@ cvp_configlets: MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode mstp\nno spanning-tree vlan-id 4093-4094\nspanning-tree mst 0 priority 4096\n!\nvlan 150\n \ name Tenant_A_WAN_Zone_1\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n - \ trunk group MLAG\n!\nvlan 3020\n name MLAG_iBGP_Tenant_B_WAN_Zone\n trunk - group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk group - MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_WAN_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface - Port-Channel5\n description MLAG_DC1-BL1B_Port-Channel5\n no shutdown\n switchport - mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n - \ description P2P_LINK_TO_DC1-SPINE1_Ethernet6\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.41/31\n!\ninterface Ethernet2\n description - P2P_LINK_TO_DC1-SPINE2_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.43/31\n!\ninterface Ethernet3\n description P2P_LINK_TO_DC1-SPINE3_Ethernet6\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.45/31\n!\ninterface - Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet6\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.47/31\n!\ninterface Ethernet5\n - \ description MLAG_DC1-BL1B_Ethernet5\n no shutdown\n channel-group 5 mode - active\n!\ninterface Ethernet6\n description MLAG_DC1-BL1B_Ethernet6\n no - shutdown\n channel-group 5 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.10/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ trunk group MLAG\n!\nvlan 3020\n name MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk + group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n + \ description MLAG_DC1-BL1B_Port-Channel5\n no shutdown\n switchport mode + trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n + \ description P2P_DC1-SPINE1_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n + \ ip address 172.31.255.41/31\n!\ninterface Ethernet2\n description P2P_DC1-SPINE2_Ethernet6\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.43/31\n!\ninterface + Ethernet3\n description P2P_DC1-SPINE3_Ethernet6\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.45/31\n!\ninterface Ethernet4\n description + P2P_DC1-SPINE4_Ethernet6\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.47/31\n!\ninterface Ethernet5\n description MLAG_DC1-BL1B_Ethernet5\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description + MLAG_DC1-BL1B_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.10/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.110/24\n!\ninterface Vlan150\n description Tenant_A_WAN_Zone_1\n \ no shutdown\n vrf Tenant_A_WAN_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface Vlan250\n description Tenant_B_WAN_Zone_1\n no shutdown\n vrf Tenant_B_WAN_Zone\n \ ip address virtual 10.2.50.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n \ no shutdown\n vrf Tenant_C_WAN_Zone\n ip address virtual 10.3.50.1/24\n!\ninterface - Vlan3013\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan3020\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan3030\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.10/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.10/31\n!\ninterface - Vxlan1\n description DC1-BL1A_VTEP\n vxlan source-interface Loopback1\n vxlan - virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n - \ vxlan vlan 150 vni 10150\n vxlan vlan 250 vni 20250\n vxlan vlan 350 vni - 30350\n vxlan vrf Tenant_A_WAN_Zone vni 14\n vxlan vrf Tenant_B_WAN_Zone vni - 21\n vxlan vrf Tenant_C_WAN_Zone vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip - routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing - vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n - \ peer-address 10.255.252.11\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map + Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.10/31\n!\ninterface Vlan3030\n description + MLAG_L3_VRF_Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n + \ ip address 10.255.251.10/31\n!\ninterface Vlan4093\n description MLAG_L3\n + \ no shutdown\n mtu 1500\n ip address 10.255.251.10/31\n!\ninterface Vlan4094\n + \ description MLAG\n no shutdown\n mtu 1500\n no autostate\n ip address + 10.255.252.10/31\n!\ninterface Vxlan1\n description DC1-BL1A_VTEP\n vxlan + source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 150 vni 10150\n vxlan + vlan 250 vni 20250\n vxlan vlan 350 vni 30350\n vxlan vrf Tenant_A_WAN_Zone + vni 14\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_WAN_Zone + vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip routing\nno + ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing vrf Tenant_B_WAN_Zone\nip + routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq + 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag + configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n peer-address + 10.255.252.11\n peer-link Port-Channel5\n reload-delay mlag 300\n reload-delay + non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface + vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP + permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65104\n @@ -76,8 +75,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n neighbor 172.31.255.40 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.40 remote-as 65001\n neighbor + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan4093\n neighbor 172.31.255.40 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.40 remote-as 65001\n neighbor 172.31.255.40 description DC1-SPINE1_Ethernet6\n neighbor 172.31.255.42 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.42 remote-as 65001\n neighbor 172.31.255.42 description DC1-SPINE2_Ethernet6\n neighbor 172.31.255.44 peer @@ -86,33 +85,34 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.46 remote-as 65001\n neighbor 172.31.255.46 description DC1-SPINE4_Ethernet6\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n - \ rd 192.168.255.10:14\n route-target both 14:14\n redistribute - learned\n vlan 150\n !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd - 192.168.255.10:21\n route-target both 21:21\n redistribute learned\n - \ vlan 250\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n - \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n - \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family - ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS - activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_WAN_Zone\n - \ rd 192.168.255.10:14\n route-target import evpn 14:14\n route-target - export evpn 14:14\n router-id 192.168.255.10\n update wait-install\n - \ neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor - 10.255.251.11 description DC1-BL1B\n redistribute connected\n !\n vrf - Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target import evpn - 21:21\n route-target export evpn 21:21\n router-id 192.168.255.10\n + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd 192.168.255.10:14\n + \ route-target both 14:14\n redistribute learned\n vlan 150\n !\n + \ vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target + both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle + Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target both 31:31\n + \ redistribute learned\n vlan 350\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER + activate\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.10:14\n route-target + import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.10\n + \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3013\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n route-target + import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.10\n \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.10\n \ update wait-install\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.11 description DC1-BL1B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.11 description DC1-BL1B_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-BL1B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -125,54 +125,53 @@ cvp_configlets: MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode mstp\nno spanning-tree vlan-id 4093-4094\nspanning-tree mst 0 priority 4096\n!\nvlan 150\n \ name Tenant_A_WAN_Zone_1\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n - \ trunk group MLAG\n!\nvlan 3020\n name MLAG_iBGP_Tenant_B_WAN_Zone\n trunk - group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk group - MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_WAN_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface - Port-Channel5\n description MLAG_DC1-BL1A_Port-Channel5\n no shutdown\n switchport - mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n - \ description P2P_LINK_TO_DC1-SPINE1_Ethernet7\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.49/31\n!\ninterface Ethernet2\n description - P2P_LINK_TO_DC1-SPINE2_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.51/31\n!\ninterface Ethernet3\n description P2P_LINK_TO_DC1-SPINE3_Ethernet7\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.53/31\n!\ninterface - Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet7\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.55/31\n!\ninterface Ethernet5\n - \ description MLAG_DC1-BL1A_Ethernet5\n no shutdown\n channel-group 5 mode - active\n!\ninterface Ethernet6\n description MLAG_DC1-BL1A_Ethernet6\n no - shutdown\n channel-group 5 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.11/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ trunk group MLAG\n!\nvlan 3020\n name MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk + group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n + \ description MLAG_DC1-BL1A_Port-Channel5\n no shutdown\n switchport mode + trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n + \ description P2P_DC1-SPINE1_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n + \ ip address 172.31.255.49/31\n!\ninterface Ethernet2\n description P2P_DC1-SPINE2_Ethernet7\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.51/31\n!\ninterface + Ethernet3\n description P2P_DC1-SPINE3_Ethernet7\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.53/31\n!\ninterface Ethernet4\n description + P2P_DC1-SPINE4_Ethernet7\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.55/31\n!\ninterface Ethernet5\n description MLAG_DC1-BL1A_Ethernet5\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description + MLAG_DC1-BL1A_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.11/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.10/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.111/24\n!\ninterface Vlan150\n description Tenant_A_WAN_Zone_1\n \ no shutdown\n vrf Tenant_A_WAN_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface Vlan250\n description Tenant_B_WAN_Zone_1\n no shutdown\n vrf Tenant_B_WAN_Zone\n \ ip address virtual 10.2.50.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n \ no shutdown\n vrf Tenant_C_WAN_Zone\n ip address virtual 10.3.50.1/24\n!\ninterface - Vlan3013\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan3020\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan3030\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.11/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.11/31\n!\ninterface - Vxlan1\n description DC1-BL1B_VTEP\n vxlan source-interface Loopback1\n vxlan - virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n - \ vxlan vlan 150 vni 10150\n vxlan vlan 250 vni 20250\n vxlan vlan 350 vni - 30350\n vxlan vrf Tenant_A_WAN_Zone vni 14\n vxlan vrf Tenant_B_WAN_Zone vni - 21\n vxlan vrf Tenant_C_WAN_Zone vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip - routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing - vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n - \ peer-address 10.255.252.10\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map + Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.11/31\n!\ninterface Vlan3030\n description + MLAG_L3_VRF_Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n + \ ip address 10.255.251.11/31\n!\ninterface Vlan4093\n description MLAG_L3\n + \ no shutdown\n mtu 1500\n ip address 10.255.251.11/31\n!\ninterface Vlan4094\n + \ description MLAG\n no shutdown\n mtu 1500\n no autostate\n ip address + 10.255.252.11/31\n!\ninterface Vxlan1\n description DC1-BL1B_VTEP\n vxlan + source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 150 vni 10150\n vxlan + vlan 250 vni 20250\n vxlan vlan 350 vni 30350\n vxlan vrf Tenant_A_WAN_Zone + vni 14\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_WAN_Zone + vni 31\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip routing\nno + ip routing vrf MGMT\nip routing vrf Tenant_A_WAN_Zone\nip routing vrf Tenant_B_WAN_Zone\nip + routing vrf Tenant_C_WAN_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq + 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag + configuration\n domain-id DC1_BL1\n local-interface Vlan4094\n peer-address + 10.255.252.10\n peer-link Port-Channel5\n reload-delay mlag 300\n reload-delay + non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface + vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP + permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65104\n @@ -190,8 +189,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n neighbor 172.31.255.48 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.48 remote-as 65001\n neighbor + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan4093\n neighbor 172.31.255.48 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.48 remote-as 65001\n neighbor 172.31.255.48 description DC1-SPINE1_Ethernet7\n neighbor 172.31.255.50 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.50 remote-as 65001\n neighbor 172.31.255.50 description DC1-SPINE2_Ethernet7\n neighbor 172.31.255.52 peer @@ -200,33 +199,34 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.54 remote-as 65001\n neighbor 172.31.255.54 description DC1-SPINE4_Ethernet7\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n - \ rd 192.168.255.11:14\n route-target both 14:14\n redistribute - learned\n vlan 150\n !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd - 192.168.255.11:21\n route-target both 21:21\n redistribute learned\n - \ vlan 250\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n - \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n - \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family - ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS - activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_WAN_Zone\n - \ rd 192.168.255.11:14\n route-target import evpn 14:14\n route-target - export evpn 14:14\n router-id 192.168.255.11\n update wait-install\n - \ neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor - 10.255.251.10 description DC1-BL1A\n redistribute connected\n !\n vrf - Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target import evpn - 21:21\n route-target export evpn 21:21\n router-id 192.168.255.11\n + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd 192.168.255.11:14\n + \ route-target both 14:14\n redistribute learned\n vlan 150\n !\n + \ vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target + both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle + Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target both 31:31\n + \ redistribute learned\n vlan 350\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER + activate\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.11:14\n route-target + import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.11\n \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3013\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n route-target + import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.11\n + \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.11\n \ update wait-install\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.10 description DC1-BL1A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.10 description DC1-BL1A_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-L2LEAF1A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -267,9 +267,9 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG_PEER\n trunk group - MLAG\n!\nvrf instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n - \ no shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG\n trunk group MLAG\n!\nvrf + instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n no + shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 1\n!\ninterface Port-Channel3\n \ description MLAG_DC1-L2LEAF2B_Port-Channel3\n no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n @@ -279,9 +279,9 @@ cvp_configlets: \ no shutdown\n channel-group 3 mode active\n!\ninterface Ethernet4\n description MLAG_DC1-L2LEAF2B_Ethernet4\n no shutdown\n channel-group 3 mode active\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip - address 192.168.200.113/24\n!\ninterface Vlan4094\n description MLAG_PEER\n - \ no shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.16/31\nno - ip routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface + address 192.168.200.113/24\n!\ninterface Vlan4094\n description MLAG\n no + shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.16/31\nno ip + routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface Vlan4094\n peer-address 10.255.252.17\n peer-link Port-Channel3\n reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nend\n" @@ -303,9 +303,9 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG_PEER\n trunk group - MLAG\n!\nvrf instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n - \ no shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 4094\n name MLAG\n trunk group MLAG\n!\nvrf + instance MGMT\n!\ninterface Port-Channel1\n description DC1_SVC3_Po7\n no + shutdown\n switchport trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 1\n!\ninterface Port-Channel3\n \ description MLAG_DC1-L2LEAF2A_Port-Channel3\n no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Ethernet1\n @@ -315,9 +315,9 @@ cvp_configlets: \ no shutdown\n channel-group 3 mode active\n!\ninterface Ethernet4\n description MLAG_DC1-L2LEAF2A_Ethernet4\n no shutdown\n channel-group 3 mode active\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip - address 192.168.200.114/24\n!\ninterface Vlan4094\n description MLAG_PEER\n - \ no shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.17/31\nno - ip routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface + address 192.168.200.114/24\n!\ninterface Vlan4094\n description MLAG\n no + shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.17/31\nno ip + routing vrf MGMT\n!\nmlag configuration\n domain-id DC1_L2LEAF2\n local-interface Vlan4094\n peer-address 10.255.252.16\n peer-link Port-Channel3\n reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nend\n" @@ -334,18 +334,18 @@ cvp_configlets: mode mstp\nspanning-tree mst 0 priority 4096\n!\nvlan 120\n name Tenant_A_WEB_Zone_1\n!\nvlan 121\n name Tenant_A_WEBZone_2\n!\nvlan 130\n name Tenant_A_APP_Zone_1\n!\nvlan 131\n name Tenant_A_APP_Zone_2\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf - instance Tenant_A_WEB_Zone\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet1\n + instance Tenant_A_WEB_Zone\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet1\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.1/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.3/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet1\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.5/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.7/31\n!\ninterface Ethernet6\n description SERVER_server02_SINGLE_NODE_TRUNK_Eth1\n - \ no shutdown\n switchport trunk allowed vlan 110-111,210-211\n switchport - mode trunk\n switchport\n!\ninterface Ethernet7\n description SERVER_server02_SINGLE_NODE_Eth1\n - \ no shutdown\n switchport access vlan 110\n switchport mode access\n switchport\n!\ninterface - Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.5/32\n!\ninterface + Ethernet2\n description P2P_DC1-SPINE2_Ethernet1\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.3/31\n!\ninterface Ethernet3\n description + P2P_DC1-SPINE3_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.5/31\n!\ninterface Ethernet4\n description P2P_DC1-SPINE4_Ethernet1\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.7/31\n!\ninterface + Ethernet6\n description SERVER_server02_SINGLE_NODE_TRUNK_Eth1\n no shutdown\n + \ switchport trunk allowed vlan 110-111,210-211\n switchport mode trunk\n switchport\n!\ninterface + Ethernet7\n description SERVER_server02_SINGLE_NODE_Eth1\n no shutdown\n switchport + access vlan 110\n switchport mode access\n switchport\n!\ninterface Loopback0\n + \ description ROUTER_ID\n no shutdown\n ip address 192.168.255.5/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.5/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.105/24\n!\ninterface Vlan120\n description Tenant_A_WEB_Zone_1\n @@ -384,23 +384,24 @@ cvp_configlets: \ neighbor 172.31.255.6 remote-as 65001\n neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.1 remote-as 65001\n neighbor 192.168.255.1 description - DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description DC1-SPINE2\n - \ neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 - remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n neighbor - 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as - 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute connected - route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd - 192.168.255.5:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n - \ route-target both 11:11\n redistribute learned\n vlan 120-121\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.5:12\n - \ route-target import evpn 12:12\n route-target export evpn 12:12\n router-id - 192.168.255.5\n redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n - \ rd 192.168.255.5:11\n route-target import evpn 11:11\n route-target - export evpn 11:11\n router-id 192.168.255.5\n redistribute connected\n!\nend\n" + DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description + DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description + DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.4 remote-as 65001\n neighbor 192.168.255.4 description + DC1-SPINE4_Loopback0\n redistribute connected route-map RM-CONN-2-BGP\n !\n + \ vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.5:12\n route-target + both 12:12\n redistribute learned\n vlan 130-131\n !\n vlan-aware-bundle + Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n route-target both 11:11\n + \ redistribute learned\n vlan 120-121\n !\n address-family evpn\n + \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no + neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n + \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.5:12\n route-target + import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.5\n + \ redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.5:11\n + \ route-target import evpn 11:11\n route-target export evpn 11:11\n router-id + 192.168.255.5\n redistribute connected\n!\nend\n" AVD_DC1-LEAF2A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -418,13 +419,13 @@ cvp_configlets: 140\n name Tenant_A_DB_BZone_1\n!\nvlan 141\n name Tenant_A_DB_Zone_2\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n - \ name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name - MLAG_iBGP_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n - \ trunk group MLAG\n!\nvlan 3019\n name MLAG_iBGP_Tenant_B_OP_Zone\n trunk - group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n trunk group MLAG\n!\nvlan - 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n name MLAG_PEER\n - \ trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n + \ name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name + MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ trunk group MLAG\n!\nvlan 3019\n name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk + group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\ninterface Port-Channel5\n \ description MLAG_DC1-LEAF2B_Port-Channel5\n no shutdown\n switchport mode @@ -433,26 +434,25 @@ cvp_configlets: 110-111,120-121,130-131\n switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server01_MLAG\n no shutdown\n switchport trunk allowed vlan 210-211\n switchport mode trunk\n switchport\n mlag 10\n!\ninterface - Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.9/31\n!\ninterface Ethernet2\n - \ description P2P_LINK_TO_DC1-SPINE2_Ethernet2\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.11/31\n!\ninterface Ethernet3\n description - P2P_LINK_TO_DC1-SPINE3_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.13/31\n!\ninterface Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet2\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.15/31\n!\ninterface - Ethernet5\n description MLAG_DC1-LEAF2B_Ethernet5\n no shutdown\n channel-group - 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-LEAF2B_Ethernet6\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description - DC1-L2LEAF1A_Ethernet1\n no shutdown\n channel-group 7 mode active\n!\ninterface - Ethernet10\n description SERVER_server01_MLAG_Eth2\n no shutdown\n channel-group - 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n - \ ip address 192.168.255.6/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n - \ no shutdown\n ip address 192.168.254.6/32\n!\ninterface Loopback100\n description - Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address 10.255.1.6/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n - \ no shutdown\n vrf MGMT\n ip address 192.168.200.106/24\n!\ninterface Vlan110\n - \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet1\n description P2P_DC1-SPINE1_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.9/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.11/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet2\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.13/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.15/31\n!\ninterface Ethernet5\n description + MLAG_DC1-LEAF2B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-LEAF2B_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF1A_Ethernet1\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description + SERVER_server01_MLAG_Eth2\n no shutdown\n channel-group 10 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.6/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface + Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n + \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.6/32\n!\ninterface Management1\n + \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.106/24\n!\ninterface + Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n + \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -471,50 +471,49 @@ cvp_configlets: Vlan310\n description Tenant_C_OP_Zone_1\n no shutdown\n vrf Tenant_C_OP_Zone\n \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface - Vlan3009\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3010\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3011\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_APP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3012\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3019\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan3029\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.2/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.2/31\n!\ninterface - Vxlan1\n description DC1-LEAF2A_VTEP\n vxlan source-interface Loopback1\n - \ vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port - 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan - 120 vni 10120\n vxlan vlan 121 vni 10121\n vxlan vlan 130 vni 10130\n vxlan - vlan 131 vni 10131\n vxlan vlan 140 vni 10140\n vxlan vlan 141 vni 10141\n - \ vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 310 vni - 30310\n vxlan vlan 311 vni 30311\n vxlan vrf Tenant_A_APP_Zone vni 12\n vxlan - vrf Tenant_A_DB_Zone vni 13\n vxlan vrf Tenant_A_OP_Zone vni 10\n vxlan vrf - Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_C_OP_Zone - vni 30\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip address virtual - source-nat vrf Tenant_A_OP_Zone address 10.255.1.6\n!\nip routing\nno ip routing - vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip routing vrf Tenant_A_DB_Zone\nip - routing vrf Tenant_A_OP_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf - Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n local-interface Vlan4094\n - \ peer-address 10.255.252.3\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map - RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link - less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n - \ router-id 192.168.255.6\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor - EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor - EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS - send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS + Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3010\n + \ description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_WEB_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3011\n description + MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n + \ ip address 10.255.251.2/31\n!\ninterface Vlan3012\n description MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.2/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan3029\n + \ description MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_C_OP_Zone\n ip address 10.255.251.2/31\n!\ninterface Vlan4093\n description + MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.2/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.2/31\n!\ninterface Vxlan1\n description DC1-LEAF2A_VTEP\n + \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan + vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n + \ vxlan vlan 130 vni 10130\n vxlan vlan 131 vni 10131\n vxlan vlan 140 vni + 10140\n vxlan vlan 141 vni 10141\n vxlan vlan 210 vni 20210\n vxlan vlan + 211 vni 20211\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan + vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_DB_Zone vni 13\n vxlan vrf + Tenant_A_OP_Zone vni 10\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone + vni 20\n vxlan vrf Tenant_C_OP_Zone vni 30\n!\nip virtual-router mac-address + 00:dc:00:00:00:0a\n!\nip address virtual source-nat vrf Tenant_A_OP_Zone address + 10.255.1.6\n!\nip routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip + routing vrf Tenant_A_DB_Zone\nip routing vrf Tenant_A_OP_Zone\nip routing vrf + Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n + \ seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n + \ local-interface Vlan4094\n peer-address 10.255.252.3\n peer-link Port-Channel5\n + \ reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 + 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT + 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match ip address + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n + \ description Make routes learned over MLAG Peer-link less preferred on spines + to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop + interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n router-id 192.168.255.6\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n + \ neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS + password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS send-community\n + \ neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS password 7 AQQvKeimxJu+uGQ/yYvv9w==\n \ neighbor IPv4-UNDERLAY-PEERS send-community\n neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER peer group\n neighbor @@ -523,8 +522,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n neighbor 172.31.255.8 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.8 remote-as 65001\n neighbor + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan4093\n neighbor 172.31.255.8 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.8 remote-as 65001\n neighbor 172.31.255.8 description DC1-SPINE1_Ethernet2\n neighbor 172.31.255.10 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.10 remote-as 65001\n neighbor 172.31.255.10 description DC1-SPINE2_Ethernet2\n neighbor 172.31.255.12 peer @@ -533,50 +532,52 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.14 remote-as 65001\n neighbor 172.31.255.14 description DC1-SPINE4_Ethernet2\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.6:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.6:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target both 11:11\n - \ redistribute learned\n vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n - \ rd 192.168.255.6:20\n route-target both 20:20\n redistribute learned\n - \ vlan 210-211\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.6:30\n - \ route-target both 30:30\n redistribute learned\n vlan 310-311\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n - \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.6:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.6\n - \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.6:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd + 192.168.255.6:11\n route-target both 11:11\n redistribute learned\n + \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.6:20\n + \ route-target both 20:20\n redistribute learned\n vlan 210-211\n + \ !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target + both 30:30\n redistribute learned\n vlan 310-311\n !\n address-family + evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n + \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.6:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.6\n update wait-install\n + \ neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.3 description DC1-LEAF2B_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.6\n + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.6\n \ update wait-install\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.3 description DC1-LEAF2B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3029\n redistribute + connected\n!\nend\n" AVD_DC1-LEAF2B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -594,13 +595,13 @@ cvp_configlets: 140\n name Tenant_A_DB_BZone_1\n!\nvlan 141\n name Tenant_A_DB_Zone_2\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n - \ name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name - MLAG_iBGP_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n - \ trunk group MLAG\n!\nvlan 3019\n name MLAG_iBGP_Tenant_B_OP_Zone\n trunk - group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n trunk group MLAG\n!\nvlan - 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n name MLAG_PEER\n - \ trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n trunk group MLAG\n!\nvlan 3010\n + \ name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk group MLAG\n!\nvlan 3011\n name + MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ trunk group MLAG\n!\nvlan 3019\n name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk + group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n trunk group + MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n name + MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\ninterface Port-Channel5\n \ description MLAG_DC1-LEAF2A_Port-Channel5\n no shutdown\n switchport mode @@ -609,26 +610,25 @@ cvp_configlets: 110-111,120-121,130-131\n switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server01_MLAG\n no shutdown\n switchport trunk allowed vlan 210-211\n switchport mode trunk\n switchport\n mlag 10\n!\ninterface - Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.17/31\n!\ninterface Ethernet2\n - \ description P2P_LINK_TO_DC1-SPINE2_Ethernet3\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.19/31\n!\ninterface Ethernet3\n description - P2P_LINK_TO_DC1-SPINE3_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.21/31\n!\ninterface Ethernet4\n description P2P_LINK_TO_DC1-SPINE4_Ethernet3\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.23/31\n!\ninterface - Ethernet5\n description MLAG_DC1-LEAF2A_Ethernet5\n no shutdown\n channel-group - 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-LEAF2A_Ethernet6\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description - DC1-L2LEAF1A_Ethernet2\n no shutdown\n channel-group 7 mode active\n!\ninterface - Ethernet10\n description SERVER_server01_MLAG_Eth3\n no shutdown\n channel-group - 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n - \ ip address 192.168.255.7/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n - \ no shutdown\n ip address 192.168.254.6/32\n!\ninterface Loopback100\n description - Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address 10.255.1.7/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n - \ no shutdown\n vrf MGMT\n ip address 192.168.200.107/24\n!\ninterface Vlan110\n - \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip - address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet1\n description P2P_DC1-SPINE1_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.17/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.19/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet3\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.21/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.23/31\n!\ninterface Ethernet5\n description + MLAG_DC1-LEAF2A_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-LEAF2A_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF1A_Ethernet2\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description + SERVER_server01_MLAG_Eth3\n no shutdown\n channel-group 10 mode active\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.7/32\n!\ninterface + Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface + Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n + \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.7/32\n!\ninterface Management1\n + \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.107/24\n!\ninterface + Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n + \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -647,50 +647,49 @@ cvp_configlets: Vlan310\n description Tenant_C_OP_Zone_1\n no shutdown\n vrf Tenant_C_OP_Zone\n \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface - Vlan3009\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3010\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3011\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_APP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3012\n description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3019\n description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan3029\n description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone\n no shutdown\n - \ mtu 1500\n vrf Tenant_C_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface - Vlan4093\n description MLAG_PEER_L3_PEERING\n no shutdown\n mtu 1500\n ip - address 10.255.251.3/31\n!\ninterface Vlan4094\n description MLAG_PEER\n no - shutdown\n mtu 1500\n no autostate\n ip address 10.255.252.3/31\n!\ninterface - Vxlan1\n description DC1-LEAF2B_VTEP\n vxlan source-interface Loopback1\n - \ vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port - 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan - 120 vni 10120\n vxlan vlan 121 vni 10121\n vxlan vlan 130 vni 10130\n vxlan - vlan 131 vni 10131\n vxlan vlan 140 vni 10140\n vxlan vlan 141 vni 10141\n - \ vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 310 vni - 30310\n vxlan vlan 311 vni 30311\n vxlan vrf Tenant_A_APP_Zone vni 12\n vxlan - vrf Tenant_A_DB_Zone vni 13\n vxlan vrf Tenant_A_OP_Zone vni 10\n vxlan vrf - Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_C_OP_Zone - vni 30\n!\nip virtual-router mac-address 00:dc:00:00:00:0a\n!\nip address virtual - source-nat vrf Tenant_A_OP_Zone address 10.255.1.7\n!\nip routing\nno ip routing - vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip routing vrf Tenant_A_DB_Zone\nip - routing vrf Tenant_A_OP_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf - Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n seq 20 permit 192.168.254.0/24 eq - 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n local-interface Vlan4094\n - \ peer-address 10.255.252.2\n peer-link Port-Channel5\n reload-delay mlag - 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map - RM-MLAG-PEER-IN permit 10\n description Make routes learned over MLAG Peer-link - less preferred on spines to ensure optimal routing\n set origin incomplete\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n - \ router-id 192.168.255.7\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor - EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor - EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS - send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS + Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3010\n + \ description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_WEB_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3011\n description + MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n + \ ip address 10.255.251.3/31\n!\ninterface Vlan3012\n description MLAG_L3_VRF_Tenant_A_DB_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip address 10.255.251.3/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan3029\n + \ description MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_C_OP_Zone\n ip address 10.255.251.3/31\n!\ninterface Vlan4093\n description + MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.3/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.3/31\n!\ninterface Vxlan1\n description DC1-LEAF2B_VTEP\n + \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address + mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan + vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n + \ vxlan vlan 130 vni 10130\n vxlan vlan 131 vni 10131\n vxlan vlan 140 vni + 10140\n vxlan vlan 141 vni 10141\n vxlan vlan 210 vni 20210\n vxlan vlan + 211 vni 20211\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan + vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_DB_Zone vni 13\n vxlan vrf + Tenant_A_OP_Zone vni 10\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone + vni 20\n vxlan vrf Tenant_C_OP_Zone vni 30\n!\nip virtual-router mac-address + 00:dc:00:00:00:0a\n!\nip address virtual source-nat vrf Tenant_A_OP_Zone address + 10.255.1.7\n!\nip routing\nno ip routing vrf MGMT\nip routing vrf Tenant_A_APP_Zone\nip + routing vrf Tenant_A_DB_Zone\nip routing vrf Tenant_A_OP_Zone\nip routing vrf + Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_C_OP_Zone\n!\nip + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n + \ seq 20 permit 192.168.254.0/24 eq 32\n!\nmlag configuration\n domain-id DC1_LEAF2\n + \ local-interface Vlan4094\n peer-address 10.255.252.2\n peer-link Port-Channel5\n + \ reload-delay mlag 300\n reload-delay non-mlag 330\n!\nip route vrf MGMT 0.0.0.0/0 + 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp server vrf MGMT + 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match ip address + prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nroute-map RM-MLAG-PEER-IN permit 10\n + \ description Make routes learned over MLAG Peer-link less preferred on spines + to ensure optimal routing\n set origin incomplete\n!\nrouter bfd\n multihop + interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65102\n router-id 192.168.255.7\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n + \ neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS + password 7 q+VNViP5i4rVjW1cxFv2wA==\n neighbor EVPN-OVERLAY-PEERS send-community\n + \ neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS password 7 AQQvKeimxJu+uGQ/yYvv9w==\n \ neighbor IPv4-UNDERLAY-PEERS send-community\n neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER peer group\n neighbor @@ -699,8 +698,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n neighbor 172.31.255.16 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.16 remote-as 65001\n neighbor + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan4093\n neighbor 172.31.255.16 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.16 remote-as 65001\n neighbor 172.31.255.16 description DC1-SPINE1_Ethernet3\n neighbor 172.31.255.18 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.18 remote-as 65001\n neighbor 172.31.255.18 description DC1-SPINE2_Ethernet3\n neighbor 172.31.255.20 peer @@ -709,50 +708,52 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.22 remote-as 65001\n neighbor 172.31.255.22 description DC1-SPINE4_Ethernet3\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.7:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.7:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target both 11:11\n - \ redistribute learned\n vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n - \ rd 192.168.255.7:20\n route-target both 20:20\n redistribute learned\n - \ vlan 210-211\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.7:30\n - \ route-target both 30:30\n redistribute learned\n vlan 310-311\n - \ !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n - \ address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor - IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n - \ !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.7:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.7\n - \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.7:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd + 192.168.255.7:11\n route-target both 11:11\n redistribute learned\n + \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.7:20\n + \ route-target both 20:20\n redistribute learned\n vlan 210-211\n + \ !\n vlan-aware-bundle Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target + both 30:30\n redistribute learned\n vlan 310-311\n !\n address-family + evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n + \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.7:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.7\n update wait-install\n + \ neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.2 description DC1-LEAF2A_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.7\n + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.7\n \ update wait-install\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.2 description DC1-LEAF2A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3029\n redistribute + connected\n!\nend\n" AVD_DC1-SPINE1: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -763,30 +764,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE1\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet1\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet1\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.0/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.8/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet1\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.16/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet1\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.24/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet1\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.32/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet1\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.40/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet1\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.48/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.1/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.101/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.1\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet1\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.8/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.16/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet1\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.24/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet1\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.32/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet1\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.40/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet1\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.48/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.1/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.101/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.1\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -807,21 +808,22 @@ cvp_configlets: 172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.49 remote-as 65104\n neighbor 172.31.255.49 description DC1-BL1B_Ethernet1\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.5 remote-as 65101\n neighbor - 192.168.255.5 description DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description - DC1-LEAF2A\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n - \ neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 - remote-as 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 - description DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n - \ neighbor 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer - group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 remote-as 65104\n neighbor - 192.168.255.10 description DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n + 192.168.255.5 description DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.6 remote-as 65102\n neighbor + 192.168.255.6 description DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 remote-as 65102\n neighbor + 192.168.255.7 description DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as 65103\n neighbor + 192.168.255.8 shutdown\n neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n + \ neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 + remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor 192.168.255.9 + description DC1-SVC3B_Loopback0\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description + DC1-BL1A_Loopback0\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description - DC1-BL1B\n redistribute connected route-map RM-CONN-2-BGP\n !\n address-family - evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n - \ no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + DC1-BL1B_Loopback0\n redistribute connected route-map RM-CONN-2-BGP\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE2: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin @@ -833,30 +835,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE2\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet2\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet2\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.2/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.10/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet2\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.18/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet2\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.26/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet2\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.34/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet2\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.42/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet2\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.50/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.2/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.102/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.2\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet2\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.10/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.18/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet2\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.26/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet2\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.34/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet2\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.42/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet2\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.50/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.2/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.102/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.2\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -878,21 +880,22 @@ cvp_configlets: \ neighbor 172.31.255.51 remote-as 65104\n neighbor 172.31.255.51 description DC1-BL1B_Ethernet2\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE3: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -903,30 +906,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE3\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet3\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet3\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.4/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.12/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet3\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.20/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet3\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.28/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet3\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.36/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet3\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.44/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet3\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.52/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.3/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.103/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.3\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet3\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.12/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.20/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet3\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.28/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet3\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.36/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet3\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.44/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet3\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.52/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.3/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.103/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.3\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -948,21 +951,22 @@ cvp_configlets: \ neighbor 172.31.255.53 remote-as 65104\n neighbor 172.31.255.53 description DC1-BL1B_Ethernet3\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SPINE4: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -973,30 +977,30 @@ cvp_configlets: internal order ascending range 1006 1199\n!\ntransceiver qsfp default-mode 4x10G\n!\nservice routing protocols model multi-agent\n!\nhostname DC1-SPINE4\nip name-server vrf MGMT 8.8.8.8\nip name-server vrf MGMT 192.168.200.5\n!\nspanning-tree mode none\n!\nvrf - instance MGMT\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-LEAF1A_Ethernet4\n + instance MGMT\n!\ninterface Ethernet1\n description P2P_DC1-LEAF1A_Ethernet4\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.6/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-LEAF2A_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.14/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-LEAF2B_Ethernet4\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.22/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SVC3A_Ethernet4\n shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.30/31\n!\ninterface Ethernet5\n description P2P_LINK_TO_DC1-SVC3B_Ethernet4\n - \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.38/31\n!\ninterface - Ethernet6\n description P2P_LINK_TO_DC1-BL1A_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.46/31\n!\ninterface Ethernet7\n - \ description P2P_LINK_TO_DC1-BL1B_Ethernet4\n no shutdown\n mtu 1500\n no - switchport\n ip address 172.31.255.54/31\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.4/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.104/24\n!\nip - routing\nno ip routing vrf MGMT\n!\nip prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n - \ seq 10 permit 192.168.255.0/24 eq 32\n!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp - local-interface vrf MGMT Management1\nntp server vrf MGMT 192.168.200.5 prefer\n!\nroute-map - RM-CONN-2-BGP permit 10\n match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter - bfd\n multihop interval 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n - \ router-id 192.168.255.4\n maximum-paths 4 ecmp 4\n update wait-install\n - \ no bgp default ipv4-unicast\n distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS - peer group\n neighbor EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS - update-source Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS + Ethernet2\n description P2P_DC1-LEAF2A_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.14/31\n!\ninterface Ethernet3\n description + P2P_DC1-LEAF2B_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.22/31\n!\ninterface Ethernet4\n description P2P_DC1-SVC3A_Ethernet4\n + \ shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.30/31\n!\ninterface + Ethernet5\n description P2P_DC1-SVC3B_Ethernet4\n shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.38/31\n!\ninterface Ethernet6\n description + P2P_DC1-BL1A_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip address + 172.31.255.46/31\n!\ninterface Ethernet7\n description P2P_DC1-BL1B_Ethernet4\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.54/31\n!\ninterface + Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.4/32\n!\ninterface + Management1\n description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip + address 192.168.200.104/24\n!\nip routing\nno ip routing vrf MGMT\n!\nip prefix-list + PL-LOOPBACKS-EVPN-OVERLAY\n seq 10 permit 192.168.255.0/24 eq 32\n!\nip route + vrf MGMT 0.0.0.0/0 192.168.200.5\n!\nntp local-interface vrf MGMT Management1\nntp + server vrf MGMT 192.168.200.5 prefer\n!\nroute-map RM-CONN-2-BGP permit 10\n match + ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY\n!\nrouter bfd\n multihop interval + 1200 min-rx 1200 multiplier 3\n!\nrouter bgp 65001\n router-id 192.168.255.4\n + \ maximum-paths 4 ecmp 4\n update wait-install\n no bgp default ipv4-unicast\n + \ distance bgp 20 200 200\n neighbor EVPN-OVERLAY-PEERS peer group\n neighbor + EVPN-OVERLAY-PEERS next-hop-unchanged\n neighbor EVPN-OVERLAY-PEERS update-source + Loopback0\n neighbor EVPN-OVERLAY-PEERS bfd\n neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3\n neighbor EVPN-OVERLAY-PEERS password 7 q+VNViP5i4rVjW1cxFv2wA==\n \ neighbor EVPN-OVERLAY-PEERS send-community\n neighbor EVPN-OVERLAY-PEERS maximum-routes 0\n neighbor IPv4-UNDERLAY-PEERS peer group\n neighbor IPv4-UNDERLAY-PEERS @@ -1018,21 +1022,22 @@ cvp_configlets: \ neighbor 172.31.255.55 remote-as 65104\n neighbor 172.31.255.55 description DC1-BL1B_Ethernet4\n neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n \ neighbor 192.168.255.5 remote-as 65101\n neighbor 192.168.255.5 description - DC1-LEAF1A\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description DC1-LEAF2A\n - \ neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.7 - remote-as 65102\n neighbor 192.168.255.7 description DC1-LEAF2B\n neighbor - 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.8 remote-as - 65103\n neighbor 192.168.255.8 shutdown\n neighbor 192.168.255.8 description - DC1-SVC3A\n neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.9 remote-as 65103\n neighbor 192.168.255.9 shutdown\n neighbor - 192.168.255.9 description DC1-SVC3B\n neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.10 remote-as 65104\n neighbor 192.168.255.10 description - DC1-BL1A\n neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.11 remote-as 65104\n neighbor 192.168.255.11 description DC1-BL1B\n - \ redistribute connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n - \ neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no - neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" + DC1-LEAF1A_Loopback0\n neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.6 remote-as 65102\n neighbor 192.168.255.6 description + DC1-LEAF2A_Loopback0\n neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.7 remote-as 65102\n neighbor 192.168.255.7 description + DC1-LEAF2B_Loopback0\n neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n + \ neighbor 192.168.255.8 remote-as 65103\n neighbor 192.168.255.8 shutdown\n + \ neighbor 192.168.255.8 description DC1-SVC3A_Loopback0\n neighbor 192.168.255.9 + peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.9 remote-as 65103\n neighbor + 192.168.255.9 shutdown\n neighbor 192.168.255.9 description DC1-SVC3B_Loopback0\n + \ neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.10 + remote-as 65104\n neighbor 192.168.255.10 description DC1-BL1A_Loopback0\n neighbor + 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.11 remote-as + 65104\n neighbor 192.168.255.11 description DC1-BL1B_Loopback0\n redistribute + connected route-map RM-CONN-2-BGP\n !\n address-family evpn\n neighbor + EVPN-OVERLAY-PEERS activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS + activate\n neighbor IPv4-UNDERLAY-PEERS activate\n!\nend\n" AVD_DC1-SVC3A: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -1051,48 +1056,48 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3010\n name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk - group MLAG\n!\nvlan 3011\n name MLAG_iBGP_Tenant_A_APP_Zone\n trunk group - MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan - 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n - \ name MLAG_iBGP_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name - MLAG_iBGP_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk - group MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf - instance Tenant_A_WAN_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance - Tenant_B_OP_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf - instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n description MLAG_DC1-SVC3B_Port-Channel5\n - \ no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface - Port-Channel7\n description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk - allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport - mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description - SERVER_server03_ESI\n no shutdown\n switchport trunk allowed vlan 110-111,210-211\n - \ switchport mode trunk\n switchport\n evpn ethernet-segment\n identifier - 0000:0000:0303:0202:0101\n route-target import 03:03:02:02:01:01\n lacp - system-id 0303.0202.0101\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet4\n - \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.25/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet4\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.27/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet4\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.29/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.31/31\n!\ninterface Ethernet5\n description MLAG_DC1-SVC3B_Ethernet5\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description - MLAG_DC1-SVC3B_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface - Ethernet7\n description DC1-L2LEAF2A_Ethernet1\n no shutdown\n channel-group - 7 mode active\n!\ninterface Ethernet8\n description DC1-L2LEAF2B_Ethernet1\n - \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description - SERVER_server03_ESI_Eth1\n no shutdown\n channel-group 10 mode active\n!\ninterface - Loopback0\n description ROUTER_ID\n no shutdown\n ip address 192.168.255.8/32\n!\ninterface - Loopback1\n description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface - Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n - \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.8/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.108/24\n!\ninterface - Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n - \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3010\n name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk + group MLAG\n!\nvlan 3011\n name MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group + MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan + 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n + \ name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name + MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk + group MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n + \ name MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance + Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface + Port-Channel5\n description MLAG_DC1-SVC3B_Port-Channel5\n no shutdown\n switchport + mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Port-Channel7\n + \ description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk allowed vlan + 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport mode + trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n description SERVER_server03_ESI\n + \ no shutdown\n switchport trunk allowed vlan 110-111,210-211\n switchport + mode trunk\n switchport\n evpn ethernet-segment\n identifier 0000:0000:0303:0202:0101\n + \ route-target import 03:03:02:02:01:01\n lacp system-id 0303.0202.0101\n!\ninterface + Ethernet1\n description P2P_DC1-SPINE1_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.25/31\n!\ninterface Ethernet2\n description + P2P_DC1-SPINE2_Ethernet4\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.27/31\n!\ninterface Ethernet3\n description P2P_DC1-SPINE3_Ethernet4\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.29/31\n!\ninterface + Ethernet4\n description P2P_DC1-SPINE4_Ethernet4\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.31/31\n!\ninterface Ethernet5\n description + MLAG_DC1-SVC3B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface + Ethernet6\n description MLAG_DC1-SVC3B_Ethernet6\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet7\n description DC1-L2LEAF2A_Ethernet1\n + \ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet8\n description + DC1-L2LEAF2B_Ethernet1\n no shutdown\n channel-group 7 mode active\n!\ninterface + Ethernet10\n description SERVER_server03_ESI_Eth1\n no shutdown\n channel-group + 10 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n + \ ip address 192.168.255.8/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n + \ no shutdown\n ip address 192.168.254.8/32\n!\ninterface Loopback100\n description + Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address 10.255.1.8/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n + \ no shutdown\n vrf MGMT\n ip address 192.168.200.108/24\n!\ninterface Vlan110\n + \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -1115,28 +1120,25 @@ cvp_configlets: \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n no shutdown\n vrf Tenant_C_WAN_Zone\n - \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3010\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WEB_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3011\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3012\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3013\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3019\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3020\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan3029\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n ip - address 10.255.251.6/31\n!\ninterface Vlan3030\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n - \ ip address 10.255.251.6/31\n!\ninterface Vlan4093\n description MLAG_PEER_L3_PEERING\n - \ no shutdown\n mtu 1500\n ip address 10.255.251.6/31\n!\ninterface Vlan4094\n - \ description MLAG_PEER\n no shutdown\n mtu 1500\n no autostate\n ip - address 10.255.252.6/31\n!\ninterface Vxlan1\n description DC1-SVC3A_VTEP\n + \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan3010\n description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3011\n + \ description MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_APP_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3012\n description + MLAG_L3_VRF_Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n + \ ip address 10.255.251.6/31\n!\ninterface Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface Vlan3029\n description + MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n + \ ip address 10.255.251.6/31\n!\ninterface Vlan3030\n description MLAG_L3_VRF_Tenant_C_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.6/31\n!\ninterface + Vlan4093\n description MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.6/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.6/31\n!\ninterface Vxlan1\n description DC1-SVC3A_VTEP\n \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n @@ -1178,8 +1180,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n neighbor 172.31.255.24 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.24 remote-as 65001\n neighbor + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan4093\n neighbor 172.31.255.24 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.24 remote-as 65001\n neighbor 172.31.255.24 description DC1-SPINE1_Ethernet4\n neighbor 172.31.255.26 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.26 remote-as 65001\n neighbor 172.31.255.26 description DC1-SPINE2_Ethernet4\n neighbor 172.31.255.28 peer @@ -1188,67 +1190,69 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.30 remote-as 65001\n neighbor 172.31.255.30 description DC1-SPINE4_Ethernet4\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.8:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.8:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target both 14:14\n - \ redistribute learned\n vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n - \ rd 192.168.255.8:11\n route-target both 11:11\n redistribute learned\n - \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.8:20\n - \ route-target both 20:20\n redistribute learned\n vlan 210-211\n - \ !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target - both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle - Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target both 30:30\n redistribute - learned\n vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd - 192.168.255.8:31\n route-target both 31:31\n redistribute learned\n - \ vlan 350\n !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS - activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n - \ neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER - activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.8:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.8\n - \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.8:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd + 192.168.255.8:14\n route-target both 14:14\n redistribute learned\n + \ vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n + \ route-target both 11:11\n redistribute learned\n vlan 120-121\n + \ !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target + both 20:20\n redistribute learned\n vlan 210-211\n !\n vlan-aware-bundle + Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target both 21:21\n + \ redistribute learned\n vlan 250\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n + \ rd 192.168.255.8:30\n route-target both 30:30\n redistribute learned\n + \ vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n + \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.8:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.8\n update wait-install\n + \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.7 description DC1-SVC3B_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3013\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.8:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3019\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.8\n + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n route-target + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3029\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.8\n \ update wait-install\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.7 description DC1-SVC3B\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.7 description DC1-SVC3B_Vlan3030\n redistribute + connected\n!\nend\n" AVD_DC1-SVC3B: "!\nno enable password\nno aaa root\n!\nusername admin privilege 15 role network-admin nopassword\nusername cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.\n!\nmanagement @@ -1267,43 +1271,43 @@ cvp_configlets: 150\n name Tenant_A_WAN_Zone_1\n!\nvlan 210\n name Tenant_B_OP_Zone_1\n!\nvlan 211\n name Tenant_B_OP_Zone_2\n!\nvlan 250\n name Tenant_B_WAN_Zone_1\n!\nvlan 310\n name Tenant_C_OP_Zone_1\n!\nvlan 311\n name Tenant_C_OP_Zone_2\n!\nvlan - 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_iBGP_Tenant_A_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3010\n name MLAG_iBGP_Tenant_A_WEB_Zone\n trunk - group MLAG\n!\nvlan 3011\n name MLAG_iBGP_Tenant_A_APP_Zone\n trunk group - MLAG\n!\nvlan 3012\n name MLAG_iBGP_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan - 3013\n name MLAG_iBGP_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n - \ name MLAG_iBGP_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name - MLAG_iBGP_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_iBGP_Tenant_C_OP_Zone\n - \ trunk group MLAG\n!\nvlan 3030\n name MLAG_iBGP_Tenant_C_WAN_Zone\n trunk - group MLAG\n!\nvlan 4093\n name LEAF_PEER_L3\n trunk group MLAG\n!\nvlan 4094\n - \ name MLAG_PEER\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance - Tenant_A_APP_Zone\n!\nvrf instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf - instance Tenant_A_WAN_Zone\n!\nvrf instance Tenant_A_WEB_Zone\n!\nvrf instance - Tenant_B_OP_Zone\n!\nvrf instance Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf - instance Tenant_C_WAN_Zone\n!\ninterface Port-Channel5\n description MLAG_DC1-SVC3A_Port-Channel5\n - \ no shutdown\n switchport mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface - Port-Channel7\n description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk - allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport - mode trunk\n switchport\n mlag 7\n!\ninterface Ethernet1\n description P2P_LINK_TO_DC1-SPINE1_Ethernet5\n + 350\n name Tenant_C_WAN_Zone_1\n!\nvlan 3009\n name MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3010\n name MLAG_L3_VRF_Tenant_A_WEB_Zone\n trunk + group MLAG\n!\nvlan 3011\n name MLAG_L3_VRF_Tenant_A_APP_Zone\n trunk group + MLAG\n!\nvlan 3012\n name MLAG_L3_VRF_Tenant_A_DB_Zone\n trunk group MLAG\n!\nvlan + 3013\n name MLAG_L3_VRF_Tenant_A_WAN_Zone\n trunk group MLAG\n!\nvlan 3019\n + \ name MLAG_L3_VRF_Tenant_B_OP_Zone\n trunk group MLAG\n!\nvlan 3020\n name + MLAG_L3_VRF_Tenant_B_WAN_Zone\n trunk group MLAG\n!\nvlan 3029\n name MLAG_L3_VRF_Tenant_C_OP_Zone\n + \ trunk group MLAG\n!\nvlan 3030\n name MLAG_L3_VRF_Tenant_C_WAN_Zone\n trunk + group MLAG\n!\nvlan 4093\n name MLAG_L3\n trunk group MLAG\n!\nvlan 4094\n + \ name MLAG\n trunk group MLAG\n!\nvrf instance MGMT\n!\nvrf instance Tenant_A_APP_Zone\n!\nvrf + instance Tenant_A_DB_Zone\n!\nvrf instance Tenant_A_OP_Zone\n!\nvrf instance Tenant_A_WAN_Zone\n!\nvrf + instance Tenant_A_WEB_Zone\n!\nvrf instance Tenant_B_OP_Zone\n!\nvrf instance + Tenant_B_WAN_Zone\n!\nvrf instance Tenant_C_OP_Zone\n!\nvrf instance Tenant_C_WAN_Zone\n!\ninterface + Port-Channel5\n description MLAG_DC1-SVC3A_Port-Channel5\n no shutdown\n switchport + mode trunk\n switchport trunk group MLAG\n switchport\n!\ninterface Port-Channel7\n + \ description DC1_L2LEAF2_Po1\n no shutdown\n switchport trunk allowed vlan + 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n switchport mode + trunk\n switchport\n mlag 7\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet5\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.33/31\n!\ninterface - Ethernet2\n description P2P_LINK_TO_DC1-SPINE2_Ethernet5\n no shutdown\n mtu - 1500\n no switchport\n ip address 172.31.255.35/31\n!\ninterface Ethernet3\n - \ description P2P_LINK_TO_DC1-SPINE3_Ethernet5\n no shutdown\n mtu 1500\n - \ no switchport\n ip address 172.31.255.37/31\n!\ninterface Ethernet4\n description - P2P_LINK_TO_DC1-SPINE4_Ethernet5\n no shutdown\n mtu 1500\n no switchport\n - \ ip address 172.31.255.39/31\n!\ninterface Ethernet5\n description MLAG_DC1-SVC3A_Ethernet5\n - \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet6\n description - MLAG_DC1-SVC3A_Ethernet6\n no shutdown\n channel-group 5 mode active\n!\ninterface - Ethernet7\n description DC1-L2LEAF2A_Ethernet2\n no shutdown\n channel-group - 7 mode active\n!\ninterface Ethernet8\n description DC1-L2LEAF2B_Ethernet2\n - \ no shutdown\n channel-group 7 mode active\n!\ninterface Loopback0\n description - ROUTER_ID\n no shutdown\n ip address 192.168.255.9/32\n!\ninterface Loopback1\n - \ description VXLAN_TUNNEL_SOURCE\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface - Loopback100\n description Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n - \ vrf Tenant_A_OP_Zone\n ip address 10.255.1.9/32\n!\ninterface Management1\n - \ description OOB_MANAGEMENT\n no shutdown\n vrf MGMT\n ip address 192.168.200.109/24\n!\ninterface - Vlan110\n description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n - \ ip address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n + Ethernet2\n description P2P_DC1-SPINE2_Ethernet5\n no shutdown\n mtu 1500\n + \ no switchport\n ip address 172.31.255.35/31\n!\ninterface Ethernet3\n description + P2P_DC1-SPINE3_Ethernet5\n no shutdown\n mtu 1500\n no switchport\n ip + address 172.31.255.37/31\n!\ninterface Ethernet4\n description P2P_DC1-SPINE4_Ethernet5\n + \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.39/31\n!\ninterface + Ethernet5\n description MLAG_DC1-SVC3A_Ethernet5\n no shutdown\n channel-group + 5 mode active\n!\ninterface Ethernet6\n description MLAG_DC1-SVC3A_Ethernet6\n + \ no shutdown\n channel-group 5 mode active\n!\ninterface Ethernet7\n description + DC1-L2LEAF2A_Ethernet2\n no shutdown\n channel-group 7 mode active\n!\ninterface + Ethernet8\n description DC1-L2LEAF2B_Ethernet2\n no shutdown\n channel-group + 7 mode active\n!\ninterface Loopback0\n description ROUTER_ID\n no shutdown\n + \ ip address 192.168.255.9/32\n!\ninterface Loopback1\n description VXLAN_TUNNEL_SOURCE\n + \ no shutdown\n ip address 192.168.254.8/32\n!\ninterface Loopback100\n description + Tenant_A_OP_Zone_VTEP_DIAGNOSTICS\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address 10.255.1.9/32\n!\ninterface Management1\n description OOB_MANAGEMENT\n + \ no shutdown\n vrf MGMT\n ip address 192.168.200.109/24\n!\ninterface Vlan110\n + \ description Tenant_A_OP_Zone_1\n no shutdown\n vrf Tenant_A_OP_Zone\n ip + address virtual 10.1.10.1/24\n!\ninterface Vlan111\n description Tenant_A_OP_Zone_2\n \ no shutdown\n vrf Tenant_A_OP_Zone\n ip helper-address 1.1.1.1 vrf MGMT source-interface lo100\n ip address virtual 10.1.11.1/24\n!\ninterface Vlan120\n \ description Tenant_A_WEB_Zone_1\n no shutdown\n vrf Tenant_A_WEB_Zone\n @@ -1326,28 +1330,25 @@ cvp_configlets: \ ip address virtual 10.3.10.1/24\n!\ninterface Vlan311\n description Tenant_C_OP_Zone_2\n \ no shutdown\n vrf Tenant_C_OP_Zone\n ip address virtual 10.3.11.1/24\n!\ninterface Vlan350\n description Tenant_C_WAN_Zone_1\n no shutdown\n vrf Tenant_C_WAN_Zone\n - \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3010\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WEB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WEB_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3011\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_APP_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3012\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3013\n description MLAG_PEER_L3_iBGP: - vrf Tenant_A_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3019\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3020\n description MLAG_PEER_L3_iBGP: - vrf Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_B_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan3029\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n ip - address 10.255.251.7/31\n!\ninterface Vlan3030\n description MLAG_PEER_L3_iBGP: - vrf Tenant_C_WAN_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n - \ ip address 10.255.251.7/31\n!\ninterface Vlan4093\n description MLAG_PEER_L3_PEERING\n - \ no shutdown\n mtu 1500\n ip address 10.255.251.7/31\n!\ninterface Vlan4094\n - \ description MLAG_PEER\n no shutdown\n mtu 1500\n no autostate\n ip - address 10.255.252.7/31\n!\ninterface Vxlan1\n description DC1-SVC3B_VTEP\n + \ ip address virtual 10.3.50.1/24\n!\ninterface Vlan3009\n description MLAG_L3_VRF_Tenant_A_OP_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_OP_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan3010\n description MLAG_L3_VRF_Tenant_A_WEB_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_A_WEB_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3011\n + \ description MLAG_L3_VRF_Tenant_A_APP_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_A_APP_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3012\n description + MLAG_L3_VRF_Tenant_A_DB_Zone\n no shutdown\n mtu 1500\n vrf Tenant_A_DB_Zone\n + \ ip address 10.255.251.7/31\n!\ninterface Vlan3013\n description MLAG_L3_VRF_Tenant_A_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_A_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan3019\n description MLAG_L3_VRF_Tenant_B_OP_Zone\n no shutdown\n mtu + 1500\n vrf Tenant_B_OP_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3020\n + \ description MLAG_L3_VRF_Tenant_B_WAN_Zone\n no shutdown\n mtu 1500\n vrf + Tenant_B_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface Vlan3029\n description + MLAG_L3_VRF_Tenant_C_OP_Zone\n no shutdown\n mtu 1500\n vrf Tenant_C_OP_Zone\n + \ ip address 10.255.251.7/31\n!\ninterface Vlan3030\n description MLAG_L3_VRF_Tenant_C_WAN_Zone\n + \ no shutdown\n mtu 1500\n vrf Tenant_C_WAN_Zone\n ip address 10.255.251.7/31\n!\ninterface + Vlan4093\n description MLAG_L3\n no shutdown\n mtu 1500\n ip address 10.255.251.7/31\n!\ninterface + Vlan4094\n description MLAG\n no shutdown\n mtu 1500\n no autostate\n + \ ip address 10.255.252.7/31\n!\ninterface Vxlan1\n description DC1-SVC3B_VTEP\n \ vxlan source-interface Loopback1\n vxlan virtual-router encapsulation mac-address mlag-system-id\n vxlan udp-port 4789\n vxlan vlan 110 vni 10110\n vxlan vlan 111 vni 50111\n vxlan vlan 120 vni 10120\n vxlan vlan 121 vni 10121\n @@ -1389,8 +1390,8 @@ cvp_configlets: password 7 vnEaG8gMeQf3d3cN6PktXQ==\n neighbor MLAG-IPv4-UNDERLAY-PEER send-community\n \ neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000\n neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n neighbor 172.31.255.32 peer - group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.32 remote-as 65001\n neighbor + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan4093\n neighbor 172.31.255.32 + peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.32 remote-as 65001\n neighbor 172.31.255.32 description DC1-SPINE1_Ethernet5\n neighbor 172.31.255.34 peer group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.34 remote-as 65001\n neighbor 172.31.255.34 description DC1-SPINE2_Ethernet5\n neighbor 172.31.255.36 peer @@ -1399,67 +1400,69 @@ cvp_configlets: group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.38 remote-as 65001\n neighbor 172.31.255.38 description DC1-SPINE4_Ethernet5\n neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.1 remote-as 65001\n neighbor - 192.168.255.1 description DC1-SPINE1\n neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS\n - \ neighbor 192.168.255.2 remote-as 65001\n neighbor 192.168.255.2 description - DC1-SPINE2\n neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS\n neighbor - 192.168.255.3 remote-as 65001\n neighbor 192.168.255.3 description DC1-SPINE3\n - \ neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 - remote-as 65001\n neighbor 192.168.255.4 description DC1-SPINE4\n redistribute - connected route-map RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n - \ rd 192.168.255.9:12\n route-target both 12:12\n redistribute learned\n - \ vlan 130-131\n !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.9:13\n - \ route-target both 13:13\n redistribute learned\n vlan 140-141\n - \ !\n vlan-aware-bundle Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target - both 10:10\n redistribute learned\n vlan 110-111\n !\n vlan-aware-bundle - Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target both 14:14\n - \ redistribute learned\n vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n - \ rd 192.168.255.9:11\n route-target both 11:11\n redistribute learned\n - \ vlan 120-121\n !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.9:20\n - \ route-target both 20:20\n redistribute learned\n vlan 210-211\n - \ !\n vlan-aware-bundle Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target - both 21:21\n redistribute learned\n vlan 250\n !\n vlan-aware-bundle - Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target both 30:30\n redistribute - learned\n vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd - 192.168.255.9:31\n route-target both 31:31\n redistribute learned\n - \ vlan 350\n !\n address-family evpn\n neighbor EVPN-OVERLAY-PEERS - activate\n !\n address-family ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n - \ neighbor IPv4-UNDERLAY-PEERS activate\n neighbor MLAG-IPv4-UNDERLAY-PEER - activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.9:12\n route-target - import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.9\n - \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target import + 192.168.255.1 description DC1-SPINE1_Loopback0\n neighbor 192.168.255.2 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.2 remote-as 65001\n neighbor + 192.168.255.2 description DC1-SPINE2_Loopback0\n neighbor 192.168.255.3 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.3 remote-as 65001\n neighbor + 192.168.255.3 description DC1-SPINE3_Loopback0\n neighbor 192.168.255.4 peer + group EVPN-OVERLAY-PEERS\n neighbor 192.168.255.4 remote-as 65001\n neighbor + 192.168.255.4 description DC1-SPINE4_Loopback0\n redistribute connected route-map + RM-CONN-2-BGP\n !\n vlan-aware-bundle Tenant_A_APP_Zone\n rd 192.168.255.9:12\n + \ route-target both 12:12\n redistribute learned\n vlan 130-131\n + \ !\n vlan-aware-bundle Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target + both 13:13\n redistribute learned\n vlan 140-141\n !\n vlan-aware-bundle + Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target both 10:10\n redistribute + learned\n vlan 110-111\n !\n vlan-aware-bundle Tenant_A_WAN_Zone\n rd + 192.168.255.9:14\n route-target both 14:14\n redistribute learned\n + \ vlan 150\n !\n vlan-aware-bundle Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n + \ route-target both 11:11\n redistribute learned\n vlan 120-121\n + \ !\n vlan-aware-bundle Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target + both 20:20\n redistribute learned\n vlan 210-211\n !\n vlan-aware-bundle + Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target both 21:21\n + \ redistribute learned\n vlan 250\n !\n vlan-aware-bundle Tenant_C_OP_Zone\n + \ rd 192.168.255.9:30\n route-target both 30:30\n redistribute learned\n + \ vlan 310-311\n !\n vlan-aware-bundle Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n + \ route-target both 31:31\n redistribute learned\n vlan 350\n !\n + \ address-family evpn\n neighbor EVPN-OVERLAY-PEERS activate\n !\n address-family + ipv4\n no neighbor EVPN-OVERLAY-PEERS activate\n neighbor IPv4-UNDERLAY-PEERS + activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n + \ rd 192.168.255.9:12\n route-target import evpn 12:12\n route-target + export evpn 12:12\n router-id 192.168.255.9\n update wait-install\n + \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n neighbor + 10.255.251.6 description DC1-SVC3A_Vlan3011\n redistribute connected\n !\n + \ vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target import - evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3012\n redistribute + connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target + import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3009\n redistribute + connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3013\n redistribute + connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n route-target import evpn 11:11\n route-target export evpn 11:11\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target import - evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3010\n redistribute + connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.9:20\n route-target + import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3019\n redistribute + connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target import - evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.9\n + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3020\n redistribute + connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n route-target + import evpn 30:30\n route-target export evpn 30:30\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n - \ !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n route-target + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3029\n redistribute + connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n route-target import evpn 31:31\n route-target export evpn 31:31\n router-id 192.168.255.9\n \ update wait-install\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n - \ neighbor 10.255.251.6 description DC1-SVC3A\n redistribute connected\n!\nend\n" + \ neighbor 10.255.251.6 description DC1-SVC3A_Vlan3030\n redistribute + connected\n!\nend\n" cvp_topology: DC1_BL1: devices: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE1.md index e10090a6343..5baff9a773b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE1.md @@ -138,7 +138,7 @@ vlan internal order ascending range 1006 1199 | 200 | SVI_200 | - | | 220 | SVI_220 | - | | 4092 | INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -160,7 +160,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -185,7 +185,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet5 | P2P_LINK_TO_DUMMY-CORE_Ethernet1/3 | - | 192.168.253.4/31 | default | 9214 | False | - | - | +| Ethernet5 | P2P_DUMMY-CORE_Ethernet1/3 | - | 192.168.253.4/31 | default | 9214 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -212,7 +212,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/3 + description P2P_DUMMY-CORE_Ethernet1/3 no shutdown mtu 9214 no switchport @@ -296,7 +296,7 @@ interface Loopback0 | Vlan200 | SVI_200 | default | - | False | | Vlan220 | SVI_220 | default | - | False | | Vlan4092 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -342,7 +342,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -480,7 +480,7 @@ router bgp 65001 neighbor 192.168.253.5 remote-as 65000 neighbor 192.168.253.5 description DUMMY-CORE neighbor 192.168.254.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.254.1 description BGP-SPINE2 + neighbor 192.168.254.1 description BGP-SPINE2_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md index 79131f88aee..b14534b9511 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md @@ -138,7 +138,7 @@ vlan internal order ascending range 1006 1199 | 200 | SVI_200 | - | | 220 | SVI_220 | - | | 4092 | INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -160,7 +160,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -185,7 +185,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet5 | P2P_LINK_TO_DUMMY-CORE_Ethernet1/4 | - | 192.168.253.6/31 | default | 9214 | False | - | - | +| Ethernet5 | P2P_DUMMY-CORE_Ethernet1/4 | - | 192.168.253.6/31 | default | 9214 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -212,7 +212,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/4 + description P2P_DUMMY-CORE_Ethernet1/4 no shutdown mtu 9214 no switchport @@ -296,7 +296,7 @@ interface Loopback0 | Vlan200 | SVI_200 | default | - | False | | Vlan220 | SVI_220 | default | - | False | | Vlan4092 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -342,7 +342,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -482,7 +482,7 @@ router bgp 65001 neighbor 192.168.253.7 remote-as 65000 neighbor 192.168.253.7 description DUMMY-CORE neighbor 192.168.254.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.254.0 description BGP-SPINE1 + neighbor 192.168.254.0 description BGP-SPINE1_Vlan4094 redistribute attached-host redistribute connected redistribute static diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE1.md index 681d81320bd..e304875d39c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE1.md @@ -129,7 +129,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 100 | L2VLAN_100 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -139,7 +139,7 @@ vlan 100 name L2VLAN_100 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -231,7 +231,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -244,7 +244,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE2.md index 237dc9c0e75..c5c2220edc8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-SPINE2.md @@ -129,7 +129,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 100 | L2VLAN_100 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -139,7 +139,7 @@ vlan 100 name L2VLAN_100 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -231,7 +231,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -244,7 +244,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE1.md index af7ea6a1a03..f61091a9176 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE1.md @@ -133,7 +133,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 100 | SVI_100 | - | | 4092 | INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -146,7 +146,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -171,7 +171,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet5 | P2P_LINK_TO_DUMMY-CORE_Ethernet1/1 | - | 192.168.253.0/31 | default | 9214 | False | - | - | +| Ethernet5 | P2P_DUMMY-CORE_Ethernet1/1 | - | 192.168.253.0/31 | default | 9214 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -198,7 +198,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/1 + description P2P_DUMMY-CORE_Ethernet1/1 no shutdown mtu 9214 no switchport @@ -282,7 +282,7 @@ interface Loopback0 | --------- | ----------- | --- | ---- | -------- | | Vlan100 | SVI_100 | default | - | False | | Vlan4092 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -310,7 +310,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md index 75f6584e50e..f84f91a134c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md @@ -133,7 +133,7 @@ vlan internal order ascending range 1006 1199 | ------- | ---- | ------------ | | 100 | SVI_100 | - | | 4092 | INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -146,7 +146,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -171,7 +171,7 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet5 | P2P_LINK_TO_DUMMY-CORE_Ethernet1/2 | - | 192.168.253.2/31 | default | 9214 | False | - | - | +| Ethernet5 | P2P_DUMMY-CORE_Ethernet1/2 | - | 192.168.253.2/31 | default | 9214 | False | - | - | #### Ethernet Interfaces Device Configuration @@ -198,7 +198,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/2 + description P2P_DUMMY-CORE_Ethernet1/2 no shutdown mtu 9214 no switchport @@ -282,7 +282,7 @@ interface Loopback0 | --------- | ----------- | --- | ---- | -------- | | Vlan100 | SVI_100 | default | - | False | | Vlan4092 | Inband Management | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 9214 | False | +| Vlan4094 | MLAG | default | 9214 | False | ##### IPv4 @@ -310,7 +310,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE1.cfg index 3cc282834bd..9d18be41e10 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE1.cfg @@ -35,7 +35,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -84,7 +84,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/3 + description P2P_DUMMY-CORE_Ethernet1/3 no shutdown mtu 9214 no switchport @@ -124,7 +124,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -168,7 +168,7 @@ router bgp 65001 neighbor 192.168.253.5 remote-as 65000 neighbor 192.168.253.5 description DUMMY-CORE neighbor 192.168.254.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.254.1 description BGP-SPINE2 + neighbor 192.168.254.1 description BGP-SPINE2_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg index 5dc7a3df4ee..279e633d8df 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg @@ -35,7 +35,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -84,7 +84,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/4 + description P2P_DUMMY-CORE_Ethernet1/4 no shutdown mtu 9214 no switchport @@ -124,7 +124,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -169,7 +169,7 @@ router bgp 65001 neighbor 192.168.253.7 remote-as 65000 neighbor 192.168.253.7 description DUMMY-CORE neighbor 192.168.254.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.254.0 description BGP-SPINE1 + neighbor 192.168.254.0 description BGP-SPINE1_Vlan4094 redistribute attached-host redistribute connected redistribute static diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE1.cfg index 21861d1dd02..9c99fb3f336 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE1.cfg @@ -23,7 +23,7 @@ vlan 100 name L2VLAN_100 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -72,7 +72,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE2.cfg index 3bd7a7e98d3..0c313d823f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-SPINE2.cfg @@ -23,7 +23,7 @@ vlan 100 name L2VLAN_100 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -72,7 +72,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE1.cfg index b9ddd783947..1228defa96e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE1.cfg @@ -26,7 +26,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/1 + description P2P_DUMMY-CORE_Ethernet1/1 no shutdown mtu 9214 no switchport @@ -103,7 +103,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg index 9a85ad78c2e..3475050c1cf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg @@ -26,7 +26,7 @@ vlan 4092 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Ethernet4 channel-group 3 mode active ! interface Ethernet5 - description P2P_LINK_TO_DUMMY-CORE_Ethernet1/2 + description P2P_DUMMY-CORE_Ethernet1/2 no shutdown mtu 9214 no switchport @@ -103,7 +103,7 @@ interface Vlan4092 ip virtual-router address 172.23.254.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE1.yml index 45437663911..61c88dac5b7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE1.yml @@ -34,7 +34,7 @@ router_bgp: - ip_address: 192.168.254.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: BGP-SPINE2 - description: BGP-SPINE2 + description: BGP-SPINE2_Vlan4094 - ip_address: 192.168.253.5 remote_as: '65000' peer: DUMMY-CORE @@ -72,7 +72,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 1 @@ -92,7 +92,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -196,12 +196,12 @@ ethernet_interfaces: peer: DUMMY-CORE peer_interface: Ethernet1/3 peer_type: other - description: P2P_LINK_TO_DUMMY-CORE_Ethernet1/3 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.253.4/31 + description: P2P_DUMMY-CORE_Ethernet1/3 mlag_configuration: domain_id: BGP_SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE2.yml index 862b888da78..eb1be2abacf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/BGP-SPINE2.yml @@ -34,7 +34,7 @@ router_bgp: - ip_address: 192.168.254.0 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: BGP-SPINE1 - description: BGP-SPINE1 + description: BGP-SPINE1_Vlan4094 - ip_address: 192.168.253.7 remote_as: '65000' peer: DUMMY-CORE @@ -76,7 +76,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 1 @@ -96,7 +96,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -200,12 +200,12 @@ ethernet_interfaces: peer: DUMMY-CORE peer_interface: Ethernet1/4 peer_type: other - description: P2P_LINK_TO_DUMMY-CORE_Ethernet1/4 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.253.6/31 + description: P2P_DUMMY-CORE_Ethernet1/4 mlag_configuration: domain_id: BGP_SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE1.yml index 8f5e2f81007..6400f024409 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE1.yml @@ -29,7 +29,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -37,7 +37,7 @@ vlans: tenant: L2LS_L2ONLY vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE2.yml index 28f89be0dbc..b6670261232 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/L2ONLY-SPINE2.yml @@ -29,7 +29,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -37,7 +37,7 @@ vlans: tenant: L2LS_L2ONLY vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE1.yml index 673c59feb35..e769cc5b05e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE1.yml @@ -29,7 +29,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -40,7 +40,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -131,7 +131,6 @@ ethernet_interfaces: peer: DUMMY-CORE peer_interface: Ethernet1/1 peer_type: other - description: P2P_LINK_TO_DUMMY-CORE_Ethernet1/1 switchport: enabled: false shutdown: false @@ -139,6 +138,7 @@ ethernet_interfaces: ip_address: 192.168.253.0/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_DUMMY-CORE_Ethernet1/1 mlag_configuration: domain_id: OSPF_SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE2.yml index ddd968d9130..6d26de50ac5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/structured_configs/OSPF-SPINE2.yml @@ -32,7 +32,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -43,7 +43,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -134,7 +134,6 @@ ethernet_interfaces: peer: DUMMY-CORE peer_interface: Ethernet1/2 peer_type: other - description: P2P_LINK_TO_DUMMY-CORE_Ethernet1/2 switchport: enabled: false shutdown: false @@ -142,6 +141,7 @@ ethernet_interfaces: ip_address: 192.168.253.2/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_DUMMY-CORE_Ethernet1/2 mlag_configuration: domain_id: OSPF_SPINES local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md index 7631e93deec..a987d0e5610 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md @@ -188,16 +188,16 @@ vlan 2020 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE1-LSR1_Ethernet1 | - | 100.64.48.0/31 | default | 9178 | False | - | - | -| Ethernet2 | P2P_LINK_TO_SITE1-LER2_Ethernet2 | - | 100.64.48.4/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE1-LSR1_Ethernet1 | - | 100.64.48.0/31 | default | 9178 | False | - | - | +| Ethernet2 | P2P_SITE1-LER2_Ethernet2 | - | 100.64.48.4/31 | default | 9178 | False | - | - | | Ethernet6.10 | TENANT_B_SITE_3_INTRA_L3VPN | - | 123.1.1.0/31 | TENANT_B_INTRA | - | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE1-LSR1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_SITE1-LER2_Ethernet2 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet1 | P2P_SITE1-LSR1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet2 | P2P_SITE1-LER2_Ethernet2 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -211,7 +211,7 @@ vlan 2020 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LSR1_Ethernet1 + description P2P_SITE1-LSR1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -232,7 +232,7 @@ interface Ethernet1 ! interface Ethernet2 - description P2P_LINK_TO_SITE1-LER2_Ethernet2 + description P2P_SITE1-LER2_Ethernet2 no shutdown mtu 9178 speed forced 10000full @@ -704,9 +704,9 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.5:10010 @@ -804,10 +804,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.5 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md index 189b0aebeec..08075e72260 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md @@ -187,16 +187,16 @@ vlan 2020 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE1-LSR2_Ethernet1 | - | 100.64.48.2/31 | default | 9214 | False | - | - | -| Ethernet2 | P2P_LINK_TO_SITE1-LER1_Ethernet2 | - | 100.64.48.5/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE1-LSR2_Ethernet1 | - | 100.64.48.2/31 | default | 9214 | False | - | - | +| Ethernet2 | P2P_SITE1-LER1_Ethernet2 | - | 100.64.48.5/31 | default | 9178 | False | - | - | | Ethernet5.100 | TENANT_B_SITE_3 | - | 192.168.48.0/31 | TENANT_B_WAN | - | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE1-LSR2_Ethernet1 | - | - | default | 9214 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_SITE1-LER1_Ethernet2 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet1 | P2P_SITE1-LSR2_Ethernet1 | - | - | default | 9214 | False | - | - | - | - | +| Ethernet2 | P2P_SITE1-LER1_Ethernet2 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -210,7 +210,7 @@ vlan 2020 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LSR2_Ethernet1 + description P2P_SITE1-LSR2_Ethernet1 no shutdown mtu 9214 speed forced 100gfull @@ -231,7 +231,7 @@ interface Ethernet1 ! interface Ethernet2 - description P2P_LINK_TO_SITE1-LER1_Ethernet2 + description P2P_SITE1-LER1_Ethernet2 no shutdown mtu 9178 speed forced 10000full @@ -688,13 +688,13 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.6:10010 @@ -808,10 +808,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.6 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md index aedd5ab43c3..320dedf8c9c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md @@ -136,17 +136,17 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE1-LER1_Ethernet1 | - | 100.64.48.1/31 | default | 9178 | False | - | - | -| Ethernet3 | P2P_LINK_TO_SITE2-LSR1_Ethernet3 | - | 100.64.48.8/31 | default | 9178 | False | - | - | -| Ethernet4 | P2P_LINK_TO_SITE1-RR1_Ethernet4 | - | 100.64.48.6/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE1-LER1_Ethernet1 | - | 100.64.48.1/31 | default | 9178 | False | - | - | +| Ethernet3 | P2P_SITE2-LSR1_Ethernet3 | - | 100.64.48.8/31 | default | 9178 | False | - | - | +| Ethernet4 | P2P_SITE1-RR1_Ethernet4 | - | 100.64.48.6/31 | default | 9178 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE1-LER1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_SITE2-LSR1_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_SITE1-RR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet1 | P2P_SITE1-LER1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet3 | P2P_SITE2-LSR1_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet4 | P2P_SITE1-RR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -161,7 +161,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LER1_Ethernet1 + description P2P_SITE1-LER1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -182,7 +182,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE2-LSR1_Ethernet3 + description P2P_SITE2-LSR1_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -203,7 +203,7 @@ interface Ethernet3 ! interface Ethernet4 - description P2P_LINK_TO_SITE1-RR1_Ethernet4 + description P2P_SITE1-RR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -414,10 +414,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md index 9d57838bbf0..24d4ae0c637 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md @@ -136,15 +136,15 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE1-LER2_Ethernet1 | - | 100.64.48.3/31 | default | 9214 | False | - | - | -| Ethernet3 | P2P_LINK_TO_SITE2-LSR2_Ethernet3 | - | 100.64.48.10/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE1-LER2_Ethernet1 | - | 100.64.48.3/31 | default | 9214 | False | - | - | +| Ethernet3 | P2P_SITE2-LSR2_Ethernet3 | - | 100.64.48.10/31 | default | 9178 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE1-LER2_Ethernet1 | - | - | default | 9214 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_SITE2-LSR2_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet1 | P2P_SITE1-LER2_Ethernet1 | - | - | default | 9214 | False | - | - | - | - | +| Ethernet3 | P2P_SITE2-LSR2_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -158,7 +158,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LER2_Ethernet1 + description P2P_SITE1-LER2_Ethernet1 no shutdown mtu 9214 speed forced 100gfull @@ -179,7 +179,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE2-LSR2_Ethernet3 + description P2P_SITE2-LSR2_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -389,10 +389,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md index 41d6779c804..ef4846ed58c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md @@ -139,13 +139,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet4 | P2P_LINK_TO_SITE1-LSR1_Ethernet4 | - | 100.64.48.7/31 | default | 9178 | False | - | - | +| Ethernet4 | P2P_SITE1-LSR1_Ethernet4 | - | 100.64.48.7/31 | default | 9178 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet4 | P2P_LINK_TO_SITE1-LSR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet4 | P2P_SITE1-LSR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -158,7 +158,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet4 - description P2P_LINK_TO_SITE1-LSR1_Ethernet4 + description P2P_SITE1-LSR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -463,13 +463,13 @@ router bgp 65000 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.6 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.6 description SITE1-LER2 + neighbor 100.70.0.6 description SITE1-LER2_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.9 peer group RR-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! address-family evpn neighbor default encapsulation mpls @@ -528,10 +528,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.8 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md index 3d962b8139d..6ce507c2703 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md @@ -191,15 +191,15 @@ vlan 2020 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE2-LSR1_Ethernet1 | - | 100.64.48.15/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE2-LSR1_Ethernet1 | - | 100.64.48.15/31 | default | 9178 | False | - | - | | Ethernet6 | TENANT_B_SITE_5_WAN_TEST | - | 123.10.10.2/31 | TENANT_B_WAN | - | False | - | - | | Ethernet6.10 | TENANT_B_SITE_5_INTRA_L3VPN | - | 123.1.1.2/31 | TENANT_B_INTRA | - | False | - | - | | Ethernet6.100 | TENANT_B_SITE_3_OSPF | - | 192.168.48.4/31 | TENANT_B_WAN | - | False | - | - | | Ethernet6.101 | TENANT_B_SITE_5 | - | 192.168.48.2/31 | TENANT_B_WAN | - | False | - | - | -| Ethernet11 | P2P_LINK_TO_SITE2-LSR2_Ethernet12 | 11 | *100.64.49.2/30 | **default | *9178 | *False | **- | **- | -| Ethernet12 | P2P_LINK_TO_SITE2-LSR2_Ethernet13 | 11 | *100.64.49.2/30 | **default | *9178 | *False | **- | **- | -| Ethernet13 | P2P_LINK_TO_SITE2-LSR2_Ethernet14 | 220 | *100.64.49.6/30 | **default | *9178 | *False | **- | **- | -| Ethernet14 | P2P_LINK_TO_SITE2-LSR2_Ethernet15 | 220 | *100.64.49.6/30 | **default | *9178 | *False | **- | **- | +| Ethernet11 | P2P_SITE2-LSR2_Ethernet12 | 11 | *100.64.49.2/30 | **default | *9178 | *False | **- | **- | +| Ethernet12 | P2P_SITE2-LSR2_Ethernet13 | 11 | *100.64.49.2/30 | **default | *9178 | *False | **- | **- | +| Ethernet13 | P2P_SITE2-LSR2_Ethernet14 | 220 | *100.64.49.6/30 | **default | *9178 | *False | **- | **- | +| Ethernet14 | P2P_SITE2-LSR2_Ethernet15 | 220 | *100.64.49.6/30 | **default | *9178 | *False | **- | **- | *Inherited from Port-Channel Interface @@ -207,11 +207,11 @@ vlan 2020 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE2-LSR1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet11 | P2P_LINK_TO_SITE2-LSR2_Ethernet12 | 11 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet12 | P2P_LINK_TO_SITE2-LSR2_Ethernet13 | 11 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet13 | P2P_LINK_TO_SITE2-LSR2_Ethernet14 | 220 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet14 | P2P_LINK_TO_SITE2-LSR2_Ethernet15 | 220 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet1 | P2P_SITE2-LSR1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet11 | P2P_SITE2-LSR2_Ethernet12 | 11 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet12 | P2P_SITE2-LSR2_Ethernet13 | 11 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet13 | P2P_SITE2-LSR2_Ethernet14 | 220 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet14 | P2P_SITE2-LSR2_Ethernet15 | 220 | *- | *default | *9178 | *False | *- | *- | *- | *- | *Inherited from Port-Channel Interface @@ -232,7 +232,7 @@ vlan 2020 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE2-LSR1_Ethernet1 + description P2P_SITE2-LSR1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -306,25 +306,25 @@ interface Ethernet8 spanning-tree portfast ! interface Ethernet11 - description P2P_LINK_TO_SITE2-LSR2_Ethernet12 + description P2P_SITE2-LSR2_Ethernet12 no shutdown speed forced 40gfull channel-group 11 mode active ! interface Ethernet12 - description P2P_LINK_TO_SITE2-LSR2_Ethernet13 + description P2P_SITE2-LSR2_Ethernet13 no shutdown speed forced 40gfull channel-group 11 mode active ! interface Ethernet13 - description P2P_LINK_TO_SITE2-LSR2_Ethernet14 + description P2P_SITE2-LSR2_Ethernet14 no shutdown speed forced 40gfull channel-group 220 mode active ! interface Ethernet14 - description P2P_LINK_TO_SITE2-LSR2_Ethernet15 + description P2P_SITE2-LSR2_Ethernet15 no shutdown speed forced 40gfull channel-group 220 mode active @@ -353,8 +353,8 @@ interface Ethernet14 | Interface | Description | MLAG ID | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------- | ---------- | --- | --- | -------- | ------ | ------- | -| Port-Channel11 | P2P_LINK_TO_SITE2-LSR2_Port-Channel12 | - | 100.64.49.2/30 | default | 9178 | False | - | - | -| Port-Channel220 | P2P_LINK_TO_SITE2-LSR2_Port-Channel110 | - | 100.64.49.6/30 | default | 9178 | False | - | - | +| Port-Channel11 | P2P_SITE2-LSR2_Port-Channel12 | - | 100.64.49.2/30 | default | 9178 | False | - | - | +| Port-Channel220 | P2P_SITE2-LSR2_Port-Channel110 | - | 100.64.49.6/30 | default | 9178 | False | - | - | ##### ISIS @@ -397,7 +397,7 @@ interface Port-Channel4.1004 client dot1q 1004 network client ! interface Port-Channel11 - description P2P_LINK_TO_SITE2-LSR2_Port-Channel12 + description P2P_SITE2-LSR2_Port-Channel12 no shutdown mtu 9178 no switchport @@ -417,7 +417,7 @@ interface Port-Channel11 ! interface Port-Channel220 - description P2P_LINK_TO_SITE2-LSR2_Port-Channel110 + description P2P_SITE2-LSR2_Port-Channel110 no shutdown mtu 9178 no switchport @@ -793,9 +793,9 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.7:10010 @@ -918,10 +918,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.7 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR1.md index 5a3584683b8..a9ca2bf2e78 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR1.md @@ -136,17 +136,17 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_SITE2-LER1_Ethernet1 | - | 100.64.48.14/31 | default | 9178 | False | - | - | -| Ethernet3 | P2P_LINK_TO_SITE1-LSR1_Ethernet3 | - | 100.64.48.9/31 | default | 9178 | False | - | - | -| Ethernet4 | P2P_LINK_TO_SITE2-RR1_Ethernet4 | - | 100.64.48.12/31 | default | 9178 | False | - | - | +| Ethernet1 | P2P_SITE2-LER1_Ethernet1 | - | 100.64.48.14/31 | default | 9178 | False | - | - | +| Ethernet3 | P2P_SITE1-LSR1_Ethernet3 | - | 100.64.48.9/31 | default | 9178 | False | - | - | +| Ethernet4 | P2P_SITE2-RR1_Ethernet4 | - | 100.64.48.12/31 | default | 9178 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_SITE2-LER1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_SITE1-LSR1_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_SITE2-RR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet1 | P2P_SITE2-LER1_Ethernet1 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet3 | P2P_SITE1-LSR1_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet4 | P2P_SITE2-RR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -161,7 +161,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_SITE2-LER1_Ethernet1 + description P2P_SITE2-LER1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -182,7 +182,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE1-LSR1_Ethernet3 + description P2P_SITE1-LSR1_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -203,7 +203,7 @@ interface Ethernet3 ! interface Ethernet4 - description P2P_LINK_TO_SITE2-RR1_Ethernet4 + description P2P_SITE2-RR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -414,10 +414,10 @@ router isis CUSTOM_NAME mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR2.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR2.md index a5f8fcaebf3..60ce5bf8999 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LSR2.md @@ -137,11 +137,11 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet3 | P2P_LINK_TO_SITE1-LSR2_Ethernet3 | - | 100.64.48.11/31 | default | 9178 | False | - | - | -| Ethernet12 | P2P_LINK_TO_SITE2-LER1_Ethernet11 | 12 | *100.64.49.1/30 | **default | *9178 | *False | **- | **- | -| Ethernet13 | P2P_LINK_TO_SITE2-LER1_Ethernet12 | 12 | *100.64.49.1/30 | **default | *9178 | *False | **- | **- | -| Ethernet14 | P2P_LINK_TO_SITE2-LER1_Ethernet13 | 110 | *100.64.49.5/30 | **default | *9178 | *False | **- | **- | -| Ethernet15 | P2P_LINK_TO_SITE2-LER1_Ethernet14 | 110 | *100.64.49.5/30 | **default | *9178 | *False | **- | **- | +| Ethernet3 | P2P_SITE1-LSR2_Ethernet3 | - | 100.64.48.11/31 | default | 9178 | False | - | - | +| Ethernet12 | P2P_SITE2-LER1_Ethernet11 | 12 | *100.64.49.1/30 | **default | *9178 | *False | **- | **- | +| Ethernet13 | P2P_SITE2-LER1_Ethernet12 | 12 | *100.64.49.1/30 | **default | *9178 | *False | **- | **- | +| Ethernet14 | P2P_SITE2-LER1_Ethernet13 | 110 | *100.64.49.5/30 | **default | *9178 | *False | **- | **- | +| Ethernet15 | P2P_SITE2-LER1_Ethernet14 | 110 | *100.64.49.5/30 | **default | *9178 | *False | **- | **- | *Inherited from Port-Channel Interface @@ -149,11 +149,11 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet3 | P2P_LINK_TO_SITE1-LSR2_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | -| Ethernet12 | P2P_LINK_TO_SITE2-LER1_Ethernet11 | 12 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet13 | P2P_LINK_TO_SITE2-LER1_Ethernet12 | 12 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet14 | P2P_LINK_TO_SITE2-LER1_Ethernet13 | 110 | *- | *default | *9178 | *False | *- | *- | *- | *- | -| Ethernet15 | P2P_LINK_TO_SITE2-LER1_Ethernet14 | 110 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet3 | P2P_SITE1-LSR2_Ethernet3 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet12 | P2P_SITE2-LER1_Ethernet11 | 12 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet13 | P2P_SITE2-LER1_Ethernet12 | 12 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet14 | P2P_SITE2-LER1_Ethernet13 | 110 | *- | *default | *9178 | *False | *- | *- | *- | *- | +| Ethernet15 | P2P_SITE2-LER1_Ethernet14 | 110 | *- | *default | *9178 | *False | *- | *- | *- | *- | *Inherited from Port-Channel Interface @@ -174,7 +174,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet3 - description P2P_LINK_TO_SITE1-LSR2_Ethernet3 + description P2P_SITE1-LSR2_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -195,25 +195,25 @@ interface Ethernet3 ! interface Ethernet12 - description P2P_LINK_TO_SITE2-LER1_Ethernet11 + description P2P_SITE2-LER1_Ethernet11 no shutdown speed forced 40gfull channel-group 12 mode active ! interface Ethernet13 - description P2P_LINK_TO_SITE2-LER1_Ethernet12 + description P2P_SITE2-LER1_Ethernet12 no shutdown speed forced 40gfull channel-group 12 mode active ! interface Ethernet14 - description P2P_LINK_TO_SITE2-LER1_Ethernet13 + description P2P_SITE2-LER1_Ethernet13 no shutdown speed forced 40gfull channel-group 110 mode active ! interface Ethernet15 - description P2P_LINK_TO_SITE2-LER1_Ethernet14 + description P2P_SITE2-LER1_Ethernet14 no shutdown speed forced 40gfull channel-group 110 mode active @@ -232,8 +232,8 @@ interface Ethernet15 | Interface | Description | MLAG ID | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------- | ---------- | --- | --- | -------- | ------ | ------- | -| Port-Channel12 | P2P_LINK_TO_SITE2-LER1_Port-Channel11 | - | 100.64.49.1/30 | default | 9178 | False | - | - | -| Port-Channel110 | P2P_LINK_TO_SITE2-LER1_Port-Channel220 | - | 100.64.49.5/30 | default | 9178 | False | - | - | +| Port-Channel12 | P2P_SITE2-LER1_Port-Channel11 | - | 100.64.49.1/30 | default | 9178 | False | - | - | +| Port-Channel110 | P2P_SITE2-LER1_Port-Channel220 | - | 100.64.49.5/30 | default | 9178 | False | - | - | ##### ISIS @@ -247,7 +247,7 @@ interface Ethernet15 ```eos ! interface Port-Channel12 - description P2P_LINK_TO_SITE2-LER1_Port-Channel11 + description P2P_SITE2-LER1_Port-Channel11 no shutdown mtu 9178 no switchport @@ -267,7 +267,7 @@ interface Port-Channel12 ! interface Port-Channel110 - description P2P_LINK_TO_SITE2-LER1_Port-Channel220 + description P2P_SITE2-LER1_Port-Channel220 no shutdown mtu 9178 no switchport @@ -475,10 +475,10 @@ router isis CUSTOM_NAME mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.4 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md index 22e30186e56..d898b7afbc9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md @@ -139,13 +139,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet4 | P2P_LINK_TO_SITE2-LSR1_Ethernet4 | - | 100.64.48.13/31 | default | 9178 | False | - | - | +| Ethernet4 | P2P_SITE2-LSR1_Ethernet4 | - | 100.64.48.13/31 | default | 9178 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet4 | P2P_LINK_TO_SITE2-LSR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | +| Ethernet4 | P2P_SITE2-LSR1_Ethernet4 | - | - | default | 9178 | False | - | - | - | - | ##### ISIS @@ -158,7 +158,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet4 - description P2P_LINK_TO_SITE2-LSR1_Ethernet4 + description P2P_SITE2-LSR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -463,13 +463,13 @@ router bgp 65000 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.6 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.6 description SITE1-LER2 + neighbor 100.70.0.6 description SITE1-LER2_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.8 peer group RR-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 ! address-family evpn neighbor default encapsulation mpls @@ -528,10 +528,10 @@ router bfd mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.9 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE3-LER1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE3-LER1.md index 0fa7a51f8f0..9f013c123e3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE3-LER1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE3-LER1.md @@ -330,10 +330,10 @@ router isis CORE mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.10 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ``` ### MPLS Interfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER1.cfg index 3f3eb899bb5..c8550ba922d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER1.cfg @@ -87,7 +87,7 @@ interface Port-Channel8.333 client dot1q 333 network client ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LSR1_Ethernet1 + description P2P_SITE1-LSR1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -108,7 +108,7 @@ interface Ethernet1 ! interface Ethernet2 - description P2P_LINK_TO_SITE1-LER2_Ethernet2 + description P2P_SITE1-LER2_Ethernet2 no shutdown mtu 9178 speed forced 10000full @@ -192,10 +192,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.5 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! patch panel patch TEN_A_site2_site5_eline_port_based @@ -240,9 +240,9 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.5:10010 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER2.cfg index 0450e37be48..1abfc5e74e1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER2.cfg @@ -89,7 +89,7 @@ interface Port-Channel8.333 client dot1q 333 network client ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LSR2_Ethernet1 + description P2P_SITE1-LSR2_Ethernet1 no shutdown mtu 9214 speed forced 100gfull @@ -110,7 +110,7 @@ interface Ethernet1 ! interface Ethernet2 - description P2P_LINK_TO_SITE1-LER1_Ethernet2 + description P2P_SITE1-LER1_Ethernet2 no shutdown mtu 9178 speed forced 10000full @@ -190,10 +190,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.6 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! patch panel patch TEN_B_site3_site5_eline_vlan_based_1000 @@ -234,13 +234,13 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.6:10010 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR1.cfg index ce814617260..f8a751c7719 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LER1_Ethernet1 + description P2P_SITE1-LER1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -43,7 +43,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE2-LSR1_Ethernet3 + description P2P_SITE2-LSR1_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -64,7 +64,7 @@ interface Ethernet3 ! interface Ethernet4 - description P2P_LINK_TO_SITE1-RR1_Ethernet4 + description P2P_SITE1-RR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -111,10 +111,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.1000.7000.0001.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR2.cfg index 58c96090844..97eb16ce39c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LSR2.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_SITE1-LER2_Ethernet1 + description P2P_SITE1-LER2_Ethernet1 no shutdown mtu 9214 speed forced 100gfull @@ -43,7 +43,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE2-LSR2_Ethernet3 + description P2P_SITE2-LSR2_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -90,10 +90,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.1000.7000.0002.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-RR1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-RR1.cfg index 645e57b1d08..52b65e83a91 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-RR1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-RR1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet4 - description P2P_LINK_TO_SITE1-LSR1_Ethernet4 + description P2P_SITE1-LSR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -69,10 +69,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.8 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -101,13 +101,13 @@ router bgp 65000 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.6 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.6 description SITE1-LER2 + neighbor 100.70.0.6 description SITE1-LER2_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.9 peer group RR-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! address-family evpn neighbor default encapsulation mpls diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg index 3b87d6a03bd..163967bd9f9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg @@ -65,7 +65,7 @@ interface Port-Channel4.1004 client dot1q 1004 network client ! interface Port-Channel11 - description P2P_LINK_TO_SITE2-LSR2_Port-Channel12 + description P2P_SITE2-LSR2_Port-Channel12 no shutdown mtu 9178 no switchport @@ -85,7 +85,7 @@ interface Port-Channel11 ! interface Port-Channel220 - description P2P_LINK_TO_SITE2-LSR2_Port-Channel110 + description P2P_SITE2-LSR2_Port-Channel110 no shutdown mtu 9178 no switchport @@ -105,7 +105,7 @@ interface Port-Channel220 ! interface Ethernet1 - description P2P_LINK_TO_SITE2-LSR1_Ethernet1 + description P2P_SITE2-LSR1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -179,25 +179,25 @@ interface Ethernet8 spanning-tree portfast ! interface Ethernet11 - description P2P_LINK_TO_SITE2-LSR2_Ethernet12 + description P2P_SITE2-LSR2_Ethernet12 no shutdown speed forced 40gfull channel-group 11 mode active ! interface Ethernet12 - description P2P_LINK_TO_SITE2-LSR2_Ethernet13 + description P2P_SITE2-LSR2_Ethernet13 no shutdown speed forced 40gfull channel-group 11 mode active ! interface Ethernet13 - description P2P_LINK_TO_SITE2-LSR2_Ethernet14 + description P2P_SITE2-LSR2_Ethernet14 no shutdown speed forced 40gfull channel-group 220 mode active ! interface Ethernet14 - description P2P_LINK_TO_SITE2-LSR2_Ethernet15 + description P2P_SITE2-LSR2_Ethernet15 no shutdown speed forced 40gfull channel-group 220 mode active @@ -239,10 +239,10 @@ ip route vrf TENANT_B_INTRA 123.0.10.0/24 Ethernet6.10 123.1.1.3 name TENANT_B_S mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.7 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! patch panel patch TEN_A_site2_site5_eline_port_based @@ -287,9 +287,9 @@ router bgp 65000 neighbor MPLS-OVERLAY-PEERS send-community neighbor MPLS-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.8 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 neighbor 100.70.0.9 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.9 description SITE2-RR1 + neighbor 100.70.0.9 description SITE2-RR1_Loopback0 ! vlan 10 rd 100.70.0.7:10010 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR1.cfg index 103b2602887..5932a70255c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_SITE2-LER1_Ethernet1 + description P2P_SITE2-LER1_Ethernet1 no shutdown mtu 9178 speed forced 40gfull @@ -43,7 +43,7 @@ interface Ethernet1 ! interface Ethernet3 - description P2P_LINK_TO_SITE1-LSR1_Ethernet3 + description P2P_SITE1-LSR1_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -64,7 +64,7 @@ interface Ethernet3 ! interface Ethernet4 - description P2P_LINK_TO_SITE2-RR1_Ethernet4 + description P2P_SITE2-RR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -111,10 +111,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CUSTOM_NAME net 49.0001.1000.7000.0003.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR2.cfg index fdf97ac773a..6f430a01113 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LSR2.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Port-Channel12 - description P2P_LINK_TO_SITE2-LER1_Port-Channel11 + description P2P_SITE2-LER1_Port-Channel11 no shutdown mtu 9178 no switchport @@ -42,7 +42,7 @@ interface Port-Channel12 ! interface Port-Channel110 - description P2P_LINK_TO_SITE2-LER1_Port-Channel220 + description P2P_SITE2-LER1_Port-Channel220 no shutdown mtu 9178 no switchport @@ -62,7 +62,7 @@ interface Port-Channel110 ! interface Ethernet3 - description P2P_LINK_TO_SITE1-LSR2_Ethernet3 + description P2P_SITE1-LSR2_Ethernet3 no shutdown mtu 9178 speed forced 40gfull @@ -83,25 +83,25 @@ interface Ethernet3 ! interface Ethernet12 - description P2P_LINK_TO_SITE2-LER1_Ethernet11 + description P2P_SITE2-LER1_Ethernet11 no shutdown speed forced 40gfull channel-group 12 mode active ! interface Ethernet13 - description P2P_LINK_TO_SITE2-LER1_Ethernet12 + description P2P_SITE2-LER1_Ethernet12 no shutdown speed forced 40gfull channel-group 12 mode active ! interface Ethernet14 - description P2P_LINK_TO_SITE2-LER1_Ethernet13 + description P2P_SITE2-LER1_Ethernet13 no shutdown speed forced 40gfull channel-group 110 mode active ! interface Ethernet15 - description P2P_LINK_TO_SITE2-LER1_Ethernet14 + description P2P_SITE2-LER1_Ethernet14 no shutdown speed forced 40gfull channel-group 110 mode active @@ -133,10 +133,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.4 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CUSTOM_NAME net 49.0001.1000.7000.0004.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-RR1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-RR1.cfg index d55404de6aa..a3465eb933d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-RR1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-RR1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet4 - description P2P_LINK_TO_SITE2-LSR1_Ethernet4 + description P2P_SITE2-LSR1_Ethernet4 no shutdown mtu 9178 speed forced 40gfull @@ -69,10 +69,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.9 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router bfd multihop interval 300 min-rx 300 multiplier 3 @@ -101,13 +101,13 @@ router bgp 65000 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 100.70.0.5 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.5 description SITE1-LER1 + neighbor 100.70.0.5 description SITE1-LER1_Loopback0 neighbor 100.70.0.6 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.6 description SITE1-LER2 + neighbor 100.70.0.6 description SITE1-LER2_Loopback0 neighbor 100.70.0.7 peer group MPLS-OVERLAY-PEERS - neighbor 100.70.0.7 description SITE2-LER1 + neighbor 100.70.0.7 description SITE2-LER1_Loopback0 neighbor 100.70.0.8 peer group RR-OVERLAY-PEERS - neighbor 100.70.0.8 description SITE1-RR1 + neighbor 100.70.0.8 description SITE1-RR1_Loopback0 ! address-family evpn neighbor default encapsulation mpls diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE3-LER1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE3-LER1.cfg index 945cefb75e9..4d42042df71 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE3-LER1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE3-LER1.cfg @@ -51,10 +51,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 mpls ip ! mpls ldp - interface disabled default router-id 100.70.0.10 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.1000.7000.0010.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml index 5f67bf11515..6a2d24c3a4c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml @@ -37,11 +37,11 @@ router_bgp: - ip_address: 100.70.0.8 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-RR1 - description: SITE1-RR1 + description: SITE1-RR1_Loopback0 - ip_address: 100.70.0.9 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-RR1 - description: SITE2-RR1 + description: SITE2-RR1_Loopback0 vrfs: - name: TENANT_B_INTRA rd: 100.70.0.5:19 @@ -211,7 +211,6 @@ ethernet_interfaces: peer: SITE1-LSR1 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_SITE1-LSR1_Ethernet1 switchport: enabled: false shutdown: false @@ -233,12 +232,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LSR1_Ethernet1 speed: forced 40gfull - name: Ethernet2 peer: SITE1-LER2 peer_interface: Ethernet2 peer_type: pe - description: P2P_LINK_TO_SITE1-LER2_Ethernet2 switchport: enabled: false shutdown: false @@ -260,6 +259,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LER2_Ethernet2 speed: forced 10000full - name: Ethernet6.10 peer_type: l3_interface diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml index 546981799c4..2bac52fc284 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml @@ -49,19 +49,19 @@ router_bgp: - ip_address: 100.70.0.8 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-RR1 - description: SITE1-RR1 + description: SITE1-RR1_Loopback0 - ip_address: 100.70.0.9 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-RR1 - description: SITE2-RR1 + description: SITE2-RR1_Loopback0 - ip_address: 100.70.0.5 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-LER1 - description: SITE1-LER1 + description: SITE1-LER1_Loopback0 - ip_address: 100.70.0.7 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-LER1 - description: SITE2-LER1 + description: SITE2-LER1_Loopback0 vrfs: - name: TENANT_B_INTRA rd: 100.70.0.6:19 @@ -256,7 +256,6 @@ ethernet_interfaces: peer: SITE1-LSR2 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_SITE1-LSR2_Ethernet1 switchport: enabled: false shutdown: false @@ -278,12 +277,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LSR2_Ethernet1 speed: forced 100gfull - name: Ethernet2 peer: SITE1-LER1 peer_interface: Ethernet2 peer_type: pe - description: P2P_LINK_TO_SITE1-LER1_Ethernet2 switchport: enabled: false shutdown: false @@ -305,6 +304,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LER1_Ethernet2 speed: forced 10000full - name: Ethernet5.100 peer_type: l3_interface diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR1.yml index 1c86ed5d2c5..6a79b6dff44 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR1.yml @@ -88,7 +88,6 @@ ethernet_interfaces: peer: SITE1-LER1 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_SITE1-LER1_Ethernet1 switchport: enabled: false shutdown: false @@ -110,12 +109,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LER1_Ethernet1 speed: forced 40gfull - name: Ethernet4 peer: SITE1-RR1 peer_interface: Ethernet4 peer_type: rr - description: P2P_LINK_TO_SITE1-RR1_Ethernet4 switchport: enabled: false shutdown: false @@ -137,12 +136,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-RR1_Ethernet4 speed: forced 40gfull - name: Ethernet3 peer: SITE2-LSR1 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_SITE2-LSR1_Ethernet3 switchport: enabled: false shutdown: false @@ -164,6 +163,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR1_Ethernet3 speed: forced 40gfull metadata: platform: 7280SR diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR2.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR2.yml index f4d2ffb8431..831b96bddbd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LSR2.yml @@ -88,7 +88,6 @@ ethernet_interfaces: peer: SITE1-LER2 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_SITE1-LER2_Ethernet1 switchport: enabled: false shutdown: false @@ -110,12 +109,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LER2_Ethernet1 speed: forced 100gfull - name: Ethernet3 peer: SITE2-LSR2 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Ethernet3 switchport: enabled: false shutdown: false @@ -137,6 +136,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR2_Ethernet3 speed: forced 40gfull metadata: platform: 7280SR diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-RR1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-RR1.yml index 0ebd94ed991..98403d7b8df 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-RR1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-RR1.yml @@ -37,10 +37,10 @@ router_bgp: neighbor_default: encapsulation: mpls peer_groups: - - name: MPLS-OVERLAY-PEERS - activate: true - name: RR-OVERLAY-PEERS activate: true + - name: MPLS-OVERLAY-PEERS + activate: true address_family_ipv4: peer_groups: - name: MPLS-OVERLAY-PEERS @@ -63,19 +63,19 @@ router_bgp: - ip_address: 100.70.0.5 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-LER1 - description: SITE1-LER1 + description: SITE1-LER1_Loopback0 - ip_address: 100.70.0.6 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-LER2 - description: SITE1-LER2 + description: SITE1-LER2_Loopback0 - ip_address: 100.70.0.7 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-LER1 - description: SITE2-LER1 + description: SITE2-LER1_Loopback0 - ip_address: 100.70.0.9 peer_group: RR-OVERLAY-PEERS peer: SITE2-RR1 - description: SITE2-RR1 + description: SITE2-RR1_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -169,7 +169,6 @@ ethernet_interfaces: peer: SITE1-LSR1 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_SITE1-LSR1_Ethernet4 switchport: enabled: false shutdown: false @@ -191,6 +190,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LSR1_Ethernet4 speed: forced 40gfull metadata: platform: 7280SR3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml index ab9a765e87d..1bc51ca8338 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml @@ -49,11 +49,11 @@ router_bgp: - ip_address: 100.70.0.8 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-RR1 - description: SITE1-RR1 + description: SITE1-RR1_Loopback0 - ip_address: 100.70.0.9 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-RR1 - description: SITE2-RR1 + description: SITE2-RR1_Loopback0 vrfs: - name: TENANT_B_INTRA rd: 100.70.0.7:19 @@ -263,7 +263,6 @@ ethernet_interfaces: peer: SITE2-LSR1 peer_interface: Ethernet1 peer_type: p - description: P2P_LINK_TO_SITE2-LSR1_Ethernet1 switchport: enabled: false shutdown: false @@ -285,46 +284,47 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR1_Ethernet1 speed: forced 40gfull - name: Ethernet11 peer: SITE2-LSR2 peer_interface: Ethernet12 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Ethernet12 shutdown: false channel_group: id: 11 mode: active + description: P2P_SITE2-LSR2_Ethernet12 speed: forced 40gfull - name: Ethernet12 peer: SITE2-LSR2 peer_interface: Ethernet13 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Ethernet13 shutdown: false channel_group: id: 11 mode: active + description: P2P_SITE2-LSR2_Ethernet13 speed: forced 40gfull - name: Ethernet13 peer: SITE2-LSR2 peer_interface: Ethernet14 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Ethernet14 shutdown: false channel_group: id: 220 mode: active + description: P2P_SITE2-LSR2_Ethernet14 speed: forced 40gfull - name: Ethernet14 peer: SITE2-LSR2 peer_interface: Ethernet15 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Ethernet15 shutdown: false channel_group: id: 220 mode: active + description: P2P_SITE2-LSR2_Ethernet15 speed: forced 40gfull - name: Ethernet6.10 peer_type: l3_interface @@ -399,7 +399,6 @@ port_channel_interfaces: peer: SITE2-LSR2 peer_interface: Port-Channel12 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Port-Channel12 switchport: enabled: false shutdown: false @@ -421,11 +420,11 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR2_Port-Channel12 - name: Port-Channel220 peer: SITE2-LSR2 peer_interface: Port-Channel110 peer_type: p - description: P2P_LINK_TO_SITE2-LSR2_Port-Channel110 switchport: enabled: false shutdown: false @@ -447,6 +446,7 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR2_Port-Channel110 - name: Port-Channel4.1000 peer_type: point_to_point_service encapsulation_vlan: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR1.yml index beb7eb6784e..b97858bf63d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR1.yml @@ -88,7 +88,6 @@ ethernet_interfaces: peer: SITE1-LSR1 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_SITE1-LSR1_Ethernet3 switchport: enabled: false shutdown: false @@ -110,12 +109,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LSR1_Ethernet3 speed: forced 40gfull - name: Ethernet4 peer: SITE2-RR1 peer_interface: Ethernet4 peer_type: rr - description: P2P_LINK_TO_SITE2-RR1_Ethernet4 switchport: enabled: false shutdown: false @@ -137,12 +136,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-RR1_Ethernet4 speed: forced 40gfull - name: Ethernet1 peer: SITE2-LER1 peer_interface: Ethernet1 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Ethernet1 switchport: enabled: false shutdown: false @@ -164,6 +163,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LER1_Ethernet1 speed: forced 40gfull metadata: platform: 7280SR diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR2.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR2.yml index 68bb712a621..72a564e33b9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LSR2.yml @@ -88,7 +88,6 @@ ethernet_interfaces: peer: SITE1-LSR2 peer_interface: Ethernet3 peer_type: p - description: P2P_LINK_TO_SITE1-LSR2_Ethernet3 switchport: enabled: false shutdown: false @@ -110,53 +109,53 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE1-LSR2_Ethernet3 speed: forced 40gfull - name: Ethernet12 peer: SITE2-LER1 peer_interface: Ethernet11 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Ethernet11 shutdown: false channel_group: id: 12 mode: active + description: P2P_SITE2-LER1_Ethernet11 speed: forced 40gfull - name: Ethernet13 peer: SITE2-LER1 peer_interface: Ethernet12 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Ethernet12 shutdown: false channel_group: id: 12 mode: active + description: P2P_SITE2-LER1_Ethernet12 speed: forced 40gfull - name: Ethernet14 peer: SITE2-LER1 peer_interface: Ethernet13 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Ethernet13 shutdown: false channel_group: id: 110 mode: active + description: P2P_SITE2-LER1_Ethernet13 speed: forced 40gfull - name: Ethernet15 peer: SITE2-LER1 peer_interface: Ethernet14 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Ethernet14 shutdown: false channel_group: id: 110 mode: active + description: P2P_SITE2-LER1_Ethernet14 speed: forced 40gfull port_channel_interfaces: - name: Port-Channel12 peer: SITE2-LER1 peer_interface: Port-Channel11 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Port-Channel11 switchport: enabled: false shutdown: false @@ -178,11 +177,11 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LER1_Port-Channel11 - name: Port-Channel110 peer: SITE2-LER1 peer_interface: Port-Channel220 peer_type: pe - description: P2P_LINK_TO_SITE2-LER1_Port-Channel220 switchport: enabled: false shutdown: false @@ -204,5 +203,6 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LER1_Port-Channel220 metadata: platform: 7280SR diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-RR1.yml b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-RR1.yml index e6d2a0d3df9..6e48edd6e42 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-RR1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-RR1.yml @@ -37,10 +37,10 @@ router_bgp: neighbor_default: encapsulation: mpls peer_groups: - - name: MPLS-OVERLAY-PEERS - activate: true - name: RR-OVERLAY-PEERS activate: true + - name: MPLS-OVERLAY-PEERS + activate: true address_family_ipv4: peer_groups: - name: MPLS-OVERLAY-PEERS @@ -63,19 +63,19 @@ router_bgp: - ip_address: 100.70.0.5 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-LER1 - description: SITE1-LER1 + description: SITE1-LER1_Loopback0 - ip_address: 100.70.0.6 peer_group: MPLS-OVERLAY-PEERS peer: SITE1-LER2 - description: SITE1-LER2 + description: SITE1-LER2_Loopback0 - ip_address: 100.70.0.7 peer_group: MPLS-OVERLAY-PEERS peer: SITE2-LER1 - description: SITE2-LER1 + description: SITE2-LER1_Loopback0 - ip_address: 100.70.0.8 peer_group: RR-OVERLAY-PEERS peer: SITE1-RR1 - description: SITE1-RR1 + description: SITE1-RR1_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -169,7 +169,6 @@ ethernet_interfaces: peer: SITE2-LSR1 peer_interface: Ethernet4 peer_type: p - description: P2P_LINK_TO_SITE2-LSR1_Ethernet4 switchport: enabled: false shutdown: false @@ -191,6 +190,7 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_SITE2-LSR1_Ethernet4 speed: forced 40gfull metadata: platform: 7280SR3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md index d9633863b9f..f2db89a7e84 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md @@ -183,7 +183,7 @@ vlan internal order ascending range 1006 1199 | 2600 | web-l2-vlan-2 | - | | 2601 | l2vlan_with_no_vxlan | - | | 4085 | L2LEAF_INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -223,7 +223,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -309,7 +309,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan4085 | L2LEAF_INBAND_MGMT | default | - | False | -| Vlan4094 | MLAG_PEER | default | - | False | +| Vlan4094 | MLAG | default | - | False | ##### IPv4 @@ -328,7 +328,7 @@ interface Vlan4085 ip address 172.21.110.5/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md index a898d54e229..566021b2335 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md @@ -211,7 +211,7 @@ vlan internal order ascending range 1006 1199 | 2600 | web-l2-vlan-2 | - | | 2601 | l2vlan_with_no_vxlan | - | | 4085 | L2LEAF_INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -251,7 +251,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -337,7 +337,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan4085 | L2LEAF_INBAND_MGMT | default | - | False | -| Vlan4094 | MLAG_PEER | default | - | False | +| Vlan4094 | MLAG | default | - | False | ##### IPv4 @@ -356,7 +356,7 @@ interface Vlan4085 ip address 172.21.110.6/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.3/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md index 743b8764db0..b5ec0962b40 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md @@ -170,16 +170,16 @@ vlan 4085 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet3 | - | 172.17.110.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet3 | - | 172.17.110.3/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-RS1_Ethernet3 | - | 172.17.10.4/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD1-SPINE1_Ethernet3 | - | 172.17.110.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE2_Ethernet3 | - | 172.17.110.3/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-RS1_Ethernet3 | - | 172.17.10.4/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet3 + description P2P_DC1-POD1-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -188,7 +188,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet3 + description P2P_DC1-POD1-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -202,7 +202,7 @@ interface Ethernet3 channel-group 3 mode active ! interface Ethernet4 - description P2P_LINK_TO_DC1-RS1_Ethernet3 + description P2P_DC1-RS1_Ethernet3 no shutdown no switchport ip address 172.17.10.4/31 @@ -462,25 +462,25 @@ router bgp 65111.100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.5 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.5 remote-as 65101 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md index 1826e2ba8fe..857cb706a6f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md @@ -236,7 +236,7 @@ vlan internal order ascending range 1006 1199 | 2600 | web-l2-vlan-2 | - | | 2601 | l2vlan_with_no_vxlan | - | | 4085 | L2LEAF_INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -276,7 +276,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -305,18 +305,18 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet5 | - | 172.17.110.17/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet5 | - | 172.17.110.19/31 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet7 | - | 11.1.0.38/31 | default | - | False | - | - | -| Ethernet11 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet8 | - | 172.17.110.21/31 | default | - | False | - | - | -| Ethernet12 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet8 | - | 172.17.110.23/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD1-SPINE1_Ethernet5 | - | 172.17.110.17/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE2_Ethernet5 | - | 172.17.110.19/31 | default | - | False | - | - | +| Ethernet7 | P2P_DC2-POD1-LEAF1A_Ethernet7 | - | 11.1.0.38/31 | default | - | False | - | - | +| Ethernet11 | P2P_DC1-POD1-SPINE1_Ethernet8 | - | 172.17.110.21/31 | default | - | False | - | - | +| Ethernet12 | P2P_DC1-POD1-SPINE2_Ethernet8 | - | 172.17.110.23/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet5 + description P2P_DC1-POD1-SPINE1_Ethernet5 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -325,7 +325,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet5 + description P2P_DC1-POD1-SPINE2_Ethernet5 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -354,14 +354,14 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet7 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet7 + description P2P_DC2-POD1-LEAF1A_Ethernet7 no shutdown no switchport ip address 11.1.0.38/31 ptp enable ! interface Ethernet11 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet8 + description P2P_DC1-POD1-SPINE1_Ethernet8 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -370,7 +370,7 @@ interface Ethernet11 service-profile QOS-PROFILE ! interface Ethernet12 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet8 + description P2P_DC1-POD1-SPINE2_Ethernet8 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -567,7 +567,7 @@ interface Loopback102 | Vlan1101 | test_svi | vrf_with_loopbacks_from_pod_pools | - | False | | Vlan1102 | test_svi | vrf_with_loopbacks_dc1_pod1_only | - | False | | Vlan4085 | L2LEAF_INBAND_MGMT | default | - | False | -| Vlan4094 | MLAG_PEER | default | - | False | +| Vlan4094 | MLAG | default | - | False | ##### IPv4 @@ -641,7 +641,7 @@ interface Vlan4085 ip virtual-router address 172.21.110.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.3/31 @@ -929,15 +929,15 @@ router bgp 65112.100 neighbor 11.1.0.39 bfd neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.1 route-map RM-EVPN-FILTER-AS65101 out neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.1 route-map RM-EVPN-FILTER-AS65110.100 out neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.110.3 route-map RM-EVPN-FILTER-AS65111.100 out neighbor 172.17.110.16 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.110.16 remote-as 65110.100 @@ -952,7 +952,7 @@ router bgp 65112.100 neighbor 172.17.110.22 remote-as 65110.100 neighbor 172.17.110.22 description DC1-POD1-SPINE2_Ethernet8 neighbor 172.20.110.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 172.20.110.2 description DC1.POD1.LEAF2A + neighbor 172.20.110.2 description DC1.POD1.LEAF2A_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md index 0c74938cc49..8ad31bd1310 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md @@ -144,21 +144,21 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet1 | - | 172.16.11.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet1 | - | 172.16.11.65/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet1 | - | 172.17.110.0/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet1 | - | 172.17.110.8/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet1 | - | 172.17.110.16/31 | default | - | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-RS1_Ethernet2 | - | 172.17.10.2/31 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet11 | - | 172.17.110.12/31 | default | - | False | - | - | -| Ethernet8 | P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet11 | - | 172.17.110.20/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE1_Ethernet1 | - | 172.16.11.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-SUPER-SPINE2_Ethernet1 | - | 172.16.11.65/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD1-LEAF1A_Ethernet1 | - | 172.17.110.0/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1.POD1.LEAF2A_Ethernet1 | - | 172.17.110.8/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-POD1-LEAF2B_Ethernet1 | - | 172.17.110.16/31 | default | - | False | - | - | +| Ethernet6 | P2P_DC1-RS1_Ethernet2 | - | 172.17.10.2/31 | default | - | False | - | - | +| Ethernet7 | P2P_DC1.POD1.LEAF2A_Ethernet11 | - | 172.17.110.12/31 | default | - | False | - | - | +| Ethernet8 | P2P_DC1-POD1-LEAF2B_Ethernet11 | - | 172.17.110.20/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet1 + description P2P_DC1-SUPER-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -167,7 +167,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet1 + description P2P_DC1-SUPER-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -176,7 +176,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet1 + description P2P_DC1-POD1-LEAF1A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -185,7 +185,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet1 + description P2P_DC1.POD1.LEAF2A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -194,7 +194,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet1 + description P2P_DC1-POD1-LEAF2B_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -203,14 +203,14 @@ interface Ethernet5 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC1-RS1_Ethernet2 + description P2P_DC1-RS1_Ethernet2 no shutdown no switchport ip address 172.17.10.2/31 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet11 + description P2P_DC1.POD1.LEAF2A_Ethernet11 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -219,7 +219,7 @@ interface Ethernet7 service-profile QOS-PROFILE ! interface Ethernet8 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet11 + description P2P_DC1-POD1-LEAF2B_Ethernet11 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -402,25 +402,25 @@ router bgp 65110.100 neighbor 172.16.11.64 description DC1-SUPER-SPINE2_Ethernet1 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.3 remote-as 65101 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE2.md index f04598f6635..c85af54903a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE2.md @@ -168,20 +168,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet2 | - | 172.16.11.3/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet2 | - | 172.16.11.67/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet2 | - | 172.17.110.2/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet2 | - | 172.17.110.10/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet2 | - | 172.17.110.18/31 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet12 | - | 172.17.110.14/31 | default | - | False | - | - | -| Ethernet8 | P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet12 | - | 172.17.110.22/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE1_Ethernet2 | - | 172.16.11.3/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-SUPER-SPINE2_Ethernet2 | - | 172.16.11.67/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD1-LEAF1A_Ethernet2 | - | 172.17.110.2/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1.POD1.LEAF2A_Ethernet2 | - | 172.17.110.10/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-POD1-LEAF2B_Ethernet2 | - | 172.17.110.18/31 | default | - | False | - | - | +| Ethernet7 | P2P_DC1.POD1.LEAF2A_Ethernet12 | - | 172.17.110.14/31 | default | - | False | - | - | +| Ethernet8 | P2P_DC1-POD1-LEAF2B_Ethernet12 | - | 172.17.110.22/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet2 + description P2P_DC1-SUPER-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -190,7 +190,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet2 + description P2P_DC1-SUPER-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -199,7 +199,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet2 + description P2P_DC1-POD1-LEAF1A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -208,7 +208,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet2 + description P2P_DC1.POD1.LEAF2A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -217,7 +217,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet2 + description P2P_DC1-POD1-LEAF2B_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -226,7 +226,7 @@ interface Ethernet5 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet12 + description P2P_DC1.POD1.LEAF2A_Ethernet12 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -235,7 +235,7 @@ interface Ethernet7 service-profile QOS-PROFILE ! interface Ethernet8 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet12 + description P2P_DC1-POD1-LEAF2B_Ethernet12 no shutdown mac security profile MACSEC_PROFILE no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md index 8482cf90a4f..8c5076b5ceb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md @@ -250,16 +250,16 @@ vlan 2601 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet3 | - | 172.17.120.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet3 | - | 172.17.120.3/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-RS2_Ethernet3 | - | 172.17.10.12/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD2-SPINE1_Ethernet3 | - | 172.17.120.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD2-SPINE2_Ethernet3 | - | 172.17.120.3/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-RS2_Ethernet3 | - | 172.17.10.12/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet3 + description P2P_DC1-POD2-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -268,7 +268,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet3 + description P2P_DC1-POD2-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -277,7 +277,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-RS2_Ethernet3 + description P2P_DC1-RS2_Ethernet3 no shutdown no switchport ip address 172.17.10.12/31 @@ -634,11 +634,11 @@ router bgp 65121 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.120.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.1 remote-as 65120 - neighbor 172.16.120.1 description DC1-POD2-SPINE1 + neighbor 172.16.120.1 description DC1-POD2-SPINE1_Loopback0 neighbor 172.16.120.1 route-map RM-EVPN-FILTER-AS65120 out neighbor 172.16.120.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.2 remote-as 65120 - neighbor 172.16.120.2 description DC1-POD2-SPINE2 + neighbor 172.16.120.2 description DC1-POD2-SPINE2_Loopback0 neighbor 172.16.120.2 route-map RM-EVPN-FILTER-AS65120 out neighbor 172.17.10.13 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.13 remote-as 65102 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md index 4528bd2f390..9d2f894ddb9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md @@ -173,18 +173,18 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet3 | - | 172.16.12.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet3 | - | 172.16.12.65/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet1 | - | 172.17.120.0/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-RS2_Ethernet2 | - | 172.17.10.10/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet5 | - | 11.1.1.18/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE1_Ethernet3 | - | 172.16.12.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-SUPER-SPINE2_Ethernet3 | - | 172.16.12.65/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD2-LEAF1A_Ethernet1 | - | 172.17.120.0/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-RS2_Ethernet2 | - | 172.17.10.10/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC2-POD1-SPINE1_Ethernet5 | - | 11.1.1.18/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet3 + description P2P_DC1-SUPER-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -193,7 +193,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet3 + description P2P_DC1-SUPER-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -202,7 +202,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet1 + description P2P_DC1-POD2-LEAF1A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -211,14 +211,14 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-RS2_Ethernet2 + description P2P_DC1-RS2_Ethernet2 no shutdown no switchport ip address 172.17.10.10/31 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet5 + description P2P_DC2-POD1-SPINE1_Ethernet5 no shutdown no switchport ip address 11.1.1.18/31 @@ -393,7 +393,7 @@ router bgp 65120 neighbor 172.16.12.64 description DC1-SUPER-SPINE2_Ethernet3 neighbor 172.16.120.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.10.11 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.11 remote-as 65102 neighbor 172.17.10.11 description DC1-RS2_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md index a332fdb6cc1..6cb334bdcc2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md @@ -173,17 +173,17 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet4 | - | 172.16.12.3/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet4 | - | 172.16.12.67/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet2 | - | 172.17.120.2/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet5 | - | 200.200.200.101/24 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE1_Ethernet4 | - | 172.16.12.3/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-SUPER-SPINE2_Ethernet4 | - | 172.16.12.67/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD2-LEAF1A_Ethernet2 | - | 172.17.120.2/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC2-POD1-SPINE2_Ethernet5 | - | 200.200.200.101/24 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet4 + description P2P_DC1-SUPER-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -192,7 +192,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet4 + description P2P_DC1-SUPER-SPINE2_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -201,7 +201,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet2 + description P2P_DC1-POD2-LEAF1A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -210,7 +210,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet5 + description P2P_DC2-POD1-SPINE2_Ethernet5 no shutdown no switchport ip address 200.200.200.101/24 @@ -382,7 +382,7 @@ router bgp 65120 neighbor 172.16.12.66 description DC1-SUPER-SPINE2_Ethernet4 neighbor 172.16.120.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.120.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.120.3 remote-as 65121 neighbor 172.17.120.3 description DC1-POD2-LEAF1A_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md index cd895f30593..ba54891ff5f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md @@ -145,30 +145,30 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet5 | - | 172.17.10.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet6 | - | 172.17.10.3/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet4 | - | 172.17.10.5/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE1_Ethernet5 | - | 172.17.10.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE1_Ethernet6 | - | 172.17.10.3/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD1-LEAF1A_Ethernet4 | - | 172.17.10.5/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet5 + description P2P_DC1-SUPER-SPINE1_Ethernet5 no shutdown no switchport ip address 172.17.10.1/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet6 + description P2P_DC1-POD1-SPINE1_Ethernet6 no shutdown no switchport ip address 172.17.10.3/31 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet4 + description P2P_DC1-POD1-LEAF1A_Ethernet4 no shutdown no switchport ip address 172.17.10.5/31 @@ -338,25 +338,25 @@ router bgp 65101 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.0 remote-as 65100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md index bf1d4d6ebce..312c020cc35 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md @@ -173,30 +173,30 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet5 | - | 172.17.10.9/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet4 | - | 172.17.10.11/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet3 | - | 172.17.10.13/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-SUPER-SPINE2_Ethernet5 | - | 172.17.10.9/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD2-SPINE1_Ethernet4 | - | 172.17.10.11/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD2-LEAF1A_Ethernet3 | - | 172.17.10.13/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet5 + description P2P_DC1-SUPER-SPINE2_Ethernet5 no shutdown no switchport ip address 172.17.10.9/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet4 + description P2P_DC1-POD2-SPINE1_Ethernet4 no shutdown no switchport ip address 172.17.10.11/31 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet3 + description P2P_DC1-POD2-LEAF1A_Ethernet3 no shutdown no switchport ip address 172.17.10.13/31 @@ -364,19 +364,19 @@ router bgp 65102 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.8 remote-as 65100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md index 7762eb2879f..95176e06c54 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md @@ -143,19 +143,19 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet1 | - | 172.16.11.0/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet1 | - | 172.16.11.2/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet1 | - | 172.16.12.0/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet1 | - | 172.16.12.2/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-RS1_Ethernet1 | - | 172.17.10.0/31 | default | - | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet4 | - | 11.1.2.0/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD1-SPINE1_Ethernet1 | - | 172.16.11.0/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE2_Ethernet1 | - | 172.16.11.2/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD2-SPINE1_Ethernet1 | - | 172.16.12.0/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-POD2-SPINE2_Ethernet1 | - | 172.16.12.2/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-RS1_Ethernet1 | - | 172.17.10.0/31 | default | - | False | - | - | +| Ethernet6 | P2P_DC2-SUPER-SPINE1_Ethernet4 | - | 11.1.2.0/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet1 + description P2P_DC1-POD1-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -164,7 +164,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet1 + description P2P_DC1-POD1-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -173,7 +173,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet1 + description P2P_DC1-POD2-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -182,7 +182,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet1 + description P2P_DC1-POD2-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -191,14 +191,14 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-RS1_Ethernet1 + description P2P_DC1-RS1_Ethernet1 no shutdown no switchport ip address 172.17.10.0/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet4 + description P2P_DC2-SUPER-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE2.md index ac58f133e9e..933d9169497 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE2.md @@ -171,19 +171,19 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet2 | - | 172.16.11.64/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet2 | - | 172.16.11.66/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet2 | - | 172.16.12.64/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet2 | - | 172.16.12.66/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-RS2_Ethernet1 | - | 172.17.10.8/31 | default | - | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet4 | - | 11.1.2.2/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD1-SPINE1_Ethernet2 | - | 172.16.11.64/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE2_Ethernet2 | - | 172.16.11.66/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC1-POD2-SPINE1_Ethernet2 | - | 172.16.12.64/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-POD2-SPINE2_Ethernet2 | - | 172.16.12.66/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-RS2_Ethernet1 | - | 172.17.10.8/31 | default | - | False | - | - | +| Ethernet6 | P2P_DC2-SUPER-SPINE2_Ethernet4 | - | 11.1.2.2/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet2 + description P2P_DC1-POD1-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -192,7 +192,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet2 + description P2P_DC1-POD1-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -201,7 +201,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet2 + description P2P_DC1-POD2-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -210,7 +210,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet2 + description P2P_DC1-POD2-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -219,14 +219,14 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-RS2_Ethernet1 + description P2P_DC1-RS2_Ethernet1 no shutdown no switchport ip address 172.17.10.8/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet4 + description P2P_DC2-SUPER-SPINE2_Ethernet4 no shutdown no switchport ip address 11.1.2.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md index fd05893baf1..6044fa5b0dd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md @@ -212,7 +212,7 @@ vlan internal order ascending range 1006 1199 | 2600 | web-l2-vlan-2 | - | | 2601 | l2vlan_with_no_vxlan | - | | 4085 | L2LEAF_INBAND_MGMT | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -252,7 +252,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -281,18 +281,18 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet4 | - | 172.17.110.9/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet4 | - | 172.17.110.11/31 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet6 | - | 100.100.100.101/24 | default | - | False | - | - | -| Ethernet11 | P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet7 | - | 172.17.110.13/31 | default | - | False | - | - | -| Ethernet12 | P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet7 | - | 172.17.110.15/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC1-POD1-SPINE1_Ethernet4 | - | 172.17.110.9/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC1-POD1-SPINE2_Ethernet4 | - | 172.17.110.11/31 | default | - | False | - | - | +| Ethernet7 | P2P_DC2-POD1-LEAF1A_Ethernet6 | - | 100.100.100.101/24 | default | - | False | - | - | +| Ethernet11 | P2P_DC1-POD1-SPINE1_Ethernet7 | - | 172.17.110.13/31 | default | - | False | - | - | +| Ethernet12 | P2P_DC1-POD1-SPINE2_Ethernet7 | - | 172.17.110.15/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet4 + description P2P_DC1-POD1-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -301,7 +301,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet4 + description P2P_DC1-POD1-SPINE2_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -330,13 +330,13 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet7 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet6 + description P2P_DC2-POD1-LEAF1A_Ethernet6 no shutdown no switchport ip address 100.100.100.101/24 ! interface Ethernet11 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet7 + description P2P_DC1-POD1-SPINE1_Ethernet7 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -345,7 +345,7 @@ interface Ethernet11 service-profile QOS-PROFILE ! interface Ethernet12 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet7 + description P2P_DC1-POD1-SPINE2_Ethernet7 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -542,7 +542,7 @@ interface Loopback102 | Vlan1101 | test_svi | vrf_with_loopbacks_from_pod_pools | - | False | | Vlan1102 | test_svi | vrf_with_loopbacks_dc1_pod1_only | - | False | | Vlan4085 | L2LEAF_INBAND_MGMT | default | - | False | -| Vlan4094 | MLAG_PEER | default | - | False | +| Vlan4094 | MLAG | default | - | False | ##### IPv4 @@ -616,7 +616,7 @@ interface Vlan4085 ip virtual-router address 172.21.110.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.2/31 @@ -900,19 +900,19 @@ router bgp 65112.100 neighbor 100.100.100.201 description DC2-POD1-LEAF1A neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.1 route-map RM-EVPN-FILTER-AS65101 out neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.1 route-map RM-EVPN-FILTER-AS65110.100 out neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.110.3 route-map RM-EVPN-FILTER-AS65111.100 out neighbor 172.16.120.3 peer group EVPN-OVERLAY-CORE neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.110.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.110.8 remote-as 65110.100 neighbor 172.17.110.8 description DC1-POD1-SPINE1_Ethernet4 @@ -926,7 +926,7 @@ router bgp 65112.100 neighbor 172.17.110.14 remote-as 65110.100 neighbor 172.17.110.14 description DC1-POD1-SPINE2_Ethernet7 neighbor 172.20.110.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 172.20.110.3 description DC1-POD1-LEAF2B + neighbor 172.20.110.3 description DC1-POD1-LEAF2B_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md index b7aac77d3a6..7f0c5d94af3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md @@ -221,17 +221,17 @@ vlan 4092 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet3 | - | 172.17.210.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet3 | - | 172.17.210.3/31 | default | - | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet7 | - | 100.100.100.201/24 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet7 | - | 11.1.0.39/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-POD1-SPINE1_Ethernet3 | - | 172.17.210.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-POD1-SPINE2_Ethernet3 | - | 172.17.210.3/31 | default | - | False | - | - | +| Ethernet6 | P2P_DC1.POD1.LEAF2A_Ethernet7 | - | 100.100.100.201/24 | default | - | False | - | - | +| Ethernet7 | P2P_DC1-POD1-LEAF2B_Ethernet7 | - | 11.1.0.39/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet3 + description P2P_DC2-POD1-SPINE1_Ethernet3 no shutdown no switchport ip address 172.17.210.1/31 @@ -239,7 +239,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet3 + description P2P_DC2-POD1-SPINE2_Ethernet3 no shutdown no switchport ip address 172.17.210.3/31 @@ -252,13 +252,13 @@ interface Ethernet3 channel-group 3 mode active ! interface Ethernet6 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet7 + description P2P_DC1.POD1.LEAF2A_Ethernet7 no shutdown no switchport ip address 100.100.100.201/24 ! interface Ethernet7 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet7 + description P2P_DC1-POD1-LEAF2B_Ethernet7 no shutdown no switchport ip address 11.1.0.39/31 @@ -571,19 +571,19 @@ router bgp 65211 neighbor 100.100.100.101 description DC1.POD1.LEAF2A neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.210.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.4 remote-as 65212 - neighbor 172.16.210.4 description DC2-POD1-LEAF2A + neighbor 172.16.210.4 description DC2-POD1-LEAF2A_Loopback0 neighbor 172.17.210.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.0 remote-as 65210 neighbor 172.17.210.0 description DC2-POD1-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md index fe9adce685f..60fd1a5579b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md @@ -204,15 +204,15 @@ vlan 4092 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 | - | 172.17.210.5/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 | - | 172.17.210.7/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-POD1-SPINE1_Ethernet4 | - | 172.17.210.5/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-POD1-SPINE2_Ethernet4 | - | 172.17.210.7/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + description P2P_DC2-POD1-SPINE1_Ethernet4 no shutdown no switchport ip address 172.17.210.5/31 @@ -220,7 +220,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + description P2P_DC2-POD1-SPINE2_Ethernet4 no shutdown no switchport ip address 172.17.210.7/31 @@ -474,7 +474,7 @@ router bgp 65212 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.17.210.4 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.4 remote-as 65210 neighbor 172.17.210.4 description DC2-POD1-SPINE1_Ethernet4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md index ad4cad34977..007e4bb2e36 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md @@ -173,18 +173,18 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet1 | - | 172.16.21.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet1 | - | 172.16.21.65/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet1 | - | 172.17.210.0/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 | - | 172.17.210.4/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 | - | 11.1.1.19/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-SUPER-SPINE1_Ethernet1 | - | 172.16.21.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-SUPER-SPINE2_Ethernet1 | - | 172.16.21.65/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC2-POD1-LEAF1A_Ethernet1 | - | 172.17.210.0/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC2-POD1-LEAF2A_Ethernet1 | - | 172.17.210.4/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-POD2-SPINE1_Ethernet5 | - | 11.1.1.19/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet1 + description P2P_DC2-SUPER-SPINE1_Ethernet1 no shutdown no switchport ip address 172.16.21.1/31 @@ -192,7 +192,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet1 + description P2P_DC2-SUPER-SPINE2_Ethernet1 no shutdown no switchport ip address 172.16.21.65/31 @@ -200,7 +200,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet1 + description P2P_DC2-POD1-LEAF1A_Ethernet1 no shutdown no switchport ip address 172.17.210.0/31 @@ -208,7 +208,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + description P2P_DC2-POD1-LEAF2A_Ethernet1 no shutdown no switchport ip address 172.17.210.4/31 @@ -216,7 +216,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 + description P2P_DC1-POD2-SPINE1_Ethernet5 no shutdown no switchport ip address 11.1.1.19/31 @@ -386,10 +386,10 @@ router bgp 65210 neighbor 11.1.1.18 description DC1-POD2-SPINE1 neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.21.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.16.21.0 remote-as 65200 neighbor 172.16.21.0 description DC2-SUPER-SPINE1_Ethernet1 @@ -398,10 +398,10 @@ router bgp 65210 neighbor 172.16.21.64 description DC2-SUPER-SPINE2_Ethernet1 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.210.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.1 remote-as 65211 neighbor 172.17.210.1 description DC2-POD1-LEAF1A_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md index 25aab895702..159355f6dfb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md @@ -171,18 +171,18 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet2 | - | 172.16.21.3/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet2 | - | 172.16.21.67/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet2 | - | 172.17.210.2/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 | - | 172.17.210.6/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 | - | 200.200.200.201/24 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-SUPER-SPINE1_Ethernet2 | - | 172.16.21.3/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-SUPER-SPINE2_Ethernet2 | - | 172.16.21.67/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC2-POD1-LEAF1A_Ethernet2 | - | 172.17.210.2/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC2-POD1-LEAF2A_Ethernet2 | - | 172.17.210.6/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC1-POD2-SPINE2_Ethernet4 | - | 200.200.200.201/24 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet2 + description P2P_DC2-SUPER-SPINE1_Ethernet2 no shutdown no switchport ip address 172.16.21.3/31 @@ -190,7 +190,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet2 + description P2P_DC2-SUPER-SPINE2_Ethernet2 no shutdown no switchport ip address 172.16.21.67/31 @@ -198,7 +198,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet2 + description P2P_DC2-POD1-LEAF1A_Ethernet2 no shutdown no switchport ip address 172.17.210.2/31 @@ -206,7 +206,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + description P2P_DC2-POD1-LEAF2A_Ethernet2 no shutdown no switchport ip address 172.17.210.6/31 @@ -214,7 +214,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 + description P2P_DC1-POD2-SPINE2_Ethernet4 no shutdown no switchport ip address 200.200.200.201/24 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md index d37c6c4a99e..5f17ec28c60 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md @@ -173,22 +173,22 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet3 | - | 172.17.20.1/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet6 | - | 172.17.20.3/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-SUPER-SPINE1_Ethernet3 | - | 172.17.20.1/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-SUPER-SPINE1_Ethernet6 | - | 172.17.20.3/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet3 + description P2P_DC2-SUPER-SPINE1_Ethernet3 no shutdown no switchport ip address 172.17.20.1/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet6 + description P2P_DC2-SUPER-SPINE1_Ethernet6 no shutdown no switchport ip address 172.17.20.3/31 @@ -353,16 +353,16 @@ router bgp 65201 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.20.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.20.0 remote-as 65200 neighbor 172.17.20.0 description DC2-SUPER-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS2.md index 2eb84dafb63..d2937d86fde 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS2.md @@ -171,22 +171,22 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet5 | - | 172.17.20.9/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet7 | - | 172.17.20.11/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-SUPER-SPINE1_Ethernet5 | - | 172.17.20.9/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-SUPER-SPINE1_Ethernet7 | - | 172.17.20.11/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet5 + description P2P_DC2-SUPER-SPINE1_Ethernet5 no shutdown no switchport ip address 172.17.20.9/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet7 + description P2P_DC2-SUPER-SPINE1_Ethernet7 no shutdown no switchport ip address 172.17.20.11/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md index 4627bc1ebb1..663632c6cca 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md @@ -173,20 +173,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet1 | - | 172.16.21.0/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet1 | - | 172.16.21.2/31 | default | - | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC2-RS1_Ethernet1 | - | 172.17.20.0/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet6 | - | 11.1.2.1/31 | default | - | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC2-RS2_Ethernet1 | - | 172.17.20.8/31 | default | - | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC2-RS1_Ethernet2 | - | 172.17.20.2/31 | default | - | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC2-RS2_Ethernet2 | - | 172.17.20.10/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-POD1-SPINE1_Ethernet1 | - | 172.16.21.0/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-POD1-SPINE2_Ethernet1 | - | 172.16.21.2/31 | default | - | False | - | - | +| Ethernet3 | P2P_DC2-RS1_Ethernet1 | - | 172.17.20.0/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-SUPER-SPINE1_Ethernet6 | - | 11.1.2.1/31 | default | - | False | - | - | +| Ethernet5 | P2P_DC2-RS2_Ethernet1 | - | 172.17.20.8/31 | default | - | False | - | - | +| Ethernet6 | P2P_DC2-RS1_Ethernet2 | - | 172.17.20.2/31 | default | - | False | - | - | +| Ethernet7 | P2P_DC2-RS2_Ethernet2 | - | 172.17.20.10/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet1 + description P2P_DC2-POD1-SPINE1_Ethernet1 no shutdown no switchport ip address 172.16.21.0/31 @@ -194,7 +194,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet1 + description P2P_DC2-POD1-SPINE2_Ethernet1 no shutdown no switchport ip address 172.16.21.2/31 @@ -202,14 +202,14 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-RS1_Ethernet1 + description P2P_DC2-RS1_Ethernet1 no shutdown no switchport ip address 172.17.20.0/31 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet6 + description P2P_DC1-SUPER-SPINE1_Ethernet6 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -217,21 +217,21 @@ interface Ethernet4 ptp enable ! interface Ethernet5 - description P2P_LINK_TO_DC2-RS2_Ethernet1 + description P2P_DC2-RS2_Ethernet1 no shutdown no switchport ip address 172.17.20.8/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-RS1_Ethernet2 + description P2P_DC2-RS1_Ethernet2 no shutdown no switchport ip address 172.17.20.2/31 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC2-RS2_Ethernet2 + description P2P_DC2-RS2_Ethernet2 no shutdown no switchport ip address 172.17.20.10/31 @@ -405,10 +405,10 @@ router bgp 65200 no neighbor 11.1.2.0 bfd neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.21.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.16.21.1 remote-as 65210 neighbor 172.16.21.1 description DC2-POD1-SPINE1_Ethernet1 @@ -417,10 +417,10 @@ router bgp 65200 neighbor 172.16.21.3 description DC2-POD1-SPINE2_Ethernet1 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.20.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.20.1 remote-as 65201 neighbor 172.17.20.1 description DC2-RS1_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE2.md index a797db57b5f..a7974965dde 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE2.md @@ -171,16 +171,16 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet2 | - | 172.16.21.64/31 | default | - | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet2 | - | 172.16.21.66/31 | default | - | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet6 | - | 11.1.2.3/31 | default | - | False | - | - | +| Ethernet1 | P2P_DC2-POD1-SPINE1_Ethernet2 | - | 172.16.21.64/31 | default | - | False | - | - | +| Ethernet2 | P2P_DC2-POD1-SPINE2_Ethernet2 | - | 172.16.21.66/31 | default | - | False | - | - | +| Ethernet4 | P2P_DC1-SUPER-SPINE2_Ethernet6 | - | 11.1.2.3/31 | default | - | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet2 + description P2P_DC2-POD1-SPINE1_Ethernet2 no shutdown no switchport ip address 172.16.21.64/31 @@ -188,7 +188,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet2 + description P2P_DC2-POD1-SPINE2_Ethernet2 no shutdown no switchport ip address 172.16.21.66/31 @@ -196,7 +196,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet6 + description P2P_DC1-SUPER-SPINE2_Ethernet6 no shutdown no switchport ip address 11.1.2.3/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg index aa714847c2d..3fb734f08ce 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg @@ -59,7 +59,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -107,7 +107,7 @@ interface Vlan4085 ip address 172.21.110.5/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg index 34e6bb08273..740b2e0250e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg @@ -59,7 +59,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -113,7 +113,7 @@ interface Vlan4085 ip address 172.21.110.6/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.3/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF1A.cfg index ffef27c13a9..44241560889 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF1A.cfg @@ -37,7 +37,7 @@ interface Port-Channel3 service-profile QOS-PROFILE ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet3 + description P2P_DC1-POD1-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -46,7 +46,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet3 + description P2P_DC1-POD1-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -60,7 +60,7 @@ interface Ethernet3 channel-group 3 mode active ! interface Ethernet4 - description P2P_LINK_TO_DC1-RS1_Ethernet3 + description P2P_DC1-RS1_Ethernet3 no shutdown no switchport ip address 172.17.10.4/31 @@ -138,25 +138,25 @@ router bgp 65111.100 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.5 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.5 remote-as 65101 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg index bcb558685a7..6ebaa4a32cc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg @@ -60,7 +60,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance Common_VRF @@ -135,7 +135,7 @@ interface Port-Channel19 ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet5 + description P2P_DC1-POD1-SPINE1_Ethernet5 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -144,7 +144,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet5 + description P2P_DC1-POD1-SPINE2_Ethernet5 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -173,14 +173,14 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet7 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet7 + description P2P_DC2-POD1-LEAF1A_Ethernet7 no shutdown no switchport ip address 11.1.0.38/31 ptp enable ! interface Ethernet11 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet8 + description P2P_DC1-POD1-SPINE1_Ethernet8 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -189,7 +189,7 @@ interface Ethernet11 service-profile QOS-PROFILE ! interface Ethernet12 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet8 + description P2P_DC1-POD1-SPINE2_Ethernet8 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -321,7 +321,7 @@ interface Vlan4085 ip virtual-router address 172.21.110.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.3/31 @@ -427,15 +427,15 @@ router bgp 65112.100 neighbor 11.1.0.39 bfd neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.1 route-map RM-EVPN-FILTER-AS65101 out neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.1 route-map RM-EVPN-FILTER-AS65110.100 out neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.110.3 route-map RM-EVPN-FILTER-AS65111.100 out neighbor 172.17.110.16 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.110.16 remote-as 65110.100 @@ -450,7 +450,7 @@ router bgp 65112.100 neighbor 172.17.110.22 remote-as 65110.100 neighbor 172.17.110.22 description DC1-POD1-SPINE2_Ethernet8 neighbor 172.20.110.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 172.20.110.2 description DC1.POD1.LEAF2A + neighbor 172.20.110.2 description DC1.POD1.LEAF2A_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE1.cfg index 20a4485fb10..ff6c53b0362 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE1.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet1 + description P2P_DC1-SUPER-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet1 + description P2P_DC1-SUPER-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet1 + description P2P_DC1-POD1-LEAF1A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,7 +53,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet1 + description P2P_DC1.POD1.LEAF2A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -62,7 +62,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet1 + description P2P_DC1-POD1-LEAF2B_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -71,14 +71,14 @@ interface Ethernet5 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC1-RS1_Ethernet2 + description P2P_DC1-RS1_Ethernet2 no shutdown no switchport ip address 172.17.10.2/31 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet11 + description P2P_DC1.POD1.LEAF2A_Ethernet11 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -87,7 +87,7 @@ interface Ethernet7 service-profile QOS-PROFILE ! interface Ethernet8 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet11 + description P2P_DC1-POD1-LEAF2B_Ethernet11 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -154,25 +154,25 @@ router bgp 65110.100 neighbor 172.16.11.64 description DC1-SUPER-SPINE2_Ethernet1 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.3 remote-as 65101 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE2.cfg index ac7eb281d00..a8282fdd517 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-SPINE2.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet2 + description P2P_DC1-SUPER-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet2 + description P2P_DC1-SUPER-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet2 + description P2P_DC1-POD1-LEAF1A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,7 +53,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet2 + description P2P_DC1.POD1.LEAF2A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -62,7 +62,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet2 + description P2P_DC1-POD1-LEAF2B_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -71,7 +71,7 @@ interface Ethernet5 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet12 + description P2P_DC1.POD1.LEAF2A_Ethernet12 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -80,7 +80,7 @@ interface Ethernet7 service-profile QOS-PROFILE ! interface Ethernet8 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet12 + description P2P_DC1-POD1-LEAF2B_Ethernet12 no shutdown mac security profile MACSEC_PROFILE no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-LEAF1A.cfg index c73985fbf7e..baaaa62b9a3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-LEAF1A.cfg @@ -65,7 +65,7 @@ vrf instance vrf_with_loopbacks_from_overlapping_pool vrf instance vrf_with_loopbacks_from_pod_pools ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet3 + description P2P_DC1-POD2-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -74,7 +74,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet3 + description P2P_DC1-POD2-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -83,7 +83,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-RS2_Ethernet3 + description P2P_DC1-RS2_Ethernet3 no shutdown no switchport ip address 172.17.10.12/31 @@ -225,11 +225,11 @@ router bgp 65121 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.120.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.1 remote-as 65120 - neighbor 172.16.120.1 description DC1-POD2-SPINE1 + neighbor 172.16.120.1 description DC1-POD2-SPINE1_Loopback0 neighbor 172.16.120.1 route-map RM-EVPN-FILTER-AS65120 out neighbor 172.16.120.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.2 remote-as 65120 - neighbor 172.16.120.2 description DC1-POD2-SPINE2 + neighbor 172.16.120.2 description DC1-POD2-SPINE2_Loopback0 neighbor 172.16.120.2 route-map RM-EVPN-FILTER-AS65120 out neighbor 172.17.10.13 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.13 remote-as 65102 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE1.cfg index 3c3ed16b284..b74a58d402a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE1.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet3 + description P2P_DC1-SUPER-SPINE1_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet3 + description P2P_DC1-SUPER-SPINE2_Ethernet3 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet1 + description P2P_DC1-POD2-LEAF1A_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,14 +53,14 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-RS2_Ethernet2 + description P2P_DC1-RS2_Ethernet2 no shutdown no switchport ip address 172.17.10.10/31 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet5 + description P2P_DC2-POD1-SPINE1_Ethernet5 no shutdown no switchport ip address 11.1.1.18/31 @@ -119,7 +119,7 @@ router bgp 65120 neighbor 172.16.12.64 description DC1-SUPER-SPINE2_Ethernet3 neighbor 172.16.120.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.10.11 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.11 remote-as 65102 neighbor 172.17.10.11 description DC1-RS2_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg index 6ef0d4e13c9..7a88c958ff8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet4 + description P2P_DC1-SUPER-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet4 + description P2P_DC1-SUPER-SPINE2_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet2 + description P2P_DC1-POD2-LEAF1A_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,7 +53,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet5 + description P2P_DC2-POD1-SPINE2_Ethernet5 no shutdown no switchport ip address 200.200.200.101/24 @@ -110,7 +110,7 @@ router bgp 65120 neighbor 172.16.12.66 description DC1-SUPER-SPINE2_Ethernet4 neighbor 172.16.120.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.120.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.120.3 remote-as 65121 neighbor 172.17.120.3 description DC1-POD2-LEAF1A_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS1.cfg index eced139b8a6..8b5b4d314b3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS1.cfg @@ -26,21 +26,21 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet5 + description P2P_DC1-SUPER-SPINE1_Ethernet5 no shutdown no switchport ip address 172.17.10.1/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet6 + description P2P_DC1-POD1-SPINE1_Ethernet6 no shutdown no switchport ip address 172.17.10.3/31 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet4 + description P2P_DC1-POD1-LEAF1A_Ethernet4 no shutdown no switchport ip address 172.17.10.5/31 @@ -105,25 +105,25 @@ router bgp 65101 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.110.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.4 remote-as 65112.100 - neighbor 172.16.110.4 description DC1.POD1.LEAF2A + neighbor 172.16.110.4 description DC1.POD1.LEAF2A_Loopback0 neighbor 172.16.110.5 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.5 remote-as 65112.100 - neighbor 172.16.110.5 description DC1-POD1-LEAF2B + neighbor 172.16.110.5 description DC1-POD1-LEAF2B_Loopback0 neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.0 remote-as 65100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS2.cfg index 7335e1f6506..85ffae6bec1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-RS2.cfg @@ -26,21 +26,21 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet5 + description P2P_DC1-SUPER-SPINE2_Ethernet5 no shutdown no switchport ip address 172.17.10.9/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet4 + description P2P_DC1-POD2-SPINE1_Ethernet4 no shutdown no switchport ip address 172.17.10.11/31 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet3 + description P2P_DC1-POD2-LEAF1A_Ethernet3 no shutdown no switchport ip address 172.17.10.13/31 @@ -111,19 +111,19 @@ router bgp 65102 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.20.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.20.1 remote-as 65201 - neighbor 172.16.20.1 description DC2-RS1 + neighbor 172.16.20.1 description DC2-RS1_Loopback0 neighbor 172.16.20.1 route-map RM-EVPN-FILTER-AS65201 out neighbor 172.16.200.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.200.1 remote-as 65200 - neighbor 172.16.200.1 description DC2-SUPER-SPINE1 + neighbor 172.16.200.1 description DC2-SUPER-SPINE1_Loopback0 neighbor 172.16.200.1 route-map RM-EVPN-FILTER-AS65200 out neighbor 172.16.210.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.1 remote-as 65210 - neighbor 172.16.210.1 description DC2-POD1-SPINE1 + neighbor 172.16.210.1 description DC2-POD1-SPINE1_Loopback0 neighbor 172.16.210.1 route-map RM-EVPN-FILTER-AS65210 out neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.16.210.3 route-map RM-EVPN-FILTER-AS65211 out neighbor 172.17.10.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.10.8 remote-as 65100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg index d171926cac6..c69a3793024 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet1 + description P2P_DC1-POD1-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet1 + description P2P_DC1-POD1-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet1 + description P2P_DC1-POD2-SPINE1_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,7 +53,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet1 + description P2P_DC1-POD2-SPINE2_Ethernet1 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -62,14 +62,14 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-RS1_Ethernet1 + description P2P_DC1-RS1_Ethernet1 no shutdown no switchport ip address 172.17.10.0/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet4 + description P2P_DC2-SUPER-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE2.cfg index 709e678d336..0869f3b0293 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE2.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet2 + description P2P_DC1-POD1-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -35,7 +35,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet2 + description P2P_DC1-POD1-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -44,7 +44,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet2 + description P2P_DC1-POD2-SPINE1_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -53,7 +53,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet2 + description P2P_DC1-POD2-SPINE2_Ethernet2 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -62,14 +62,14 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-RS2_Ethernet1 + description P2P_DC1-RS2_Ethernet1 no shutdown no switchport ip address 172.17.10.8/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet4 + description P2P_DC2-SUPER-SPINE2_Ethernet4 no shutdown no switchport ip address 11.1.2.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1.POD1.LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1.POD1.LEAF2A.cfg index 2dfc9ec2a14..d1ca2c642a1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1.POD1.LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1.POD1.LEAF2A.cfg @@ -61,7 +61,7 @@ vlan 4085 name L2LEAF_INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance Common_VRF @@ -136,7 +136,7 @@ interface Port-Channel19 ! interface Ethernet1 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet4 + description P2P_DC1-POD1-SPINE1_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -145,7 +145,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet4 + description P2P_DC1-POD1-SPINE2_Ethernet4 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -174,13 +174,13 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet7 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet6 + description P2P_DC2-POD1-LEAF1A_Ethernet6 no shutdown no switchport ip address 100.100.100.101/24 ! interface Ethernet11 - description P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet7 + description P2P_DC1-POD1-SPINE1_Ethernet7 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -189,7 +189,7 @@ interface Ethernet11 service-profile QOS-PROFILE ! interface Ethernet12 - description P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet7 + description P2P_DC1-POD1-SPINE2_Ethernet7 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -315,7 +315,7 @@ interface Vlan4085 ip virtual-router address 172.21.110.1 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 172.20.110.2/31 @@ -418,19 +418,19 @@ router bgp 65112.100 neighbor 100.100.100.201 description DC2-POD1-LEAF1A neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.1 route-map RM-EVPN-FILTER-AS65101 out neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.1 route-map RM-EVPN-FILTER-AS65110.100 out neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.110.3 route-map RM-EVPN-FILTER-AS65111.100 out neighbor 172.16.120.3 peer group EVPN-OVERLAY-CORE neighbor 172.16.120.3 remote-as 65121 - neighbor 172.16.120.3 description DC1-POD2-LEAF1A + neighbor 172.16.120.3 description DC1-POD2-LEAF1A_Loopback0 neighbor 172.17.110.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.110.8 remote-as 65110.100 neighbor 172.17.110.8 description DC1-POD1-SPINE1_Ethernet4 @@ -444,7 +444,7 @@ router bgp 65112.100 neighbor 172.17.110.14 remote-as 65110.100 neighbor 172.17.110.14 description DC1-POD1-SPINE2_Ethernet7 neighbor 172.20.110.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 172.20.110.3 description DC1-POD1-LEAF2B + neighbor 172.20.110.3 description DC1-POD1-LEAF2B_Vlan4094 redistribute attached-host redistribute connected ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg index 7b2cf1bcc02..a068a69d6b2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg @@ -47,7 +47,7 @@ interface Port-Channel3 service-profile QOS-PROFILE ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet3 + description P2P_DC2-POD1-SPINE1_Ethernet3 no shutdown no switchport ip address 172.17.210.1/31 @@ -55,7 +55,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet3 + description P2P_DC2-POD1-SPINE2_Ethernet3 no shutdown no switchport ip address 172.17.210.3/31 @@ -68,13 +68,13 @@ interface Ethernet3 channel-group 3 mode active ! interface Ethernet6 - description P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet7 + description P2P_DC1.POD1.LEAF2A_Ethernet7 no shutdown no switchport ip address 100.100.100.201/24 ! interface Ethernet7 - description P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet7 + description P2P_DC1-POD1-LEAF2B_Ethernet7 no shutdown no switchport ip address 11.1.0.39/31 @@ -179,19 +179,19 @@ router bgp 65211 neighbor 100.100.100.101 description DC1.POD1.LEAF2A neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.16.210.4 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.4 remote-as 65212 - neighbor 172.16.210.4 description DC2-POD1-LEAF2A + neighbor 172.16.210.4 description DC2-POD1-LEAF2A_Loopback0 neighbor 172.17.210.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.0 remote-as 65210 neighbor 172.17.210.0 description DC2-POD1-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg index e87230bc7ad..524d23afece 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg @@ -38,7 +38,7 @@ interface Port-Channel3 service-profile QOS-PROFILE ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + description P2P_DC2-POD1-SPINE1_Ethernet4 no shutdown no switchport ip address 172.17.210.5/31 @@ -46,7 +46,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + description P2P_DC2-POD1-SPINE2_Ethernet4 no shutdown no switchport ip address 172.17.210.7/31 @@ -126,7 +126,7 @@ router bgp 65212 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.210.3 remote-as 65211 - neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.16.210.3 description DC2-POD1-LEAF1A_Loopback0 neighbor 172.17.210.4 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.4 remote-as 65210 neighbor 172.17.210.4 description DC2-POD1-SPINE1_Ethernet4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg index b02b20c95a1..95e6a660a0e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet1 + description P2P_DC2-SUPER-SPINE1_Ethernet1 no shutdown no switchport ip address 172.16.21.1/31 @@ -34,7 +34,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet1 + description P2P_DC2-SUPER-SPINE2_Ethernet1 no shutdown no switchport ip address 172.16.21.65/31 @@ -42,7 +42,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet1 + description P2P_DC2-POD1-LEAF1A_Ethernet1 no shutdown no switchport ip address 172.17.210.0/31 @@ -50,7 +50,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + description P2P_DC2-POD1-LEAF2A_Ethernet1 no shutdown no switchport ip address 172.17.210.4/31 @@ -58,7 +58,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 + description P2P_DC1-POD2-SPINE1_Ethernet5 no shutdown no switchport ip address 11.1.1.19/31 @@ -109,10 +109,10 @@ router bgp 65210 neighbor 11.1.1.18 description DC1-POD2-SPINE1 neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.21.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.16.21.0 remote-as 65200 neighbor 172.16.21.0 description DC2-SUPER-SPINE1_Ethernet1 @@ -121,10 +121,10 @@ router bgp 65210 neighbor 172.16.21.64 description DC2-SUPER-SPINE2_Ethernet1 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.210.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.1 remote-as 65211 neighbor 172.17.210.1 description DC2-POD1-LEAF1A_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg index 108b51800b6..347a00124a8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet2 + description P2P_DC2-SUPER-SPINE1_Ethernet2 no shutdown no switchport ip address 172.16.21.3/31 @@ -34,7 +34,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet2 + description P2P_DC2-SUPER-SPINE2_Ethernet2 no shutdown no switchport ip address 172.16.21.67/31 @@ -42,7 +42,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet2 + description P2P_DC2-POD1-LEAF1A_Ethernet2 no shutdown no switchport ip address 172.17.210.2/31 @@ -50,7 +50,7 @@ interface Ethernet3 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + description P2P_DC2-POD1-LEAF2A_Ethernet2 no shutdown no switchport ip address 172.17.210.6/31 @@ -58,7 +58,7 @@ interface Ethernet4 service-profile QOS-PROFILE ! interface Ethernet5 - description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 + description P2P_DC1-POD2-SPINE2_Ethernet4 no shutdown no switchport ip address 200.200.200.201/24 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS1.cfg index 1b2442140ad..eab65032199 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS1.cfg @@ -26,14 +26,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet3 + description P2P_DC2-SUPER-SPINE1_Ethernet3 no shutdown no switchport ip address 172.17.20.1/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet6 + description P2P_DC2-SUPER-SPINE1_Ethernet6 no shutdown no switchport ip address 172.17.20.3/31 @@ -82,16 +82,16 @@ router bgp 65201 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.20.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.20.0 remote-as 65200 neighbor 172.17.20.0 description DC2-SUPER-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS2.cfg index 6e9a95a9830..b2752e84b9d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-RS2.cfg @@ -26,14 +26,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet5 + description P2P_DC2-SUPER-SPINE1_Ethernet5 no shutdown no switchport ip address 172.17.20.9/31 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet7 + description P2P_DC2-SUPER-SPINE1_Ethernet7 no shutdown no switchport ip address 172.17.20.11/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg index 13aeb3ddda9..b94774a8e29 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet1 + description P2P_DC2-POD1-SPINE1_Ethernet1 no shutdown no switchport ip address 172.16.21.0/31 @@ -34,7 +34,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet1 + description P2P_DC2-POD1-SPINE2_Ethernet1 no shutdown no switchport ip address 172.16.21.2/31 @@ -42,14 +42,14 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet3 - description P2P_LINK_TO_DC2-RS1_Ethernet1 + description P2P_DC2-RS1_Ethernet1 no shutdown no switchport ip address 172.17.20.0/31 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet6 + description P2P_DC1-SUPER-SPINE1_Ethernet6 no shutdown mac security profile MACSEC_PROFILE no switchport @@ -57,21 +57,21 @@ interface Ethernet4 ptp enable ! interface Ethernet5 - description P2P_LINK_TO_DC2-RS2_Ethernet1 + description P2P_DC2-RS2_Ethernet1 no shutdown no switchport ip address 172.17.20.8/31 service-profile QOS-PROFILE ! interface Ethernet6 - description P2P_LINK_TO_DC2-RS1_Ethernet2 + description P2P_DC2-RS1_Ethernet2 no shutdown no switchport ip address 172.17.20.2/31 service-profile QOS-PROFILE ! interface Ethernet7 - description P2P_LINK_TO_DC2-RS2_Ethernet2 + description P2P_DC2-RS2_Ethernet2 no shutdown no switchport ip address 172.17.20.10/31 @@ -124,10 +124,10 @@ router bgp 65200 no neighbor 11.1.2.0 bfd neighbor 172.16.10.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.1 remote-as 65101 - neighbor 172.16.10.1 description DC1-RS1 + neighbor 172.16.10.1 description DC1-RS1_Loopback0 neighbor 172.16.10.2 peer group EVPN-OVERLAY-PEERS neighbor 172.16.10.2 remote-as 65102 - neighbor 172.16.10.2 description DC1-RS2 + neighbor 172.16.10.2 description DC1-RS2_Loopback0 neighbor 172.16.21.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.16.21.1 remote-as 65210 neighbor 172.16.21.1 description DC2-POD1-SPINE1_Ethernet1 @@ -136,10 +136,10 @@ router bgp 65200 neighbor 172.16.21.3 description DC2-POD1-SPINE2_Ethernet1 neighbor 172.16.110.1 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.1 remote-as 65110.100 - neighbor 172.16.110.1 description DC1-POD1-SPINE1 + neighbor 172.16.110.1 description DC1-POD1-SPINE1_Loopback0 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 - neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.110.3 description DC1-POD1-LEAF1A_Loopback0 neighbor 172.17.20.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.20.1 remote-as 65201 neighbor 172.17.20.1 description DC2-RS1_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE2.cfg index 8003656f166..1764e579dc0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE2.cfg @@ -26,7 +26,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet2 + description P2P_DC2-POD1-SPINE1_Ethernet2 no shutdown no switchport ip address 172.16.21.64/31 @@ -34,7 +34,7 @@ interface Ethernet1 service-profile QOS-PROFILE ! interface Ethernet2 - description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet2 + description P2P_DC2-POD1-SPINE2_Ethernet2 no shutdown no switchport ip address 172.16.21.66/31 @@ -42,7 +42,7 @@ interface Ethernet2 service-profile QOS-PROFILE ! interface Ethernet4 - description P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet6 + description P2P_DC1-SUPER-SPINE2_Ethernet6 no shutdown no switchport ip address 11.1.2.3/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2A.yml index 96760f9df7b..9deb0448203 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2A.yml @@ -44,7 +44,7 @@ snmp_server: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -82,7 +82,7 @@ vlans: name: L2LEAF_INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 172.20.110.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2B.yml index 2df3dbb9edc..ad0c41acd4c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-L2LEAF2B.yml @@ -52,7 +52,7 @@ snmp_server: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -90,7 +90,7 @@ vlans: name: L2LEAF_INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 172.20.110.3/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF1A.yml index ccaf06f8c06..bee6818c8e7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF1A.yml @@ -57,36 +57,36 @@ router_bgp: - ip_address: 172.16.210.3 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF1A - description: DC2-POD1-LEAF1A + description: DC2-POD1-LEAF1A_Loopback0 remote_as: '65211' route_map_out: RM-EVPN-FILTER-AS65211 - ip_address: 172.16.210.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-SPINE1 - description: DC2-POD1-SPINE1 + description: DC2-POD1-SPINE1_Loopback0 remote_as: '65210' route_map_out: RM-EVPN-FILTER-AS65210 - ip_address: 172.16.20.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-RS1 - description: DC2-RS1 + description: DC2-RS1_Loopback0 remote_as: '65201' route_map_out: RM-EVPN-FILTER-AS65201 - ip_address: 172.16.200.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-SUPER-SPINE1 - description: DC2-SUPER-SPINE1 + description: DC2-SUPER-SPINE1_Loopback0 remote_as: '65200' route_map_out: RM-EVPN-FILTER-AS65200 - ip_address: 172.16.110.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF2B - description: DC1-POD1-LEAF2B + description: DC1-POD1-LEAF2B_Loopback0 remote_as: '65112.100' - ip_address: 172.16.110.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1.POD1.LEAF2A - description: DC1.POD1.LEAF2A + description: DC1.POD1.LEAF2A_Loopback0 remote_as: '65112.100' address_family_evpn: peer_groups: @@ -141,7 +141,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet3 + description: P2P_DC1-POD1-SPINE1_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet3 + description: P2P_DC1-POD1-SPINE2_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -178,7 +178,7 @@ ethernet_interfaces: peer: DC1-RS1 peer_interface: Ethernet3 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS1_Ethernet3 + description: P2P_DC1-RS1_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml index d2571ea6016..dd947bbdd63 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml @@ -57,7 +57,7 @@ router_bgp: - ip_address: 172.20.110.2 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1.POD1.LEAF2A - description: DC1.POD1.LEAF2A + description: DC1.POD1.LEAF2A_Vlan4094 - ip_address: 172.17.110.16 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65110.100' @@ -81,19 +81,19 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' route_map_out: RM-EVPN-FILTER-AS65111.100 - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' route_map_out: RM-EVPN-FILTER-AS65110.100 - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' route_map_out: RM-EVPN-FILTER-AS65101 - ip_address: 1.1.1.1 @@ -117,11 +117,11 @@ router_bgp: enable: true inter_domain: false peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true route: import_match_failure_action: discard address_family_rtc: @@ -361,7 +361,7 @@ snmp_server: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -399,7 +399,7 @@ vlans: name: L2LEAF_INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 172.20.110.3/31 @@ -572,7 +572,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet5 + description: P2P_DC1-POD1-SPINE1_Ethernet5 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -586,7 +586,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet5 + description: P2P_DC1-POD1-SPINE2_Ethernet5 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -618,7 +618,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet8 + description: P2P_DC1-POD1-SPINE1_Ethernet8 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -632,7 +632,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet8 + description: P2P_DC1-POD1-SPINE2_Ethernet8 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -646,11 +646,11 @@ ethernet_interfaces: peer: DC2-POD1-LEAF1A peer_interface: Ethernet7 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet7 switchport: enabled: false shutdown: false ip_address: 11.1.0.38/31 + description: P2P_DC2-POD1-LEAF1A_Ethernet7 ptp: enable: true - name: Ethernet16 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE1.yml index d6a6ab9fd47..ee973524f7e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE1.yml @@ -81,36 +81,36 @@ router_bgp: - ip_address: 172.16.210.3 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF1A - description: DC2-POD1-LEAF1A + description: DC2-POD1-LEAF1A_Loopback0 remote_as: '65211' route_map_out: RM-EVPN-FILTER-AS65211 - ip_address: 172.16.210.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-SPINE1 - description: DC2-POD1-SPINE1 + description: DC2-POD1-SPINE1_Loopback0 remote_as: '65210' route_map_out: RM-EVPN-FILTER-AS65210 - ip_address: 172.16.20.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-RS1 - description: DC2-RS1 + description: DC2-RS1_Loopback0 remote_as: '65201' route_map_out: RM-EVPN-FILTER-AS65201 - ip_address: 172.16.200.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-SUPER-SPINE1 - description: DC2-SUPER-SPINE1 + description: DC2-SUPER-SPINE1_Loopback0 remote_as: '65200' route_map_out: RM-EVPN-FILTER-AS65200 - ip_address: 172.16.110.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF2B - description: DC1-POD1-LEAF2B + description: DC1-POD1-LEAF2B_Loopback0 remote_as: '65112.100' - ip_address: 172.16.110.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1.POD1.LEAF2A - description: DC1.POD1.LEAF2A + description: DC1.POD1.LEAF2A_Loopback0 remote_as: '65112.100' address_family_evpn: peer_groups: @@ -162,7 +162,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet1 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet1 + description: P2P_DC1-SUPER-SPINE1_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -176,7 +176,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet1 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet1 + description: P2P_DC1-SUPER-SPINE2_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -190,7 +190,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet1 + description: P2P_DC1-POD1-LEAF1A_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -204,7 +204,7 @@ ethernet_interfaces: peer: DC1.POD1.LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet1 + description: P2P_DC1.POD1.LEAF2A_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -218,7 +218,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet1 + description: P2P_DC1-POD1-LEAF2B_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -232,7 +232,7 @@ ethernet_interfaces: peer: DC1-RS1 peer_interface: Ethernet2 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS1_Ethernet2 + description: P2P_DC1-RS1_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -242,7 +242,7 @@ ethernet_interfaces: peer: DC1.POD1.LEAF2A peer_interface: Ethernet11 peer_type: l3leaf - description: P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet11 + description: P2P_DC1.POD1.LEAF2A_Ethernet11 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -256,7 +256,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF2B peer_interface: Ethernet11 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet11 + description: P2P_DC1-POD1-LEAF2B_Ethernet11 shutdown: false service_profile: QOS-PROFILE mac_security: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE2.yml index 37035b2ea0d..4118b810156 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-SPINE2.yml @@ -110,7 +110,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet2 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet2 + description: P2P_DC1-SUPER-SPINE1_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -124,7 +124,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet2 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet2 + description: P2P_DC1-SUPER-SPINE2_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet2 + description: P2P_DC1-POD1-LEAF1A_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -152,7 +152,7 @@ ethernet_interfaces: peer: DC1.POD1.LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet2 + description: P2P_DC1.POD1.LEAF2A_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -166,7 +166,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet2 + description: P2P_DC1-POD1-LEAF2B_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -180,7 +180,7 @@ ethernet_interfaces: peer: DC1.POD1.LEAF2A peer_interface: Ethernet12 peer_type: l3leaf - description: P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet12 + description: P2P_DC1.POD1.LEAF2A_Ethernet12 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -194,7 +194,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF2B peer_interface: Ethernet12 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet12 + description: P2P_DC1-POD1-LEAF2B_Ethernet12 shutdown: false service_profile: QOS-PROFILE mac_security: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml index 5b5293c5bc2..2c1cc348c37 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml @@ -56,13 +56,13 @@ router_bgp: - ip_address: 172.16.120.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD2-SPINE1 - description: DC1-POD2-SPINE1 + description: DC1-POD2-SPINE1_Loopback0 remote_as: '65120' route_map_out: RM-EVPN-FILTER-AS65120 - ip_address: 172.16.120.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD2-SPINE2 - description: DC1-POD2-SPINE2 + description: DC1-POD2-SPINE2_Loopback0 remote_as: '65120' route_map_out: RM-EVPN-FILTER-AS65120 address_family_evpn: @@ -273,7 +273,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet3 + description: P2P_DC1-POD2-SPINE1_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -287,7 +287,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet3 + description: P2P_DC1-POD2-SPINE2_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -301,7 +301,7 @@ ethernet_interfaces: peer: DC1-RS2 peer_interface: Ethernet3 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS2_Ethernet3 + description: P2P_DC1-RS2_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE1.yml index 8e822bde8ad..53d5c3426af 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE1.yml @@ -62,7 +62,7 @@ router_bgp: - ip_address: 172.16.120.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD2-LEAF1A - description: DC1-POD2-LEAF1A + description: DC1-POD2-LEAF1A_Loopback0 remote_as: '65121' - ip_address: 11.1.1.19 remote_as: '65210' @@ -127,7 +127,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet3 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet3 + description: P2P_DC1-SUPER-SPINE1_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -141,7 +141,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet3 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet3 + description: P2P_DC1-SUPER-SPINE2_Ethernet3 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-POD2-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet1 + description: P2P_DC1-POD2-LEAF1A_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -169,7 +169,7 @@ ethernet_interfaces: peer: DC1-RS2 peer_interface: Ethernet2 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS2_Ethernet2 + description: P2P_DC1-RS2_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -179,11 +179,11 @@ ethernet_interfaces: peer: DC2-POD1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet5 switchport: enabled: false shutdown: false ip_address: 11.1.1.18/31 + description: P2P_DC2-POD1-SPINE1_Ethernet5 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml index a4085513564..5fec86d1e0a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml @@ -56,7 +56,7 @@ router_bgp: - ip_address: 172.16.120.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD2-LEAF1A - description: DC1-POD2-LEAF1A + description: DC1-POD2-LEAF1A_Loopback0 remote_as: '65121' - ip_address: 200.200.200.201 remote_as: '65210' @@ -123,7 +123,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet4 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet4 + description: P2P_DC1-SUPER-SPINE1_Ethernet4 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -137,7 +137,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet4 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet4 + description: P2P_DC1-SUPER-SPINE2_Ethernet4 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -151,7 +151,7 @@ ethernet_interfaces: peer: DC1-POD2-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet2 + description: P2P_DC1-POD2-LEAF1A_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -165,11 +165,11 @@ ethernet_interfaces: peer: DC2-POD1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet5 switchport: enabled: false shutdown: false ip_address: 200.200.200.101/24 + description: P2P_DC2-POD1-SPINE2_Ethernet5 ptp: enable: true loopback_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS1.yml index b927fed26a2..79c460fe625 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS1.yml @@ -59,36 +59,36 @@ router_bgp: - ip_address: 172.16.210.3 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF1A - description: DC2-POD1-LEAF1A + description: DC2-POD1-LEAF1A_Loopback0 remote_as: '65211' route_map_out: RM-EVPN-FILTER-AS65211 - ip_address: 172.16.210.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-SPINE1 - description: DC2-POD1-SPINE1 + description: DC2-POD1-SPINE1_Loopback0 remote_as: '65210' route_map_out: RM-EVPN-FILTER-AS65210 - ip_address: 172.16.20.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-RS1 - description: DC2-RS1 + description: DC2-RS1_Loopback0 remote_as: '65201' route_map_out: RM-EVPN-FILTER-AS65201 - ip_address: 172.16.200.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-SUPER-SPINE1 - description: DC2-SUPER-SPINE1 + description: DC2-SUPER-SPINE1_Loopback0 remote_as: '65200' route_map_out: RM-EVPN-FILTER-AS65200 - ip_address: 172.16.110.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF2B - description: DC1-POD1-LEAF2B + description: DC1-POD1-LEAF2B_Loopback0 remote_as: '65112.100' - ip_address: 172.16.110.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1.POD1.LEAF2A - description: DC1.POD1.LEAF2A + description: DC1.POD1.LEAF2A_Loopback0 remote_as: '65112.100' address_family_evpn: peer_groups: @@ -140,7 +140,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet5 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet5 + description: P2P_DC1-SUPER-SPINE1_Ethernet5 shutdown: false service_profile: QOS-PROFILE switchport: @@ -150,7 +150,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet6 + description: P2P_DC1-POD1-SPINE1_Ethernet6 shutdown: false service_profile: QOS-PROFILE switchport: @@ -160,7 +160,7 @@ ethernet_interfaces: peer: DC1-POD1-LEAF1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF1A_Ethernet4 + description: P2P_DC1-POD1-LEAF1A_Ethernet4 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS2.yml index 42fb5ed7411..98b43f4f0ea 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-RS2.yml @@ -59,25 +59,25 @@ router_bgp: - ip_address: 172.16.210.3 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF1A - description: DC2-POD1-LEAF1A + description: DC2-POD1-LEAF1A_Loopback0 remote_as: '65211' route_map_out: RM-EVPN-FILTER-AS65211 - ip_address: 172.16.210.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-SPINE1 - description: DC2-POD1-SPINE1 + description: DC2-POD1-SPINE1_Loopback0 remote_as: '65210' route_map_out: RM-EVPN-FILTER-AS65210 - ip_address: 172.16.20.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-RS1 - description: DC2-RS1 + description: DC2-RS1_Loopback0 remote_as: '65201' route_map_out: RM-EVPN-FILTER-AS65201 - ip_address: 172.16.200.1 peer_group: EVPN-OVERLAY-PEERS peer: DC2-SUPER-SPINE1 - description: DC2-SUPER-SPINE1 + description: DC2-SUPER-SPINE1_Loopback0 remote_as: '65200' route_map_out: RM-EVPN-FILTER-AS65200 address_family_evpn: @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet5 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet5 + description: P2P_DC1-SUPER-SPINE2_Ethernet5 shutdown: false service_profile: QOS-PROFILE switchport: @@ -148,7 +148,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet4 + description: P2P_DC1-POD2-SPINE1_Ethernet4 shutdown: false service_profile: QOS-PROFILE switchport: @@ -158,7 +158,7 @@ ethernet_interfaces: peer: DC1-POD2-LEAF1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD2-LEAF1A_Ethernet3 + description: P2P_DC1-POD2-LEAF1A_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml index d7d6677900b..f7225b2af13 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml @@ -99,7 +99,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet1 + description: P2P_DC1-POD1-SPINE1_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -113,7 +113,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet1 + description: P2P_DC1-POD1-SPINE2_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -127,7 +127,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet1 + description: P2P_DC1-POD2-SPINE1_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -141,7 +141,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet1 + description: P2P_DC1-POD2-SPINE2_Ethernet1 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-RS1 peer_interface: Ethernet1 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS1_Ethernet1 + description: P2P_DC1-RS1_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -165,13 +165,13 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet4 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet4 switchport: enabled: false shutdown: false ip_address: 11.1.2.0/31 mac_security: profile: MACSEC_PROFILE + description: P2P_DC2-SUPER-SPINE1_Ethernet4 ptp: enable: true loopback_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE2.yml index 3ec09b0439f..8c32f55bc8f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE2.yml @@ -106,7 +106,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet2 + description: P2P_DC1-POD1-SPINE1_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -120,7 +120,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet2 + description: P2P_DC1-POD1-SPINE2_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -134,7 +134,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet2 + description: P2P_DC1-POD2-SPINE1_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -148,7 +148,7 @@ ethernet_interfaces: peer: DC1-POD2-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet2 + description: P2P_DC1-POD2-SPINE2_Ethernet2 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -162,7 +162,7 @@ ethernet_interfaces: peer: DC1-RS2 peer_interface: Ethernet1 peer_type: overlay-controller - description: P2P_LINK_TO_DC1-RS2_Ethernet1 + description: P2P_DC1-RS2_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -172,11 +172,11 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE2 peer_interface: Ethernet4 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet4 switchport: enabled: false shutdown: false ip_address: 11.1.2.2/31 + description: P2P_DC2-SUPER-SPINE2_Ethernet4 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml index b1f302e839f..cfc626fc776 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1.POD1.LEAF2A.yml @@ -57,7 +57,7 @@ router_bgp: - ip_address: 172.20.110.3 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: DC1-POD1-LEAF2B - description: DC1-POD1-LEAF2B + description: DC1-POD1-LEAF2B_Vlan4094 - ip_address: 172.17.110.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65110.100' @@ -81,25 +81,25 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' route_map_out: RM-EVPN-FILTER-AS65111.100 - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' route_map_out: RM-EVPN-FILTER-AS65110.100 - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' route_map_out: RM-EVPN-FILTER-AS65101 - ip_address: 172.16.120.3 peer_group: EVPN-OVERLAY-CORE peer: DC1-POD2-LEAF1A - description: DC1-POD2-LEAF1A + description: DC1-POD2-LEAF1A_Loopback0 remote_as: '65121' - ip_address: 100.100.100.201 remote_as: '65211' @@ -115,11 +115,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true route: import_match_failure_action: discard address_family_rtc: @@ -321,7 +321,7 @@ snmp_server: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 @@ -359,7 +359,7 @@ vlans: name: L2LEAF_INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 172.20.110.2/31 @@ -532,7 +532,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet4 + description: P2P_DC1-POD1-SPINE1_Ethernet4 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -546,7 +546,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet4 + description: P2P_DC1-POD1-SPINE2_Ethernet4 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -578,7 +578,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE1_Ethernet7 + description: P2P_DC1-POD1-SPINE1_Ethernet7 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -592,7 +592,7 @@ ethernet_interfaces: peer: DC1-POD1-SPINE2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-POD1-SPINE2_Ethernet7 + description: P2P_DC1-POD1-SPINE2_Ethernet7 shutdown: false service_profile: QOS-PROFILE mac_security: @@ -606,11 +606,11 @@ ethernet_interfaces: peer: DC2-POD1-LEAF1A peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet6 switchport: enabled: false shutdown: false ip_address: 100.100.100.101/24 + description: P2P_DC2-POD1-LEAF1A_Ethernet6 - name: Ethernet16 peer: server-1 peer_interface: Eth1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml index 2e50de07321..eea6d5573f2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml @@ -50,27 +50,27 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' - ip_address: 172.16.10.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS2 - description: DC1-RS2 + description: DC1-RS2_Loopback0 remote_as: '65102' - ip_address: 172.16.210.4 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF2A - description: DC2-POD1-LEAF2A + description: DC2-POD1-LEAF2A_Loopback0 remote_as: '65212' - ip_address: 100.100.100.101 remote_as: '65112.100' @@ -220,7 +220,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet3 + description: P2P_DC2-POD1-SPINE1_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: @@ -232,7 +232,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet3 + description: P2P_DC2-POD1-SPINE2_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: @@ -253,20 +253,20 @@ ethernet_interfaces: peer: DC1.POD1.LEAF2A peer_interface: Ethernet7 peer_type: l3leaf - description: P2P_LINK_TO_DC1.POD1.LEAF2A_Ethernet7 switchport: enabled: false shutdown: false ip_address: 100.100.100.201/24 + description: P2P_DC1.POD1.LEAF2A_Ethernet7 - name: Ethernet7 peer: DC1-POD1-LEAF2B peer_interface: Ethernet7 peer_type: l3leaf - description: P2P_LINK_TO_DC1-POD1-LEAF2B_Ethernet7 switchport: enabled: false shutdown: false ip_address: 11.1.0.39/31 + description: P2P_DC1-POD1-LEAF2B_Ethernet7 ptp: enable: true port_channel_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml index f1e0a8b77bd..cf6864cc02a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml @@ -49,7 +49,7 @@ router_bgp: - ip_address: 172.16.210.3 peer_group: EVPN-OVERLAY-PEERS peer: DC2-POD1-LEAF1A - description: DC2-POD1-LEAF1A + description: DC2-POD1-LEAF1A_Loopback0 remote_as: '65211' address_family_evpn: peer_groups: @@ -109,7 +109,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + description: P2P_DC2-POD1-SPINE1_Ethernet4 shutdown: false service_profile: QOS-PROFILE switchport: @@ -121,7 +121,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + description: P2P_DC2-POD1-SPINE2_Ethernet4 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml index 83c2161255b..8871da513f5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml @@ -59,22 +59,22 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' - ip_address: 172.16.10.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS2 - description: DC1-RS2 + description: DC1-RS2_Loopback0 remote_as: '65102' - ip_address: 11.1.1.18 remote_as: '65120' @@ -140,7 +140,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet1 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet1 + description: P2P_DC2-SUPER-SPINE1_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -152,7 +152,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE2 peer_interface: Ethernet1 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet1 + description: P2P_DC2-SUPER-SPINE2_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -164,7 +164,7 @@ ethernet_interfaces: peer: DC2-POD1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet1 + description: P2P_DC2-POD1-LEAF1A_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -176,7 +176,7 @@ ethernet_interfaces: peer: DC2-POD1-LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + description: P2P_DC2-POD1-LEAF2A_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -188,11 +188,11 @@ ethernet_interfaces: peer: DC1-POD2-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 switchport: enabled: false shutdown: false ip_address: 11.1.1.19/31 + description: P2P_DC1-POD2-SPINE1_Ethernet5 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml index 348ea2d5433..414dc81ea2d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml @@ -101,7 +101,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet2 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet2 + description: P2P_DC2-SUPER-SPINE1_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -113,7 +113,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE2 peer_interface: Ethernet2 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet2 + description: P2P_DC2-SUPER-SPINE2_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -125,7 +125,7 @@ ethernet_interfaces: peer: DC2-POD1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet2 + description: P2P_DC2-POD1-LEAF1A_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -137,7 +137,7 @@ ethernet_interfaces: peer: DC2-POD1-LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + description: P2P_DC2-POD1-LEAF2A_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -149,11 +149,11 @@ ethernet_interfaces: peer: DC1-POD2-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 switchport: enabled: false shutdown: false ip_address: 200.200.200.201/24 + description: P2P_DC1-POD2-SPINE2_Ethernet4 ptp: enable: true loopback_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS1.yml index 0d72630621a..d0b5def000e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS1.yml @@ -49,22 +49,22 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' - ip_address: 172.16.10.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS2 - description: DC1-RS2 + description: DC1-RS2_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -124,7 +124,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet3 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet3 + description: P2P_DC2-SUPER-SPINE1_Ethernet3 shutdown: false service_profile: QOS-PROFILE switchport: @@ -134,7 +134,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet6 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet6 + description: P2P_DC2-SUPER-SPINE1_Ethernet6 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS2.yml index 30e22704338..b5167a99980 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-RS2.yml @@ -84,7 +84,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet5 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet5 + description: P2P_DC2-SUPER-SPINE1_Ethernet5 shutdown: false service_profile: QOS-PROFILE switchport: @@ -94,7 +94,7 @@ ethernet_interfaces: peer: DC2-SUPER-SPINE1 peer_interface: Ethernet7 peer_type: super-spine - description: P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet7 + description: P2P_DC2-SUPER-SPINE1_Ethernet7 shutdown: false service_profile: QOS-PROFILE switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml index 6af7e906b32..8dcb120cbb5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml @@ -69,22 +69,22 @@ router_bgp: - ip_address: 172.16.110.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-LEAF1A - description: DC1-POD1-LEAF1A + description: DC1-POD1-LEAF1A_Loopback0 remote_as: '65111.100' - ip_address: 172.16.110.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-POD1-SPINE1 - description: DC1-POD1-SPINE1 + description: DC1-POD1-SPINE1_Loopback0 remote_as: '65110.100' - ip_address: 172.16.10.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS1 - description: DC1-RS1 + description: DC1-RS1_Loopback0 remote_as: '65101' - ip_address: 172.16.10.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-RS2 - description: DC1-RS2 + description: DC1-RS2_Loopback0 remote_as: '65102' - ip_address: 11.1.2.0 remote_as: '65100' @@ -150,7 +150,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet1 + description: P2P_DC2-POD1-SPINE1_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -162,7 +162,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet1 + description: P2P_DC2-POD1-SPINE2_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -174,7 +174,7 @@ ethernet_interfaces: peer: DC2-RS1 peer_interface: Ethernet1 peer_type: overlay-controller - description: P2P_LINK_TO_DC2-RS1_Ethernet1 + description: P2P_DC2-RS1_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -184,7 +184,7 @@ ethernet_interfaces: peer: DC2-RS2 peer_interface: Ethernet1 peer_type: overlay-controller - description: P2P_LINK_TO_DC2-RS2_Ethernet1 + description: P2P_DC2-RS2_Ethernet1 shutdown: false service_profile: QOS-PROFILE switchport: @@ -194,7 +194,7 @@ ethernet_interfaces: peer: DC2-RS1 peer_interface: Ethernet2 peer_type: overlay-controller - description: P2P_LINK_TO_DC2-RS1_Ethernet2 + description: P2P_DC2-RS1_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -204,7 +204,7 @@ ethernet_interfaces: peer: DC2-RS2 peer_interface: Ethernet2 peer_type: overlay-controller - description: P2P_LINK_TO_DC2-RS2_Ethernet2 + description: P2P_DC2-RS2_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -214,13 +214,13 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE1 peer_interface: Ethernet6 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE1_Ethernet6 switchport: enabled: false shutdown: false ip_address: 11.1.2.1/31 mac_security: profile: MACSEC_PROFILE + description: P2P_DC1-SUPER-SPINE1_Ethernet6 ptp: enable: true loopback_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE2.yml index 558ae85ed91..87ef2664691 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE2.yml @@ -89,7 +89,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet2 + description: P2P_DC2-POD1-SPINE1_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -101,7 +101,7 @@ ethernet_interfaces: peer: DC2-POD1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet2 + description: P2P_DC2-POD1-SPINE2_Ethernet2 shutdown: false service_profile: QOS-PROFILE switchport: @@ -113,11 +113,11 @@ ethernet_interfaces: peer: DC1-SUPER-SPINE2 peer_interface: Ethernet6 peer_type: super-spine - description: P2P_LINK_TO_DC1-SUPER-SPINE2_Ethernet6 switchport: enabled: false shutdown: false ip_address: 11.1.2.3/31 + description: P2P_DC1-SUPER-SPINE2_Ethernet6 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/group_vars/DUPLICATE_VLANS_MLAG.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/group_vars/DUPLICATE_VLANS_MLAG.yml index 523f280d803..fe5d61ac260 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/group_vars/DUPLICATE_VLANS_MLAG.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/group_vars/DUPLICATE_VLANS_MLAG.yml @@ -38,5 +38,5 @@ tenants: expected_error_message: >- Found duplicate objects with conflicting data while generating configuration for MLAG Peering VLAN in VRF 'Tenant_C_WAN_Zone' - (check for duplicate VRF VNI/ID). {'id': 2, 'name': 'MLAG_iBGP_Tenant_C_WAN_Zone', 'tenant': 'Tenant_C'} conflicts with - {'id': 2, 'name': 'MLAG_iBGP_Tenant_C_OP_Zone', 'tenant': 'Tenant_C'}. + (check for duplicate VRF VNI/ID). {'id': 2, 'name': 'MLAG_L3_VRF_Tenant_C_WAN_Zone', 'tenant': 'Tenant_C'} conflicts with + {'id': 2, 'name': 'MLAG_L3_VRF_Tenant_C_OP_Zone', 'tenant': 'Tenant_C'}. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/connected-endpoints-wrong-profile-lacp-fallback.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/connected-endpoints-wrong-profile-lacp-fallback.yml index 83f6170b6ef..648903d9085 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/connected-endpoints-wrong-profile-lacp-fallback.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/connected-endpoints-wrong-profile-lacp-fallback.yml @@ -28,5 +28,4 @@ port_profiles: native_vlan: 123 expected_error_message: >- - The 'profile' of every port-channel lacp fallback individual setting must be defined in the 'port_profiles'. - First occurrence seen of a missing profile is 'INDIVIDUAL_TRUNK' for the connected endpoint with the name 'INDIVIDUAL_1'. + Profile 'INDIVIDUAL_TRUNK' applied under 'server[INDIVIDUAL_1].adapters[0].port_channel.lacp_fallback.individual' does not exist in `port_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml index 4e21c2135ff..878d1e55579 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml @@ -25,5 +25,5 @@ l3_edge: expected_error_message: >- Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under l3_edge p2p_link. - {'name': 'ethernet1', 'peer': 'peer2', 'peer_interface': 'ethernet2', 'description': 'P2P_LINK_TO_peer2_ethernet2'} conflicts with - {'name': 'ethernet1', 'peer': 'peer1', 'peer_interface': 'ethernet1', 'description': 'P2P_LINK_TO_peer1_ethernet1'}. + {'name': 'ethernet1', 'peer': 'peer2', 'peer_interface': 'ethernet2', 'description': 'P2P_peer2_ethernet2'} conflicts with + {'name': 'ethernet1', 'peer': 'peer1', 'peer_interface': 'ethernet1', 'description': 'P2P_peer1_ethernet1'}. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml index afd060fbeb2..772e389a93d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml @@ -51,6 +51,6 @@ expected_error_message: >- Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under core_interfaces p2p_link port-Channel members. {'name': 'Ethernet1', 'peer': 'core-2-ospf-ldp', 'peer_interface': 'Ethernet12', 'channel_group': {'id': 1, 'mode': 'active'}, - 'description': 'P2P_LINK_TO_core-2-ospf-ldp_Ethernet12'} + 'description': 'P2P_core-2-ospf-ldp_Ethernet12'} conflicts with {'name': 'Ethernet1', 'peer': 'peer1', 'peer_interface': 'Ethernet2', 'channel_group': None, - 'description': 'P2P_LINK_TO_peer1_Ethernet2'}. + 'description': 'P2P_peer1_Ethernet2'}. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml index 8743ee1b63f..93ccba001cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml @@ -37,5 +37,5 @@ core_interfaces: expected_error_message: >- Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under core_interfaces p2p_link. - {'name': 'Ethernet1', 'peer': 'peer2', 'peer_interface': 'Ethernet3', 'description': 'P2P_LINK_TO_peer2_Ethernet3', 'mtu': 9214} conflicts with - {'name': 'Ethernet1', 'peer': 'peer1', 'peer_interface': 'Ethernet2', 'description': 'P2P_LINK_TO_peer1_Ethernet2', 'mtu': 1500}. + {'name': 'Ethernet1', 'peer': 'peer2', 'peer_interface': 'Ethernet3', 'description': 'P2P_peer2_Ethernet3', 'mtu': 9214} conflicts with + {'name': 'Ethernet1', 'peer': 'peer1', 'peer_interface': 'Ethernet2', 'description': 'P2P_peer1_Ethernet2', 'mtu': 1500}. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-parent-port-profile-does-not-exist.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-parent-port-profile-does-not-exist.yml new file mode 100644 index 00000000000..e1c74811f49 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-parent-port-profile-does-not-exist.yml @@ -0,0 +1,24 @@ +--- +type: l3leaf + +port_profiles: + - profile: PROFILE-1 + parent_profile: THIS-PROFILE-DOES-NOT-EXIST + +l3leaf: + nodes: + - name: failure-connected-endpoint-parent-port-profile-does-not-exist + loopback_ipv4_pool: 192.168.42.0/24 + vtep_loopback_ipv4_pool: 192.168.255.0/24 + bgp_as: 65042 + id: 1 + +servers: + - name: TEST-ENDPOINT + adapters: + - switches: [failure-connected-endpoint-parent-port-profile-does-not-exist] + switch_ports: [Ethernet9] + profile: PROFILE-1 + +expected_error_message: >- + Profile 'THIS-PROFILE-DOES-NOT-EXIST' applied under port profile 'PROFILE-1' does not exist in `port_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-port-profile-does-not-exist.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-port-profile-does-not-exist.yml new file mode 100644 index 00000000000..b0298e83227 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-connected-endpoint-port-profile-does-not-exist.yml @@ -0,0 +1,24 @@ +--- +type: l3leaf + +port_profiles: + - profile: PROFILE-1 + +l3leaf: + nodes: + - name: failure-connected-endpoint-port-profile-does-not-exist + loopback_ipv4_pool: 192.168.42.0/24 + vtep_loopback_ipv4_pool: 192.168.255.0/24 + bgp_as: 65042 + id: 1 + +servers: + - name: TEST-ENDPOINT + adapters: + - switches: [failure-connected-endpoint-port-profile-does-not-exist] + switch_ports: [Ethernet9] + profile: THIS-PROFILE-DOES-NOT-EXIST + +expected_error_message: >- + Profile 'THIS-PROFILE-DOES-NOT-EXIST' applied under 'servers[TEST-ENDPOINT].adapters[0]' + does not exist in `port_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-l3-interface-profile-does-not-exist.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-l3-interface-profile-does-not-exist.yml new file mode 100644 index 00000000000..043343fe955 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-l3-interface-profile-does-not-exist.yml @@ -0,0 +1,21 @@ +--- +type: l3leaf + +l3_interface_profiles: + - profile: PROFILE-1 + +l3leaf: + nodes: + - name: failure-l3-interface-profile-does-not-exist + loopback_ipv4_pool: 192.168.42.0/24 + vtep_loopback_ipv4_pool: 192.168.255.0/24 + bgp_as: 65042 + id: 1 + l3_interfaces: + - name: Ethernet1 + profile: THIS-PROFILE-DOES-NOT-EXIST + ip_address: 10.12.12.12/24 + +expected_error_message: >- + Profile 'THIS-PROFILE-DOES-NOT-EXIST' applied under l3_interface 'Ethernet1' does + not exist in `l3_interface_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-grandparent-profile-does-not-exist.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-grandparent-profile-does-not-exist.yml new file mode 100644 index 00000000000..3508452a1cf --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-grandparent-profile-does-not-exist.yml @@ -0,0 +1,28 @@ +--- +type: l3leaf + +svi_profiles: + - profile: PROFILE-1 + parent_profile: THIS-PROFILE-DOES-NOT-EXIST + +l3leaf: + nodes: + - name: failure-svi-grandparent-profile-does-not-exist + loopback_ipv4_pool: 192.168.42.0/24 + vtep_loopback_ipv4_pool: 192.168.255.0/24 + bgp_as: 65042 + id: 1 + +tenants: + - name: TENANT-1 + vrfs: + - name: VRF-1 + svis: + - name: TEST-SVI + id: 42 + profile: PROFILE-1 + nodes: + - node: failure-svi-grandparent-profile-does-not-exist + +expected_error_message: >- + Profile 'THIS-PROFILE-DOES-NOT-EXIST' applied under SVI Profile 'PROFILE-1' does not exist in `svi_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-parent-profile-does-not-exist.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-parent-profile-does-not-exist.yml new file mode 100644 index 00000000000..914a605e682 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-svi-parent-profile-does-not-exist.yml @@ -0,0 +1,28 @@ +--- +type: l3leaf + +svi_profiles: + - profile: PROFILE-1 + +l3leaf: + nodes: + - name: failure-svi-parent-profile-does-not-exist + loopback_ipv4_pool: 192.168.42.0/24 + vtep_loopback_ipv4_pool: 192.168.255.0/24 + bgp_as: 65042 + id: 1 + +tenants: + - name: TENANT-1 + vrfs: + - name: VRF-1 + svis: + - name: TEST-SVI + id: 42 + profile: THIS-PROFILE-DOES-NOT-EXIST + nodes: + - node: failure-svi-parent-profile-does-not-exist + +expected_error_message: >- + Profile 'THIS-PROFILE-DOES-NOT-EXIST' applied under SVI 'TEST-SVI' does + not exist in `svi_profiles`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/missing-key-evpn-gateway-remote-peer.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/missing-key-evpn-gateway-remote-peer.yml new file mode 100644 index 00000000000..2a822ddf78c --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/missing-key-evpn-gateway-remote-peer.yml @@ -0,0 +1,23 @@ +--- +type: l3leaf + +l3leaf: + defaults: + loopback_ipv4_pool: 192.168.255.0/24 + loopback_ipv4_offset: 8 + vtep_loopback_ipv4_pool: 192.168.254.0/24 + bgp_as: 65101 + nodes: + - name: missing-key-evpn-gateway-remote-peer + id: 1 + bgp_as: 65104 + mgmt_ip: 192.168.200.110/24 + evpn_gateway: + remote_peers: + # Missing bgp_as + - hostname: not-in-the-inventory + ip_address: 192.168.42.42 + +expected_error_message: >- + The EVPN Gateway remote peer 'not-in-the-inventory' is missing either a `bpg_as` + or an `ip_address`. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml index b78a0c13e5c..7d5bc888a78 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml @@ -96,6 +96,11 @@ all: failure-missing-evpn-multicast-with-pim: failure-duplicate-evpn-vlan-bundle-name: failure-no-local-path-group-in-default-policy: + failure-l3-interface-profile-does-not-exist: + failure-svi-parent-profile-does-not-exist: + failure-svi-grandparent-profile-does-not-exist: + failure-connected-endpoint-port-profile-does-not-exist: + failure-connected-endpoint-parent-port-profile-does-not-exist: ipv4-acl-in-missing-on-wan-interface: ipv4-acls: isis-system-id-format-missing-node-id: @@ -103,6 +108,7 @@ all: missing-prefix-list-in-cv-pathfinder: missing-prefix-list-definition-cv-pathfinder: missing-data-plane_cpu-allocation-max: + missing-key-evpn-gateway-remote-peer: ntp-settings-server-vrf-missing-mgmt-ip: ntp-settings-server-vrf-missing-inband-mgmt-interface: source-interfaces-domain-lookup-duplicate-vrf: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/custom_modules/custom_interface_descriptions_with_data.py b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/custom_modules/custom_interface_descriptions_with_data.py index 157db2c325b..8a2200e1c2f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/custom_modules/custom_interface_descriptions_with_data.py +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/custom_modules/custom_interface_descriptions_with_data.py @@ -82,6 +82,15 @@ def mlag_port_channel_interface(self, data: InterfaceDescriptionData) -> str: """ return f"{self._custom_description_prefix}_MLAG_PEER_{data.mlag_peer}_Po{data.mlag_port_channel_id}" + def mlag_peer_svi(self, data: InterfaceDescriptionData) -> str: # noqa: ARG002 + return "MLAG_PEER" + + def mlag_peer_l3_svi(self, data: InterfaceDescriptionData) -> str: # noqa: ARG002 + return "MLAG_PEER_L3_PEERING" + + def mlag_peer_l3_vrf_svi(self, data: InterfaceDescriptionData) -> str: + return f"MLAG_PEER_L3_iBGP: vrf {data.vrf}" + def connected_endpoints_ethernet_interface(self, data: InterfaceDescriptionData) -> str: """ Implementation using new data. diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF1.cfg index 65bec1b68aa..0551acb1cf4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF1.cfg @@ -20,11 +20,11 @@ hostname 7010TX-LEAF1 no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -63,12 +63,12 @@ interface Management1 ip address 192.168.201.116/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown ip address 10.10.224.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 10.10.255.4/31 @@ -126,7 +126,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.5 description 7010TX-LEAF2 + neighbor 10.10.224.5 description 7010TX-LEAF2_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF2.cfg index 25187cac9ed..4fb7c4ae7b5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/7010TX-LEAF2.cfg @@ -20,11 +20,11 @@ hostname 7010TX-LEAF2 no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -58,12 +58,12 @@ interface Management1 ip address 192.168.201.117/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown ip address 10.10.224.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown no autostate ip address 10.10.255.5/31 @@ -114,7 +114,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.4 description 7010TX-LEAF1 + neighbor 10.10.224.4 description 7010TX-LEAF1_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3A.cfg index a9044e184bc..cf9c8a49c5c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3A.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.109/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.8/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.9 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.9 description AUTO_BGP_ASN_LEAF3B + neighbor 10.255.251.9 description AUTO_BGP_ASN_LEAF3B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3B.cfg index 654c6eb9a13..5736430b20b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF3B.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.110/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.9/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.8 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.8 description AUTO_BGP_ASN_LEAF3A + neighbor 10.255.251.8 description AUTO_BGP_ASN_LEAF3A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4A.cfg index 0d70976380a..8d81ffcec7b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4A.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.111/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.12/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65222 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.13 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.13 description AUTO_BGP_ASN_LEAF4B + neighbor 10.255.251.13 description AUTO_BGP_ASN_LEAF4B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4B.cfg index 8d6991b68b3..163e7882c73 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF4B.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.112/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.13/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65222 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.12 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.12 description AUTO_BGP_ASN_LEAF4A + neighbor 10.255.251.12 description AUTO_BGP_ASN_LEAF4A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7A.cfg index 28c6135f3e7..b7018fdfb93 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7A.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.115/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.20/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65222.0 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.21 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.21 description AUTO_BGP_ASN_LEAF7B + neighbor 10.255.251.21 description AUTO_BGP_ASN_LEAF7B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7B.cfg index f093aa14ff3..6e8beee62e7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF7B.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,13 +65,13 @@ interface Management1 ip address 192.168.202.116/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.21/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 65222.0 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.20 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.20 description AUTO_BGP_ASN_LEAF7A + neighbor 10.255.251.20 description AUTO_BGP_ASN_LEAF7A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_LEAF01.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_LEAF01.cfg index 37619803cb5..54957fe19a2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_LEAF01.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_LEAF01.cfg @@ -23,14 +23,14 @@ spanning-tree mst 0 priority 4096 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_AUTO_NODE_TYPE_SPINE01_Ethernet1 + description P2P_AUTO_NODE_TYPE_SPINE01_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.31.255.1/31 ! interface Ethernet2 - description P2P_LINK_TO_AUTO_NODE_TYPE_SPINE02_Ethernet1 + description P2P_AUTO_NODE_TYPE_SPINE02_Ethernet1 no shutdown mtu 9214 no switchport @@ -95,10 +95,10 @@ router bgp 65101 neighbor 172.31.255.2 description AUTO_NODE_TYPE_SPINE02_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65100 - neighbor 192.168.255.1 description AUTO_NODE_TYPE_SPINE01 + neighbor 192.168.255.1 description AUTO_NODE_TYPE_SPINE01_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65100 - neighbor 192.168.255.2 description AUTO_NODE_TYPE_SPINE02 + neighbor 192.168.255.2 description AUTO_NODE_TYPE_SPINE02_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE01.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE01.cfg index 218fee44406..5018589c657 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE01.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE01.cfg @@ -22,14 +22,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_AUTO_NODE_TYPE_LEAF01_Ethernet1 + description P2P_AUTO_NODE_TYPE_LEAF01_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.31.255.0/31 ! interface Ethernet2 - description P2P_LINK_TO_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet1 + description P2P_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet1 no shutdown mtu 9214 no switchport @@ -84,10 +84,10 @@ router bgp 65100 neighbor 172.31.255.5 description AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet1 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description AUTO_NODE_TYPE_LEAF01 + neighbor 192.168.255.3 description AUTO_NODE_TYPE_LEAF01_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65102 - neighbor 192.168.255.4 description AUTO_NODE_TYPE_UNGROUPED_LEAF02 + neighbor 192.168.255.4 description AUTO_NODE_TYPE_UNGROUPED_LEAF02_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE02.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE02.cfg index d8c6a9182d7..31c14d996ce 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE02.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_SPINE02.cfg @@ -22,14 +22,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_AUTO_NODE_TYPE_LEAF01_Ethernet2 + description P2P_AUTO_NODE_TYPE_LEAF01_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.31.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet2 + description P2P_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet2 no shutdown mtu 9214 no switchport @@ -84,10 +84,10 @@ router bgp 65100 neighbor 172.31.255.7 description AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet2 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description AUTO_NODE_TYPE_LEAF01 + neighbor 192.168.255.3 description AUTO_NODE_TYPE_LEAF01_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65102 - neighbor 192.168.255.4 description AUTO_NODE_TYPE_UNGROUPED_LEAF02 + neighbor 192.168.255.4 description AUTO_NODE_TYPE_UNGROUPED_LEAF02_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.cfg index 5f0ff5d637d..41d17c51ced 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.cfg @@ -23,14 +23,14 @@ spanning-tree mst 0 priority 4096 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_AUTO_NODE_TYPE_SPINE01_Ethernet2 + description P2P_AUTO_NODE_TYPE_SPINE01_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.31.255.5/31 ! interface Ethernet2 - description P2P_LINK_TO_AUTO_NODE_TYPE_SPINE02_Ethernet2 + description P2P_AUTO_NODE_TYPE_SPINE02_Ethernet2 no shutdown mtu 9214 no switchport @@ -95,10 +95,10 @@ router bgp 65102 neighbor 172.31.255.6 description AUTO_NODE_TYPE_SPINE02_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65100 - neighbor 192.168.255.1 description AUTO_NODE_TYPE_SPINE01 + neighbor 192.168.255.1 description AUTO_NODE_TYPE_SPINE01_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65100 - neighbor 192.168.255.2 description AUTO_NODE_TYPE_SPINE02 + neighbor 192.168.255.2 description AUTO_NODE_TYPE_SPINE02_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg index c3a76c1d0f5..7f6e76e8e2a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.cfg @@ -23,15 +23,15 @@ vlan 110 name Tenant_A_OP_Zone_1 ! vlan 3000 - name MLAG_iBGP_TEST_VRF + name MLAG_L3_VRF_TEST_VRF trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -175,7 +175,7 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description CUSTOM-PYTHON_MODULES-L3LEAF1B + neighbor 10.255.251.11 description CUSTOM-PYTHON_MODULES-L3LEAF1B_Vlan4093 neighbor 172.31.255.20 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.20 remote-as 65001 neighbor 172.31.255.20 description CUSTOM-PYTHON_MODULES-SPINE1_Ethernet1 @@ -184,7 +184,7 @@ router bgp 65101 neighbor 172.31.255.25 description CUSTOM-PYTHON_MODULES-L3LEAF2_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description CUSTOM-PYTHON_MODULES-SPINE1 + neighbor 192.168.255.1 description CUSTOM-PYTHON_MODULES-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 110 @@ -207,7 +207,7 @@ router bgp 65101 router-id 192.168.255.21 update wait-install neighbor 10.255.240.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.240.11 description CUSTOM-PYTHON_MODULES-L3LEAF1B + neighbor 10.255.240.11 description CUSTOM-PYTHON_MODULES-L3LEAF1B_Vlan3000 neighbor 172.16.0.25 remote-as 65103 neighbor 172.16.0.25 peer group IPv4-UNDERLAY-PEERS neighbor 172.16.0.25 description CUSTOM-PYTHON_MODULES-L3LEAF2_Ethernet1.1_vrf_TEST_VRF diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg index d2e01e19767..412779a53d6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.cfg @@ -23,15 +23,15 @@ vlan 110 name Tenant_A_OP_Zone_1 ! vlan 3000 - name MLAG_iBGP_TEST_VRF + name MLAG_L3_VRF_TEST_VRF trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -164,13 +164,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description CUSTOM-PYTHON_MODULES-L3LEAF1A + neighbor 10.255.251.10 description CUSTOM-PYTHON_MODULES-L3LEAF1A_Vlan4093 neighbor 172.31.255.22 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.22 remote-as 65001 neighbor 172.31.255.22 description CUSTOM-PYTHON_MODULES-SPINE1_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description CUSTOM-PYTHON_MODULES-SPINE1 + neighbor 192.168.255.1 description CUSTOM-PYTHON_MODULES-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 110 @@ -193,7 +193,7 @@ router bgp 65101 router-id 192.168.255.22 update wait-install neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.240.10 description CUSTOM-PYTHON_MODULES-L3LEAF1A + neighbor 10.255.240.10 description CUSTOM-PYTHON_MODULES-L3LEAF1A_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg index 6e860d6fc5f..9ce48135387 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-PYTHON_MODULES-SPINE1.cfg @@ -83,10 +83,10 @@ router bgp 65001 neighbor 172.31.255.23 description CUSTOM-PYTHON_MODULES-L3LEAF1B_Ethernet1 neighbor 192.168.255.21 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.21 remote-as 65101 - neighbor 192.168.255.21 description CUSTOM-PYTHON_MODULES-L3LEAF1A + neighbor 192.168.255.21 description CUSTOM-PYTHON_MODULES-L3LEAF1A_Loopback0 neighbor 192.168.255.22 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.22 remote-as 65101 - neighbor 192.168.255.22 description CUSTOM-PYTHON_MODULES-L3LEAF1B + neighbor 192.168.255.22 description CUSTOM-PYTHON_MODULES-L3LEAF1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1A.cfg index 6a2ebcb3287..4fb32ba0635 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1A.cfg @@ -20,13 +20,13 @@ hostname CUSTOM-TEMPLATES-L2LEAF1A no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_CUSTOM_TEMPLATES_L3LEAF1 + description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_ no shutdown switchport trunk allowed vlan none switchport mode trunk @@ -67,7 +67,7 @@ interface Management1 ip address 192.168.200.103/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1B.cfg index 595feb3065e..bfd826dda9f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L2LEAF1B.cfg @@ -20,13 +20,13 @@ hostname CUSTOM-TEMPLATES-L2LEAF1B no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_CUSTOM_TEMPLATES_L3LEAF1 + description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_ no shutdown switchport trunk allowed vlan none switchport mode trunk @@ -67,7 +67,7 @@ interface Management1 ip address 192.168.200.103/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg index 054fd137d6a..29a9a1ee052 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg @@ -23,15 +23,15 @@ vlan 110 name Tenant_A_OP_Zone_1 ! vlan 3000 - name MLAG_iBGP_TEST_VRF + name MLAG_L3_VRF_TEST_VRF trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -46,7 +46,7 @@ interface Port-Channel3 switchport ! interface Port-Channel5 - description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_CUSTOM_TEMPLATES_L2LEAF1 + description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_ no shutdown switchport trunk allowed vlan none switchport mode trunk @@ -109,20 +109,20 @@ interface Vlan110 ip address virtual 10.1.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST_VRF + description MLAG_L3_VRF_TEST_VRF no shutdown mtu 9214 vrf TEST_VRF ip address 10.255.240.10/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.10/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -188,13 +188,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.11 description CUSTOM-TEMPLATES-L3LEAF1B + neighbor 10.255.251.11 description CUSTOM-TEMPLATES-L3LEAF1B_Vlan4093 neighbor 172.31.255.20 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.20 remote-as 65001 neighbor 172.31.255.20 description CUSTOM-TEMPLATES-SPINE1_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description CUSTOM-TEMPLATES-SPINE1 + neighbor 192.168.255.1 description CUSTOM-TEMPLATES-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 110 @@ -217,7 +217,7 @@ router bgp 65101 router-id 192.168.255.21 update wait-install neighbor 10.255.240.11 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.240.11 description CUSTOM-TEMPLATES-L3LEAF1B + neighbor 10.255.240.11 description CUSTOM-TEMPLATES-L3LEAF1B_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg index 76900a74ac4..39b72d92e6d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg @@ -23,15 +23,15 @@ vlan 110 name Tenant_A_OP_Zone_1 ! vlan 3000 - name MLAG_iBGP_TEST_VRF + name MLAG_L3_VRF_TEST_VRF trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -46,7 +46,7 @@ interface Port-Channel3 switchport ! interface Port-Channel5 - description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_CUSTOM_TEMPLATES_L2LEAF1 + description TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_ no shutdown switchport trunk allowed vlan none switchport mode trunk @@ -119,20 +119,20 @@ interface Vlan110 ip address virtual 10.1.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST_VRF + description MLAG_L3_VRF_TEST_VRF no shutdown mtu 9214 vrf TEST_VRF ip address 10.255.240.11/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.11/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -198,13 +198,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.10 description CUSTOM-TEMPLATES-L3LEAF1A + neighbor 10.255.251.10 description CUSTOM-TEMPLATES-L3LEAF1A_Vlan4093 neighbor 172.31.255.22 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.22 remote-as 65001 neighbor 172.31.255.22 description CUSTOM-TEMPLATES-SPINE1_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description CUSTOM-TEMPLATES-SPINE1 + neighbor 192.168.255.1 description CUSTOM-TEMPLATES-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 110 @@ -227,7 +227,7 @@ router bgp 65101 router-id 192.168.255.22 update wait-install neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.240.10 description CUSTOM-TEMPLATES-L3LEAF1A + neighbor 10.255.240.10 description CUSTOM-TEMPLATES-L3LEAF1A_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-SPINE1.cfg index 78faaff3f46..72265e6db48 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-SPINE1.cfg @@ -83,10 +83,10 @@ router bgp 65001 neighbor 172.31.255.23 description CUSTOM-TEMPLATES-L3LEAF1B_Ethernet1 neighbor 192.168.255.21 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.21 remote-as 65101 - neighbor 192.168.255.21 description CUSTOM-TEMPLATES-L3LEAF1A + neighbor 192.168.255.21 description CUSTOM-TEMPLATES-L3LEAF1A_Loopback0 neighbor 192.168.255.22 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.22 remote-as 65101 - neighbor 192.168.255.22 description CUSTOM-TEMPLATES-L3LEAF1B + neighbor 192.168.255.22 description CUSTOM-TEMPLATES-L3LEAF1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn 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 index adf33a6fe9b..fa42e49fb57 100644 --- 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 @@ -49,8 +49,8 @@ sflow vrf OOB source-interface Management99 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL1A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! clock timezone correctly_templated_timezone @@ -330,6 +330,9 @@ router bgp 65104 neighbor 172.31.254.166 peer group UNDERLAY-PEERS neighbor 172.31.254.166 remote-as 65001 neighbor 172.31.254.166 description DC1-SPINE4_Ethernet22 + neighbor 192.168.42.42 peer group EVPN-OVERLAY-CORE + neighbor 192.168.42.42 remote-as 65042 + neighbor 192.168.42.42 description DC1-BL2B neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 neighbor 192.168.255.1 description DC1-SPINE1 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 index a424cb2c179..24e373bc4cb 100644 --- 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 @@ -48,8 +48,8 @@ sflow vrf OOB source-interface Management99 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL1B ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 150 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg index ca199d58a2e..ec3b43b861e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg @@ -38,8 +38,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL2A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 150 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg index 9b12c148c70..458218babd5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg @@ -36,8 +36,8 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-BL2B ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 150 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg index dcb31fc6cc5..75100a991c0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1A.cfg @@ -38,9 +38,9 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-CL1A ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 @@ -255,7 +255,7 @@ router bgp 65108 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65108 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1-CL1B + neighbor MLAG-PEERS description MLAG_PEER_DC1-CL1B neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg index 97ad8ed17ed..8731c7986bf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg @@ -38,9 +38,9 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-CL1B ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 @@ -259,7 +259,7 @@ router bgp 65109 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65109 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1-CL1A + neighbor MLAG-PEERS description MLAG_PEER_DC1-CL1A neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg index 734ad59f8f3..9cd66486353 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg @@ -38,8 +38,8 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS rackA DC1-LEAF1A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 113 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg index e0adde7628f..0050e57b98a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg @@ -46,8 +46,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS rackC DC1-LEAF2A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg index 944b3cabf6c..7c405c096b3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg @@ -46,8 +46,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS rackD DC1-LEAF2B ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg index 5df34f61a0d..1c0e089a63c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg @@ -38,9 +38,9 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-SVC3A ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 @@ -874,18 +874,18 @@ ip prefix-list PL-MLAG-PEER-VRFS seq 10 permit 10.255.251.6/31 seq 20 permit 172.31.11.6/31 ! +monitor session MonitoringSessionServer18WithDest mac access-group mac_acl monitor session MonitoringSessionServer18WithDest source Ethernet25 rx ip access-group MyIpACL priority 5 monitor session MonitoringSessionServer18WithDest source Ethernet28 tx mac access-group MyMacACL priority 5 monitor session MonitoringSessionServer18WithDest source Port-Channel27 tx mac access-group MyMacACL priority 5 monitor session MonitoringSessionServer18WithDest destination Ethernet26 monitor session MonitoringSessionServer18WithDest destination Ethernet40 monitor session MonitoringSessionServer18WithDest destination Port-Channel42 -monitor session MonitoringSessionServer18WithDest header remove size 200 -monitor session MonitoringSessionServer18WithDest mac access-group mac_acl +monitor session MonitoringSessionServer18WithDest truncate size 20 +monitor session MonitoringSessionServer18WithDest sample 10 monitor session MonitoringSessionServer18WithDest rate-limit per-ingress-chip 30 bps monitor session MonitoringSessionServer18WithDest rate-limit per-egress-chip 30 bps -monitor session MonitoringSessionServer18WithDest sample 10 -monitor session MonitoringSessionServer18WithDest truncate size 20 +monitor session MonitoringSessionServer18WithDest header remove size 200 monitor session MonitoringSessionServer18WithoutDest source Ethernet25 tx ! mlag configuration @@ -933,7 +933,7 @@ router bgp 65103 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65103 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1-SVC3B + neighbor MLAG-PEERS description MLAG_PEER_DC1-SVC3B neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg index 17337b198cf..50b7338bfaf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg @@ -38,9 +38,9 @@ ip name-server vrf MGMT 2001:db8::2 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-SVC3B ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 @@ -840,17 +840,17 @@ ip prefix-list PL-MLAG-PEER-VRFS seq 10 permit 10.255.251.6/31 seq 20 permit 172.31.11.6/31 ! +monitor session MonitoringSessionServer18WithDest ip access-group ip_acl monitor session MonitoringSessionServer18WithDest source Ethernet25 rx ip access-group MyIpACL priority 5 monitor session MonitoringSessionServer18WithDest source Port-Channel27 tx mac access-group MyMacACL priority 5 monitor session MonitoringSessionServer18WithDest destination Ethernet26 monitor session MonitoringSessionServer18WithDest destination Port-Channel42 -monitor session MonitoringSessionServer18WithDest encapsulation gre metadata tx -monitor session MonitoringSessionServer18WithDest header remove size 20 -monitor session MonitoringSessionServer18WithDest ip access-group ip_acl +monitor session MonitoringSessionServer18WithDest truncate size 20 +monitor session MonitoringSessionServer18WithDest sample 10 monitor session MonitoringSessionServer18WithDest rate-limit per-ingress-chip 30 bps monitor session MonitoringSessionServer18WithDest rate-limit per-egress-chip 30 bps -monitor session MonitoringSessionServer18WithDest sample 10 -monitor session MonitoringSessionServer18WithDest truncate size 20 +monitor session MonitoringSessionServer18WithDest header remove size 20 +monitor session MonitoringSessionServer18WithDest encapsulation gre metadata tx monitor session MonitoringSessionServer18WithoutDest source Ethernet25 tx ! mlag configuration @@ -898,7 +898,7 @@ router bgp 65103 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65103 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1-SVC3A + neighbor MLAG-PEERS description MLAG_PEER_DC1-SVC3A neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg index 5568651af99..cc424199403 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg @@ -46,9 +46,9 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1_UNDEPLOYED_LEAF1A ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 @@ -541,7 +541,7 @@ router bgp 65110 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65110 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1_UNDEPLOYED_LEAF1B + neighbor MLAG-PEERS description MLAG_PEER_DC1_UNDEPLOYED_LEAF1B neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg index f7d5fb1fc95..befde58c932 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg @@ -46,9 +46,9 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS DC1_UNDEPLOYED_LEAF1B ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4090,4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 @@ -541,7 +541,7 @@ router bgp 65111 neighbor MLAG-PEERS peer group neighbor MLAG-PEERS remote-as 65111 neighbor MLAG-PEERS next-hop-self - neighbor MLAG-PEERS description DC1_UNDEPLOYED_LEAF1A + neighbor MLAG-PEERS description MLAG_PEER_DC1_UNDEPLOYED_LEAF1A neighbor MLAG-PEERS password 7 15AwQNBEJ1nyF/kBEtoAGw== neighbor MLAG-PEERS send-community neighbor MLAG-PEERS maximum-routes 12000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg index b753170f95a..e4e65e5bc48 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg @@ -176,7 +176,7 @@ vrf instance TEN_E_PEG_L3_MULTICAST_ENABLED description PEG_L3_MULTICAST_ENABLED in Tenant E ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet6 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet6 no shutdown mtu 9214 no switchport @@ -538,7 +538,7 @@ router bgp 65106 neighbor 172.31.255.10 description EVPN-MULTICAST-SPINE1_Ethernet6 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg index 8367d01ae87..9549fa46bcc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg @@ -169,74 +169,74 @@ vlan 550 name L3_MULTICAST_ENABLED_550 ! vlan 3010 - name MLAG_iBGP_MULTICAST_ENABLED_110_111 + name MLAG_L3_VRF_MULTICAST_ENABLED_110_111 trunk group MLAG ! vlan 3011 - name MLAG_iBGP_MULTICAST_ENABLED_210_DISABLED_211 + name MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 trunk group MLAG ! vlan 3012 - name MLAG_iBGP_MULTICAST_DISABLED_310_311 + name MLAG_L3_VRF_MULTICAST_DISABLED_310_311 trunk group MLAG ! vlan 3020 - name MLAG_iBGP_MULTICAST_ENABLED_1_2 + name MLAG_L3_VRF_MULTICAST_ENABLED_1_2 trunk group MLAG ! vlan 3021 - name MLAG_iBGP_MULTICAST_ENABLED_3_DISABLED_4 + name MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 trunk group MLAG ! vlan 3022 - name MLAG_iBGP_MULTICAST_DISABLED_5_6 + name MLAG_L3_VRF_MULTICAST_DISABLED_5_6 trunk group MLAG ! vlan 3031 - name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 trunk group MLAG ! vlan 3032 - name MLAG_iBGP_TEN_C_L3_MULTICAST_DISABLED_330_331 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 trunk group MLAG ! vlan 3040 - name MLAG_iBGP_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + name MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 trunk group MLAG ! vlan 3041 - name MLAG_iBGP_TEN_D_L3_MULTICAST_DISABLED_240_241 + name MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 trunk group MLAG ! vlan 3050 - name MLAG_iBGP_TEN_E_PEG_L3_MULTICAST_ENABLED + name MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED trunk group MLAG ! vlan 3051 - name MLAG_iBGP_TEN_E_L3_MULTICAST_TRANSIT + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT trunk group MLAG ! vlan 3054 - name MLAG_iBGP_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE trunk group MLAG ! vlan 3059 - name MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES trunk group MLAG ! vlan 3065 - name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 trunk group MLAG ! vlan 4092 name MULTICAST_ENABLED_4092 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -302,7 +302,7 @@ interface Port-Channel6 mlag 6 ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet1 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet1 no shutdown mtu 9214 no switchport @@ -613,119 +613,119 @@ interface Vlan550 ip address virtual 10.1.56.1/24 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_110_111 + description MLAG_L3_VRF_MULTICAST_ENABLED_110_111 no shutdown mtu 9214 vrf MULTICAST_ENABLED_110_111 ip address 10.255.251.0/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_210_DISABLED_211 + description MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 no shutdown mtu 9214 vrf MULTICAST_ENABLED_210_DISABLED_211 ip address 10.255.251.0/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_310_311 + description MLAG_L3_VRF_MULTICAST_DISABLED_310_311 no shutdown mtu 9214 vrf MULTICAST_DISABLED_310_311 ip address 10.255.251.0/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_1_2 + description MLAG_L3_VRF_MULTICAST_ENABLED_1_2 no shutdown mtu 9214 vrf MULTICAST_ENABLED_1_2 ip address 10.255.251.0/31 ! interface Vlan3021 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_3_DISABLED_4 + description MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 no shutdown mtu 9214 vrf MULTICAST_ENABLED_3_DISABLED_4 ip address 10.255.251.0/31 ! interface Vlan3022 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_5_6 + description MLAG_L3_VRF_MULTICAST_DISABLED_5_6 no shutdown mtu 9214 vrf MULTICAST_DISABLED_5_6 ip address 10.255.251.0/31 ! interface Vlan3031 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 ip address 10.255.251.0/31 ! interface Vlan3032 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_DISABLED_330_331 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_DISABLED_330_331 ip address 10.255.251.0/31 ! interface Vlan3040 - description MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + description MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 no shutdown mtu 9214 vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 ip address 10.255.251.0/31 ! interface Vlan3041 - description MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_DISABLED_240_241 + description MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 no shutdown mtu 9214 vrf TEN_D_L3_MULTICAST_DISABLED_240_241 ip address 10.255.251.0/31 ! interface Vlan3050 - description MLAG_PEER_L3_iBGP: vrf TEN_E_PEG_L3_MULTICAST_ENABLED + description MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED no shutdown mtu 9214 vrf TEN_E_PEG_L3_MULTICAST_ENABLED ip address 10.255.251.0/31 ! interface Vlan3051 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_TRANSIT + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_TRANSIT ip address 10.255.251.0/31 ! interface Vlan3054 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE ip address 10.255.251.0/31 ! interface Vlan3059 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES ip address 10.255.251.0/31 ! interface Vlan3065 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_ENABLED_130_131 ip address 10.255.251.0/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.0/31 pim ipv4 sparse-mode ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -895,13 +895,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan4093 neighbor 172.31.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.0 remote-as 65001 neighbor 172.31.255.0 description EVPN-MULTICAST-SPINE1_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle MULTICAST_DISABLED_5_6 @@ -1067,7 +1067,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3022 redistribute connected ! vrf MULTICAST_DISABLED_310_311 @@ -1077,7 +1077,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3012 redistribute connected ! vrf MULTICAST_ENABLED_1_2 @@ -1087,7 +1087,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3020 redistribute connected ! vrf MULTICAST_ENABLED_3_DISABLED_4 @@ -1097,7 +1097,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3021 redistribute connected ! vrf MULTICAST_ENABLED_110_111 @@ -1107,7 +1107,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3010 redistribute connected ! vrf MULTICAST_ENABLED_210_DISABLED_211 @@ -1117,7 +1117,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3011 redistribute connected ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 @@ -1127,7 +1127,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3032 redistribute connected ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 @@ -1138,7 +1138,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3065 redistribute connected ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 @@ -1149,7 +1149,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3031 redistribute connected ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 @@ -1159,7 +1159,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3041 redistribute connected ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 @@ -1170,7 +1170,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3040 redistribute connected ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE @@ -1181,7 +1181,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3054 redistribute connected ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES @@ -1194,7 +1194,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3059 redistribute connected ! vrf TEN_E_L3_MULTICAST_TRANSIT @@ -1207,7 +1207,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3051 redistribute connected ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED @@ -1218,7 +1218,7 @@ router bgp 65101 router-id 192.168.255.3 update wait-install neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description EVPN-MULTICAST-L3LEAF1B_Vlan3050 redistribute connected ! router multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg index 8acefa64308..9d643a214fe 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg @@ -169,74 +169,74 @@ vlan 550 name L3_MULTICAST_ENABLED_550 ! vlan 3010 - name MLAG_iBGP_MULTICAST_ENABLED_110_111 + name MLAG_L3_VRF_MULTICAST_ENABLED_110_111 trunk group MLAG ! vlan 3011 - name MLAG_iBGP_MULTICAST_ENABLED_210_DISABLED_211 + name MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 trunk group MLAG ! vlan 3012 - name MLAG_iBGP_MULTICAST_DISABLED_310_311 + name MLAG_L3_VRF_MULTICAST_DISABLED_310_311 trunk group MLAG ! vlan 3020 - name MLAG_iBGP_MULTICAST_ENABLED_1_2 + name MLAG_L3_VRF_MULTICAST_ENABLED_1_2 trunk group MLAG ! vlan 3021 - name MLAG_iBGP_MULTICAST_ENABLED_3_DISABLED_4 + name MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 trunk group MLAG ! vlan 3022 - name MLAG_iBGP_MULTICAST_DISABLED_5_6 + name MLAG_L3_VRF_MULTICAST_DISABLED_5_6 trunk group MLAG ! vlan 3031 - name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 trunk group MLAG ! vlan 3032 - name MLAG_iBGP_TEN_C_L3_MULTICAST_DISABLED_330_331 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 trunk group MLAG ! vlan 3040 - name MLAG_iBGP_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + name MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 trunk group MLAG ! vlan 3041 - name MLAG_iBGP_TEN_D_L3_MULTICAST_DISABLED_240_241 + name MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 trunk group MLAG ! vlan 3050 - name MLAG_iBGP_TEN_E_PEG_L3_MULTICAST_ENABLED + name MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED trunk group MLAG ! vlan 3051 - name MLAG_iBGP_TEN_E_L3_MULTICAST_TRANSIT + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT trunk group MLAG ! vlan 3054 - name MLAG_iBGP_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE trunk group MLAG ! vlan 3059 - name MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + name MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES trunk group MLAG ! vlan 3065 - name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131 + name MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 trunk group MLAG ! vlan 4092 name MULTICAST_ENABLED_4092 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -302,7 +302,7 @@ interface Port-Channel6 mlag 6 ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet2 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet2 no shutdown mtu 9214 no switchport @@ -613,119 +613,119 @@ interface Vlan550 ip address virtual 10.1.56.1/24 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_110_111 + description MLAG_L3_VRF_MULTICAST_ENABLED_110_111 no shutdown mtu 9214 vrf MULTICAST_ENABLED_110_111 ip address 10.255.251.1/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_210_DISABLED_211 + description MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 no shutdown mtu 9214 vrf MULTICAST_ENABLED_210_DISABLED_211 ip address 10.255.251.1/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_310_311 + description MLAG_L3_VRF_MULTICAST_DISABLED_310_311 no shutdown mtu 9214 vrf MULTICAST_DISABLED_310_311 ip address 10.255.251.1/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_1_2 + description MLAG_L3_VRF_MULTICAST_ENABLED_1_2 no shutdown mtu 9214 vrf MULTICAST_ENABLED_1_2 ip address 10.255.251.1/31 ! interface Vlan3021 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_3_DISABLED_4 + description MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 no shutdown mtu 9214 vrf MULTICAST_ENABLED_3_DISABLED_4 ip address 10.255.251.1/31 ! interface Vlan3022 - description MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_5_6 + description MLAG_L3_VRF_MULTICAST_DISABLED_5_6 no shutdown mtu 9214 vrf MULTICAST_DISABLED_5_6 ip address 10.255.251.1/31 ! interface Vlan3031 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 ip address 10.255.251.1/31 ! interface Vlan3032 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_DISABLED_330_331 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_DISABLED_330_331 ip address 10.255.251.1/31 ! interface Vlan3040 - description MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + description MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 no shutdown mtu 9214 vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 ip address 10.255.251.1/31 ! interface Vlan3041 - description MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_DISABLED_240_241 + description MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 no shutdown mtu 9214 vrf TEN_D_L3_MULTICAST_DISABLED_240_241 ip address 10.255.251.1/31 ! interface Vlan3050 - description MLAG_PEER_L3_iBGP: vrf TEN_E_PEG_L3_MULTICAST_ENABLED + description MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED no shutdown mtu 9214 vrf TEN_E_PEG_L3_MULTICAST_ENABLED ip address 10.255.251.1/31 ! interface Vlan3051 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_TRANSIT + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_TRANSIT ip address 10.255.251.1/31 ! interface Vlan3054 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE ip address 10.255.251.1/31 ! interface Vlan3059 - description MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + description MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES no shutdown mtu 9214 vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES ip address 10.255.251.1/31 ! interface Vlan3065 - description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131 + description MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 no shutdown mtu 9214 vrf TEN_C_L3_MULTICAST_ENABLED_130_131 ip address 10.255.251.1/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.1/31 pim ipv4 sparse-mode ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -895,13 +895,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan4093 neighbor 172.31.255.2 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.2 remote-as 65001 neighbor 172.31.255.2 description EVPN-MULTICAST-SPINE1_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle MULTICAST_DISABLED_5_6 @@ -1067,7 +1067,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3022 redistribute connected ! vrf MULTICAST_DISABLED_310_311 @@ -1077,7 +1077,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3012 redistribute connected ! vrf MULTICAST_ENABLED_1_2 @@ -1087,7 +1087,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3020 redistribute connected ! vrf MULTICAST_ENABLED_3_DISABLED_4 @@ -1097,7 +1097,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3021 redistribute connected ! vrf MULTICAST_ENABLED_110_111 @@ -1107,7 +1107,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3010 redistribute connected ! vrf MULTICAST_ENABLED_210_DISABLED_211 @@ -1117,7 +1117,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3011 redistribute connected ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 @@ -1127,7 +1127,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3032 redistribute connected ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 @@ -1138,7 +1138,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3065 redistribute connected ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 @@ -1149,7 +1149,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3031 redistribute connected ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 @@ -1159,7 +1159,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3041 redistribute connected ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 @@ -1170,7 +1170,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3040 redistribute connected ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE @@ -1181,7 +1181,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3054 redistribute connected ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES @@ -1194,7 +1194,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3059 redistribute connected ! vrf TEN_E_L3_MULTICAST_TRANSIT @@ -1207,7 +1207,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3051 redistribute connected ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED @@ -1218,7 +1218,7 @@ router bgp 65101 router-id 192.168.255.4 update wait-install neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description EVPN-MULTICAST-L3LEAF1A_Vlan3050 redistribute connected ! router multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg index c6b435caf11..83df62ea8d1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg @@ -216,7 +216,7 @@ vrf instance TEN_E_PEG_L3_MULTICAST_ENABLED description PEG_L3_MULTICAST_ENABLED in Tenant E ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet3 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet3 no shutdown mtu 9214 no switchport @@ -619,7 +619,7 @@ router bgp 65103 neighbor 172.31.255.4 description EVPN-MULTICAST-SPINE1_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg index 0a5de47bdfc..4cb6f7769f5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg @@ -217,7 +217,7 @@ vrf instance TEN_E_PEG_L3_MULTICAST_ENABLED description PEG_L3_MULTICAST_ENABLED in Tenant E ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet4 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet4 no shutdown mtu 9214 no switchport @@ -647,7 +647,7 @@ router bgp 65104 neighbor 172.31.255.6 description EVPN-MULTICAST-SPINE1_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg index d2bab40cee7..8542b148fc5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg @@ -217,7 +217,7 @@ vrf instance TEN_E_PEG_L3_MULTICAST_ENABLED description PEG_L3_MULTICAST_ENABLED in Tenant E ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet5 + description P2P_EVPN-MULTICAST-SPINE1_Ethernet5 no shutdown mtu 9214 no switchport @@ -647,7 +647,7 @@ router bgp 65105 neighbor 172.31.255.8 description EVPN-MULTICAST-SPINE1_Ethernet5 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1 + neighbor 192.168.255.1 description EVPN-MULTICAST-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg index a7ec74eb847..a9731d9edae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-SPINE1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_EVPN-MULTICAST-L3LEAF1A_Ethernet1 + description P2P_EVPN-MULTICAST-L3LEAF1A_Ethernet1 no shutdown mtu 9214 no switchport @@ -30,7 +30,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_EVPN-MULTICAST-L3LEAF1B_Ethernet1 + description P2P_EVPN-MULTICAST-L3LEAF1B_Ethernet1 no shutdown mtu 9214 no switchport @@ -38,7 +38,7 @@ interface Ethernet2 pim ipv4 sparse-mode ! interface Ethernet3 - description P2P_LINK_TO_EVPN-MULTICAST-L3LEAF2A_Ethernet1 + description P2P_EVPN-MULTICAST-L3LEAF2A_Ethernet1 no shutdown mtu 9214 no switchport @@ -46,7 +46,7 @@ interface Ethernet3 pim ipv4 sparse-mode ! interface Ethernet4 - description P2P_LINK_TO_EVPN-MULTICAST-L3LEAF3A_Ethernet1 + description P2P_EVPN-MULTICAST-L3LEAF3A_Ethernet1 no shutdown mtu 9214 no switchport @@ -54,7 +54,7 @@ interface Ethernet4 pim ipv4 sparse-mode ! interface Ethernet5 - description P2P_LINK_TO_EVPN-MULTICAST-L3LEAF3B_Ethernet1 + description P2P_EVPN-MULTICAST-L3LEAF3B_Ethernet1 no shutdown mtu 9214 no switchport @@ -62,7 +62,7 @@ interface Ethernet5 pim ipv4 sparse-mode ! interface Ethernet6 - description P2P_LINK_TO_EVPN-MULTICAST-DISABLED_Ethernet1 + description P2P_EVPN-MULTICAST-DISABLED_Ethernet1 no shutdown mtu 9214 no switchport @@ -129,22 +129,22 @@ router bgp 65001 neighbor 172.31.255.11 description EVPN-MULTICAST-DISABLED_Ethernet1 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description EVPN-MULTICAST-L3LEAF1A + neighbor 192.168.255.3 description EVPN-MULTICAST-L3LEAF1A_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65101 - neighbor 192.168.255.4 description EVPN-MULTICAST-L3LEAF1B + neighbor 192.168.255.4 description EVPN-MULTICAST-L3LEAF1B_Loopback0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65103 - neighbor 192.168.255.5 description EVPN-MULTICAST-L3LEAF2A + neighbor 192.168.255.5 description EVPN-MULTICAST-L3LEAF2A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65104 - neighbor 192.168.255.6 description EVPN-MULTICAST-L3LEAF3A + neighbor 192.168.255.6 description EVPN-MULTICAST-L3LEAF3A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65105 - neighbor 192.168.255.7 description EVPN-MULTICAST-L3LEAF3B + neighbor 192.168.255.7 description EVPN-MULTICAST-L3LEAF3B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65106 - neighbor 192.168.255.8 description EVPN-MULTICAST-DISABLED + neighbor 192.168.255.8 description EVPN-MULTICAST-DISABLED_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1A.cfg index 47092b37676..788d90f9191 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1A.cfg @@ -20,11 +20,11 @@ hostname MLAG_IPV6_L3LEAF1A no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -63,13 +63,13 @@ interface Management1 ip address 192.168.201.116/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -128,7 +128,7 @@ router bgp 65001 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.5 description MLAG_IPV6_L3LEAF1B + neighbor 10.10.224.5 description MLAG_IPV6_L3LEAF1B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1B.cfg index f674845ae51..7c5e45c9c0e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_IPV6_L3LEAF1B.cfg @@ -20,11 +20,11 @@ hostname MLAG_IPV6_L3LEAF1B no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -63,13 +63,13 @@ interface Management1 ip address 192.168.201.117/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -128,7 +128,7 @@ router bgp 65001 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.4 description MLAG_IPV6_L3LEAF1A + neighbor 10.10.224.4 description MLAG_IPV6_L3LEAF1A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1A.cfg index 6be7c97b886..bf35f0d537e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1A.cfg @@ -20,11 +20,11 @@ hostname MLAG_ODD_ID_L3LEAF1A no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -47,7 +47,7 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet10 - description P2P_LINK_TO_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet1 + description P2P_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet1 no shutdown mtu 9214 no switchport @@ -70,13 +70,13 @@ interface Management1 ip address 192.168.201.116/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.2/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -135,7 +135,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.3 description MLAG_ODD_ID_L3LEAF1B + neighbor 10.10.224.3 description MLAG_ODD_ID_L3LEAF1B_Vlan4093 neighbor 10.254.255.250 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.255.250 remote-as 65123 neighbor 10.254.255.250 description P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg index d4ea22aa75c..5343a92b99f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg @@ -20,11 +20,11 @@ hostname MLAG_ODD_ID_L3LEAF1B no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -47,7 +47,7 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet10 - description P2P_LINK_TO_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet2 + description P2P_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet2 no shutdown mtu 9214 no switchport @@ -70,13 +70,13 @@ interface Management1 ip address 192.168.201.117/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.3/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -133,7 +133,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.2 description MLAG_ODD_ID_L3LEAF1A + neighbor 10.10.224.2 description MLAG_ODD_ID_L3LEAF1A_Vlan4093 neighbor 10.254.255.254 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.255.254 remote-as 65123 neighbor 10.254.255.254 description P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg index f6d9f13f3da..3b4cc75fc8a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1A.cfg @@ -23,15 +23,15 @@ vlan 10 name VLAN10 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,20 +78,20 @@ interface Vlan10 ip address virtual 10.10.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST ip address 10.10.224.1/30 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.1/30 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -155,7 +155,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF1B + neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF1B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 10 @@ -178,7 +178,7 @@ router bgp 923 router-id 192.168.255.32 update wait-install neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF1B + neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF1B_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg index 386c5eb0ff2..c8d19975211 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF1B.cfg @@ -23,15 +23,15 @@ vlan 10 name VLAN10 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,20 +78,20 @@ interface Vlan10 ip address virtual 10.10.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST ip address 10.10.224.2/30 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.2/30 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -155,7 +155,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF1A + neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF1A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 10 @@ -178,7 +178,7 @@ router bgp 923 router-id 192.168.255.33 update wait-install neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF1A + neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF1A_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg index 9952b9ce4ed..67bed659e13 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2A.cfg @@ -23,15 +23,15 @@ vlan 10 name VLAN10 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,20 +78,20 @@ interface Vlan10 ip address virtual 10.10.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST ip address 10.10.224.1/30 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.1/30 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -155,7 +155,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF2B + neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF2B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 10 @@ -178,7 +178,7 @@ router bgp 923 router-id 192.168.255.34 update wait-install neighbor 10.10.224.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF2B + neighbor 10.10.224.2 description MLAG_SAME_SUBNET_L3LEAF2B_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg index 81e37c5476e..da55b6769bb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_SAME_SUBNET_L3LEAF2B.cfg @@ -23,15 +23,15 @@ vlan 10 name VLAN10 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,20 +78,20 @@ interface Vlan10 ip address virtual 10.10.10.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST ip address 10.10.224.2/30 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.2/30 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -155,7 +155,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF2A + neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF2A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 10 @@ -178,7 +178,7 @@ router bgp 923 router-id 192.168.255.35 update wait-install neighbor 10.10.224.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF2A + neighbor 10.10.224.1 description MLAG_SAME_SUBNET_L3LEAF2A_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.cfg index dd736189434..f1560daaf2d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.cfg @@ -69,16 +69,16 @@ interface Vxlan1 vxlan source-interface Loopback1 vxlan udp-port 4789 vxlan vlan 2900 vni 12900 - vxlan vlan 2900 flood vtep 192.168.253.2 192.168.253.3 vxlan vlan 2901 vni 12901 - vxlan vlan 2901 flood vtep vxlan vlan 2902 vni 12902 - vxlan vlan 2902 flood vtep 192.168.253.2 vxlan vlan 3900 vni 13900 - vxlan vlan 3900 flood vtep 192.168.253.2 192.168.253.3 vxlan vlan 3901 vni 13901 - vxlan vlan 3901 flood vtep vxlan vlan 3902 vni 13902 + vxlan vlan 2900 flood vtep 192.168.253.2 192.168.253.3 + vxlan vlan 2901 flood vtep + vxlan vlan 2902 flood vtep 192.168.253.2 + vxlan vlan 3900 flood vtep 192.168.253.2 192.168.253.3 + vxlan vlan 3901 flood vtep vxlan vlan 3902 flood vtep 192.168.253.2 ! ip routing diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.cfg index 2531e6e9af8..881e90f9069 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.cfg @@ -69,16 +69,16 @@ interface Vxlan1 vxlan source-interface Loopback1 vxlan udp-port 4789 vxlan vlan 2900 vni 12900 - vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.3 vxlan vlan 2902 vni 12902 - vxlan vlan 2902 flood vtep 192.168.253.1 vxlan vlan 2903 vni 12903 - vxlan vlan 2903 flood vtep 192.168.253.3 vxlan vlan 3900 vni 13900 - vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.3 vxlan vlan 3902 vni 13902 - vxlan vlan 3902 flood vtep 192.168.253.1 vxlan vlan 3903 vni 13903 + vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.3 + vxlan vlan 2902 flood vtep 192.168.253.1 + vxlan vlan 2903 flood vtep 192.168.253.3 + vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.3 + vxlan vlan 3902 flood vtep 192.168.253.1 vxlan vlan 3903 flood vtep 192.168.253.3 ! ip routing diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg index 6cd059eeaef..7aa2f032eb6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.cfg @@ -26,7 +26,7 @@ vlan 2903 name L2VLAN_ON_LEAF2-3 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 3900 @@ -36,11 +36,11 @@ vlan 3903 name SVI_ON_LEAF2-3 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Loopback1 ip address 192.168.253.3/32 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST @@ -92,13 +92,13 @@ interface Vlan3903 vrf TEST ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 192.168.253.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -109,12 +109,12 @@ interface Vxlan1 vxlan source-interface Loopback1 vxlan udp-port 4789 vxlan vlan 2900 vni 12900 - vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 2903 vni 12903 - vxlan vlan 2903 flood vtep 192.168.253.2 192.168.253.3 vxlan vlan 3900 vni 13900 - vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 3903 vni 13903 + vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 + vxlan vlan 2903 flood vtep 192.168.253.2 192.168.253.3 + vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 3903 flood vtep 192.168.253.2 192.168.253.3 ! ip routing @@ -156,7 +156,7 @@ router bgp 65003 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.253.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.253.5 description OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B + neighbor 192.168.253.5 description OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg index fd0002d2480..30726e54f0d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.cfg @@ -26,7 +26,7 @@ vlan 2903 name L2VLAN_ON_LEAF2-3 ! vlan 3000 - name MLAG_iBGP_TEST + name MLAG_L3_VRF_TEST trunk group MLAG ! vlan 3900 @@ -36,11 +36,11 @@ vlan 3903 name SVI_ON_LEAF2-3 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Loopback1 ip address 192.168.253.3/32 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf TEST + description MLAG_L3_VRF_TEST no shutdown mtu 9214 vrf TEST @@ -92,13 +92,13 @@ interface Vlan3903 vrf TEST ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 192.168.253.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -109,12 +109,12 @@ interface Vxlan1 vxlan source-interface Loopback1 vxlan udp-port 4789 vxlan vlan 2900 vni 12900 - vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 2903 vni 12903 - vxlan vlan 2903 flood vtep 192.168.253.2 192.168.253.3 vxlan vlan 3900 vni 13900 - vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 3903 vni 13903 + vxlan vlan 2900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 + vxlan vlan 2903 flood vtep 192.168.253.2 192.168.253.3 + vxlan vlan 3900 flood vtep 192.168.253.1 192.168.253.2 192.168.253.3 vxlan vlan 3903 flood vtep 192.168.253.2 192.168.253.3 ! ip routing @@ -156,7 +156,7 @@ router bgp 65003 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.253.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.253.4 description OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A + neighbor 192.168.253.4 description OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1A.cfg index 4e19f559e2a..b37d6d00cd1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1A.cfg @@ -20,11 +20,11 @@ hostname OVERRIDE_VTEP_L3LEAF1A no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -63,13 +63,13 @@ interface Management1 ip address 192.168.201.116/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -128,7 +128,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.5 description OVERRIDE_VTEP_L3LEAF1B + neighbor 10.10.224.5 description OVERRIDE_VTEP_L3LEAF1B_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1B.cfg index 4f20494ff22..9a6bd2db344 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERRIDE_VTEP_L3LEAF1B.cfg @@ -20,11 +20,11 @@ hostname OVERRIDE_VTEP_L3LEAF1B no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -58,13 +58,13 @@ interface Management1 ip address 192.168.201.117/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.10.224.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -116,7 +116,7 @@ router bgp 923 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.10.224.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.224.4 description OVERRIDE_VTEP_L3LEAF1A + neighbor 10.10.224.4 description OVERRIDE_VTEP_L3LEAF1A_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.cfg index 811e042b5c4..346622f5309 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.cfg @@ -22,14 +22,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_MLAG_ODD_ID_L3LEAF1A_Ethernet10 + description P2P_MLAG_ODD_ID_L3LEAF1A_Ethernet10 no shutdown mtu 9214 no switchport ip address 10.254.255.250/30 ! interface Ethernet2 - description P2P_LINK_TO_MLAG_ODD_ID_L3LEAF1B_Ethernet10 + description P2P_MLAG_ODD_ID_L3LEAF1B_Ethernet10 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0A.cfg index 5b3096e4947..3a61a989613 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0A.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF0A no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -43,7 +43,7 @@ interface Ethernet26 channel-group 25 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0B.cfg index c452d8e0cf0..d154a351c1a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF0B.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF0B no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -89,7 +89,7 @@ interface Ethernet44 channel-group 41 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1A.cfg index 08a752bc78f..dc77193b4c9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1A.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF1A no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -69,7 +69,7 @@ interface Ethernet28 channel-group 28 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1B.cfg index dcb74f4c038..d125a4c0b21 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF1B.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF1B no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -56,7 +56,7 @@ interface Ethernet27 channel-group 27 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2A.cfg index 43b39fc4b15..f603f5e2a2e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2A.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF2A no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -61,7 +61,7 @@ interface Ethernet42 channel-group 41 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2B.cfg index c792444ca9c..065d790c0ba 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SL-LEAF2B.cfg @@ -20,7 +20,7 @@ hostname SL-LEAF2B no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -61,7 +61,7 @@ interface Ethernet42 channel-group 41 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_AUTOGEN_ENGINEID.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_AUTOGEN_ENGINEID.cfg index 32c2d44e132..77f8ff92223 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_AUTOGEN_ENGINEID.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_AUTOGEN_ENGINEID.cfg @@ -20,8 +20,8 @@ hostname SNMP_AUTOGEN_ENGINEID snmp-server engineID local b15232eaf6bc559592706126b70a23d1b83689f0 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS SNMP_AUTOGEN_ENGINEID -snmp-server user usertest-auth-priv usergroup v3 localized b15232eaf6bc559592706126b70a23d1b83689f0 auth sha 60f32944b903a3ce852d06af305ff2ebc2060661 priv aes192 b5a97cab6f9ab410a3d10474fe18f9ee421aa501889bc448 snmp-server user usertest-auth-no-priv usergroup v3 localized b15232eaf6bc559592706126b70a23d1b83689f0 auth sha512 e7eb2e3801626626f7473f38a365b1b4e2973132cab96e1fb1263b56a9d7a597498e9cdc73da6b62bdd850998cfbd609bdf1c1f4bb85af909dba6cea13abd165 +snmp-server user usertest-auth-priv usergroup v3 localized b15232eaf6bc559592706126b70a23d1b83689f0 auth sha 60f32944b903a3ce852d06af305ff2ebc2060661 priv aes192 b5a97cab6f9ab410a3d10474fe18f9ee421aa501889bc448 snmp-server user usertest-no-auth-no-priv usergroup v3 snmp-server user usertest-v2c usergroup v2c ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_1.cfg index e672144fb83..ddac535d821 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_1.cfg @@ -20,8 +20,8 @@ hostname SNMP_SYSTEM_MAC_ENGINEID_1 snmp-server engineID local f5717f42424242424200 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS SNMP_SYSTEM_MAC_ENGINEID_1 -snmp-server user usertest-auth-priv usergroup v3 localized f5717f42424242424200 auth sha 6c3164e279e6606e37028356bfbe9f1d0ad65ec1 priv aes192 cf2421b898bda979625eb46b766dce3e13044c78633b2762 snmp-server user usertest-auth-no-priv usergroup v3 localized f5717f42424242424200 auth sha512 004b542796d9c64301dfba392a9484ef6c5c46e5091ede1551756c71c507cf36e970dda92b250fbbc693162a3c8759e181432ea0d5a08d7492588a16b51c66ee +snmp-server user usertest-auth-priv usergroup v3 localized f5717f42424242424200 auth sha 6c3164e279e6606e37028356bfbe9f1d0ad65ec1 priv aes192 cf2421b898bda979625eb46b766dce3e13044c78633b2762 snmp-server user usertest-no-auth-no-priv usergroup v3 snmp-server user usertest-v2c usergroup v2c ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_2.cfg index efedc36cbfe..12ad45f981e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SNMP_SYSTEM_MAC_ENGINEID_2.cfg @@ -20,8 +20,8 @@ hostname SNMP_SYSTEM_MAC_ENGINEID_2 snmp-server engineID local f5717f1234567890ab00 snmp-server contact example@example.com snmp-server location EOS_DESIGNS_UNIT_TESTS SNMP_SYSTEM_MAC_ENGINEID_2 -snmp-server user usertest-auth-priv usergroup v3 localized f5717f1234567890ab00 auth sha 70aa970bd9af7f0974d6dc42217b8dc1b92926e5 priv aes192 95943c2756fdbb26473d26269ce768c8bef9878ae11ecac6 snmp-server user usertest-auth-no-priv usergroup v3 localized f5717f1234567890ab00 auth sha512 c92079ed25e87b19bb1ad66d0898847dc5801974143e32442e727ba9220db8199d9d5cf099d8b00e202c36b56802c9a592b8d9a83fbc83775a746ef0108bddef +snmp-server user usertest-auth-priv usergroup v3 localized f5717f1234567890ab00 auth sha 70aa970bd9af7f0974d6dc42217b8dc1b92926e5 priv aes192 95943c2756fdbb26473d26269ce768c8bef9878ae11ecac6 snmp-server user usertest-no-auth-no-priv usergroup v3 snmp-server user usertest-v2c usergroup v2c ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1A.cfg index e0b6710193f..7a3a4047d9a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1A.cfg @@ -20,11 +20,11 @@ hostname UNDERLAY-MULTICAST-L3LEAF1A no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -44,7 +44,7 @@ interface Port-Channel6 switchport ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet1 + description P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet1 no shutdown mtu 9214 no switchport @@ -52,7 +52,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet1 + description P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet1 no shutdown mtu 9214 no switchport @@ -98,14 +98,14 @@ interface Management1 ip address 192.168.200.105/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.0/31 pim ipv4 sparse-mode ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -185,7 +185,7 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description UNDERLAY-MULTICAST-L3LEAF1B + neighbor 10.255.251.1 description UNDERLAY-MULTICAST-L3LEAF1B_Vlan4093 neighbor 172.31.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.0 remote-as 65001 neighbor 172.31.255.0 description UNDERLAY-MULTICAST-SPINE1_Ethernet1 @@ -194,10 +194,10 @@ router bgp 65101 neighbor 172.31.255.2 description UNDERLAY-MULTICAST-SPINE2_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1 + neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2 + neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1B.cfg index 31c412a0316..dfebe9a0cee 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF1B.cfg @@ -20,11 +20,11 @@ hostname UNDERLAY-MULTICAST-L3LEAF1B no spanning-tree vlan-id 4093-4094 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -37,7 +37,7 @@ interface Port-Channel3 switchport ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet2 + description P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet2 no shutdown mtu 9214 no switchport @@ -45,7 +45,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet2 + description P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet2 no shutdown mtu 9214 no switchport @@ -82,14 +82,14 @@ interface Management1 ip address 192.168.200.106/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.1/31 pim ipv4 sparse-mode ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -168,7 +168,7 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description UNDERLAY-MULTICAST-L3LEAF1A + neighbor 10.255.251.0 description UNDERLAY-MULTICAST-L3LEAF1A_Vlan4093 neighbor 172.31.255.4 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.4 remote-as 65001 neighbor 172.31.255.4 description UNDERLAY-MULTICAST-SPINE1_Ethernet2 @@ -177,10 +177,10 @@ router bgp 65101 neighbor 172.31.255.6 description UNDERLAY-MULTICAST-SPINE2_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1 + neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2 + neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2A.cfg index d37f36c9f62..b130beac71d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2A.cfg @@ -20,7 +20,7 @@ hostname UNDERLAY-MULTICAST-L3LEAF2A no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -33,7 +33,7 @@ interface Port-Channel3 switchport ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet3 + description P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet3 no shutdown mtu 9214 no switchport @@ -41,7 +41,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet3 + description P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet3 no shutdown mtu 9214 no switchport @@ -78,7 +78,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -158,7 +158,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.252.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.5 description UNDERLAY-MULTICAST-L3LEAF2B + neighbor 10.255.252.5 description UNDERLAY-MULTICAST-L3LEAF2B_Vlan4094 neighbor 172.31.255.8 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.8 remote-as 65001 neighbor 172.31.255.8 description UNDERLAY-MULTICAST-SPINE1_Ethernet3 @@ -167,10 +167,10 @@ router bgp 65102 neighbor 172.31.255.10 description UNDERLAY-MULTICAST-SPINE2_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1 + neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2 + neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2B.cfg index d353addbf1d..09058dd47bb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-L3LEAF2B.cfg @@ -20,7 +20,7 @@ hostname UNDERLAY-MULTICAST-L3LEAF2B no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -33,7 +33,7 @@ interface Port-Channel3 switchport ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet4 + description P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet4 no shutdown mtu 9214 no switchport @@ -41,7 +41,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet4 + description P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet4 no shutdown mtu 9214 no switchport @@ -78,7 +78,7 @@ interface Management1 ip address 192.168.200.108/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -158,7 +158,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.252.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.4 description UNDERLAY-MULTICAST-L3LEAF2A + neighbor 10.255.252.4 description UNDERLAY-MULTICAST-L3LEAF2A_Vlan4094 neighbor 172.31.255.12 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.12 remote-as 65001 neighbor 172.31.255.12 description UNDERLAY-MULTICAST-SPINE1_Ethernet4 @@ -167,10 +167,10 @@ router bgp 65102 neighbor 172.31.255.14 description UNDERLAY-MULTICAST-SPINE2_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1 + neighbor 192.168.255.1 description UNDERLAY-MULTICAST-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2 + neighbor 192.168.255.2 description UNDERLAY-MULTICAST-SPINE2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE1.cfg index 5fcc24f1e04..883acb0e217 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet1 + description P2P_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet1 no shutdown mtu 9214 no switchport @@ -30,7 +30,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet1 + description P2P_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet1 no shutdown mtu 9214 no switchport @@ -38,7 +38,7 @@ interface Ethernet2 pim ipv4 sparse-mode ! interface Ethernet3 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet1 + description P2P_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet1 no shutdown mtu 9214 no switchport @@ -46,7 +46,7 @@ interface Ethernet3 pim ipv4 sparse-mode ! interface Ethernet4 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet1 + description P2P_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet1 no shutdown mtu 9214 no switchport @@ -119,16 +119,16 @@ router bgp 65001 neighbor 172.31.255.13 description UNDERLAY-MULTICAST-L3LEAF2B_Ethernet1 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description UNDERLAY-MULTICAST-L3LEAF1A + neighbor 192.168.255.3 description UNDERLAY-MULTICAST-L3LEAF1A_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65101 - neighbor 192.168.255.4 description UNDERLAY-MULTICAST-L3LEAF1B + neighbor 192.168.255.4 description UNDERLAY-MULTICAST-L3LEAF1B_Loopback0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65102 - neighbor 192.168.255.5 description UNDERLAY-MULTICAST-L3LEAF2A + neighbor 192.168.255.5 description UNDERLAY-MULTICAST-L3LEAF2A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description UNDERLAY-MULTICAST-L3LEAF2B + neighbor 192.168.255.6 description UNDERLAY-MULTICAST-L3LEAF2B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE2.cfg index 4ecd8c7eefe..386ab94cae2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY-MULTICAST-SPINE2.cfg @@ -22,28 +22,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet2 + description P2P_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.31.255.2/31 ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet2 + description P2P_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.31.255.6/31 ! interface Ethernet3 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet2 + description P2P_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.31.255.10/31 ! interface Ethernet4 - description P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet2 + description P2P_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet2 no shutdown mtu 9214 no switchport @@ -103,16 +103,16 @@ router bgp 65001 neighbor 172.31.255.15 description UNDERLAY-MULTICAST-L3LEAF2B_Ethernet2 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description UNDERLAY-MULTICAST-L3LEAF1A + neighbor 192.168.255.3 description UNDERLAY-MULTICAST-L3LEAF1A_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65101 - neighbor 192.168.255.4 description UNDERLAY-MULTICAST-L3LEAF1B + neighbor 192.168.255.4 description UNDERLAY-MULTICAST-L3LEAF1B_Loopback0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65102 - neighbor 192.168.255.5 description UNDERLAY-MULTICAST-L3LEAF2A + neighbor 192.168.255.5 description UNDERLAY-MULTICAST-L3LEAF2A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description UNDERLAY-MULTICAST-L3LEAF2B + neighbor 192.168.255.6 description UNDERLAY-MULTICAST-L3LEAF2B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.cfg index 7b6d51c9734..ef7d93aa0f6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.cfg @@ -20,14 +20,14 @@ hostname UNDERLAY_FILTER_PEER_AS_L3LEAF1 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_SPINE1_Ethernet1 + description P2P_UNDERLAY_FILTER_PEER_AS_SPINE1_Ethernet1 no shutdown mtu 9214 no switchport ip address 192.168.0.1/31 ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_SPINE2_Ethernet1 + description P2P_UNDERLAY_FILTER_PEER_AS_SPINE2_Ethernet1 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE1.cfg index a8c513a66ad..390e979778e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet1 + description P2P_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet1 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE2.cfg index c0b5b097e79..76cf2ceeb9f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UNDERLAY_FILTER_PEER_AS_SPINE2.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet2 + description P2P_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet2 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.cfg index ed991532e60..625e7197953 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.cfg @@ -22,7 +22,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 16384 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Management1 ip address 192.168.201.201/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.cfg index 0cd78295a95..3c584f9e343 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.cfg @@ -22,7 +22,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 16384 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -75,7 +75,7 @@ interface Management1 ip address 192.168.201.201/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.cfg index 0201f8a3692..f6ddbe6fde1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -50,7 +50,7 @@ interface Port-Channel5 storm-control unknown-unicast level 25 ! interface Ethernet1 - description P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet1 + description P2P_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet1 no shutdown mtu 9214 no switchport @@ -94,7 +94,7 @@ interface Management1 ip address 192.168.200.105/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.0/31 @@ -162,13 +162,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.1 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B + neighbor 10.255.251.1 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Vlan4093 neighbor 172.31.255.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.0 remote-as 65001 neighbor 172.31.255.0 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 + neighbor 192.168.255.1 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.cfg index 9ea01cd564c..53a23502c52 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.cfg @@ -22,11 +22,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -50,7 +50,7 @@ interface Port-Channel5 storm-control unknown-unicast level 25 ! interface Ethernet1 - description P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet2 + description P2P_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet2 no shutdown mtu 9214 no switchport @@ -94,7 +94,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.251.1/31 @@ -162,13 +162,13 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.0 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A + neighbor 10.255.251.0 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Vlan4093 neighbor 172.31.255.2 peer group IPv4-UNDERLAY-PEERS neighbor 172.31.255.2 remote-as 65001 neighbor 172.31.255.2 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 + neighbor 192.168.255.1 description UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.cfg index 8e5e92dd376..c74097096da 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Ethernet1 + description P2P_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Ethernet1 no shutdown mtu 9214 no switchport @@ -30,7 +30,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Ethernet1 + description P2P_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Ethernet1 no shutdown mtu 9214 no switchport @@ -85,10 +85,10 @@ router bgp 65001 neighbor 172.31.255.3 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Ethernet1 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65101 - neighbor 192.168.255.3 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A + neighbor 192.168.255.3 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65101 - neighbor 192.168.255.4 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B + neighbor 192.168.255.4 description UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_LEAF1.cfg index a799543e10d..2ff353f4b85 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_LEAF1.cfg @@ -36,7 +36,7 @@ interface Port-Channel51 switchport ! interface Ethernet1 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1 + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1 no shutdown mtu 9214 mac security profile TEST @@ -44,7 +44,7 @@ interface Ethernet1 ip address 10.42.42.9/31 ! interface Ethernet1.42 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.42_vrf_PROD + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.42_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 42 @@ -52,7 +52,7 @@ interface Ethernet1.42 ip address 10.42.42.9/31 ! interface Ethernet1.66 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.66_vrf_ONLY-ON-L2LEAF + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.66_VRF_ONLY-ON-L2LEAF no shutdown mtu 9214 encapsulation dot1q vlan 66 @@ -60,7 +60,7 @@ interface Ethernet1.66 ip address 10.42.42.9/31 ! interface Ethernet2 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2 + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2 no shutdown mtu 9214 mac security profile TEST @@ -68,7 +68,7 @@ interface Ethernet2 ip address 10.42.42.11/31 ! interface Ethernet2.42 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.42_vrf_PROD + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.42_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 42 @@ -76,7 +76,7 @@ interface Ethernet2.42 ip address 10.42.42.11/31 ! interface Ethernet2.100 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.100_vrf_IT + description P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.100_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE1.cfg index 7be97e113a7..6295c4cfbe2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE1.cfg @@ -26,7 +26,7 @@ vrf instance ONLY-ON-L2LEAF vrf instance PROD ! interface Ethernet1 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1 + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1 no shutdown mtu 9214 mac security profile TEST @@ -34,7 +34,7 @@ interface Ethernet1 ip address 10.42.42.8/31 ! interface Ethernet1.42 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.42_vrf_PROD + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.42_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 42 @@ -42,7 +42,7 @@ interface Ethernet1.42 ip address 10.42.42.8/31 ! interface Ethernet1.66 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.66_vrf_ONLY-ON-L2LEAF + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.66_VRF_ONLY-ON-L2LEAF no shutdown mtu 9214 encapsulation dot1q vlan 66 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE2.cfg index 68b22b0952b..43dbc5d3f99 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/UPLINK_P2P_VRFS_TESTS_SPINE2.cfg @@ -26,7 +26,7 @@ vrf instance MGMT vrf instance PROD ! interface Ethernet2 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2 + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2 no shutdown mtu 9214 mac security profile TEST @@ -34,7 +34,7 @@ interface Ethernet2 ip address 10.42.42.10/31 ! interface Ethernet2.42 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.42_vrf_PROD + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.42_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 42 @@ -42,7 +42,7 @@ interface Ethernet2.42 ip address 10.42.42.10/31 ! interface Ethernet2.100 - description P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.100_vrf_IT + description P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.100_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 100 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg index 89d99295432..db66de6884d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg @@ -21,11 +21,11 @@ spanning-tree mode none no spanning-tree vlan-id 4093-4094 ! vlan 3099 - name MLAG_iBGP_default + name MLAG_L3_VRF_default trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -59,14 +59,14 @@ interface Management1 ip address 10.1.1.1/24 ! interface Vlan3099 - description MLAG_PEER_L3_iBGP: vrf default + description MLAG_L3_VRF_default no shutdown mtu 9214 vrf default ip address 10.10.20.0/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -107,7 +107,8 @@ router bgp 65001 neighbor MYPEERGROUP bfd neighbor 10.10.1.2 peer group MYPEERGROUP neighbor 10.10.20.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.10.20.1 description bgp-from-network-services-2 + neighbor 10.10.20.1 description bgp-from-network-services-2_Vlan3099 + redistribute connected ! address-family ipv4 neighbor MLAG-IPv4-UNDERLAY-PEER activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-2.cfg index 54af2106cf1..48111197c37 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-2.cfg @@ -21,7 +21,7 @@ spanning-tree mode none no spanning-tree vlan-id 4093-4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -50,7 +50,7 @@ interface Management1 ip address 10.1.1.2/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg index d02b94d1e70..e076b475af4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-1.cfg @@ -20,7 +20,7 @@ hostname bgp-peer-groups-1 no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Loopback1 ip address 192.168.254.111/32 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -122,9 +122,9 @@ router bgp 65001 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.253.205 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.253.205 description bgp-peer-groups-2 + neighbor 192.168.253.205 description bgp-peer-groups-2_Vlan4094 neighbor 192.168.255.112 peer group EVPN-OVERLAY-PEERS - neighbor 192.168.255.112 description bgp-peer-groups-2 + neighbor 192.168.255.112 description bgp-peer-groups-2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg index 1c76a16ab11..bdc82b4845b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-peer-groups-2.cfg @@ -20,7 +20,7 @@ hostname bgp-peer-groups-2 no spanning-tree vlan-id 4094 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Loopback1 ip address 192.168.254.111/32 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -120,9 +120,9 @@ router bgp 65001 neighbor RR-OVERLAY-PEERS send-community neighbor RR-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.253.204 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 192.168.253.204 description bgp-peer-groups-1 + neighbor 192.168.253.204 description bgp-peer-groups-1_Vlan4094 neighbor 192.168.255.111 peer group EVPN-OVERLAY-PEERS - neighbor 192.168.255.111 description bgp-peer-groups-1 + neighbor 192.168.255.111 description bgp-peer-groups-1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg index 32c2f15e4ef..82d149ab502 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg @@ -39,8 +39,44 @@ interface Port-Channel12 isis authentication mode md5 isis authentication key 7 $1c$sTNAlR6rKSw= ! +interface Port-Channel14 + description CUSTOM_DESCRIPTION_ON_P2P_PORT_CHANNEL_14 + no shutdown + mtu 1500 + no switchport + ip address 100.64.48.16/31 + ipv6 enable + mpls ip + mpls ldp interface + mpls ldp igp sync + isis enable CORE + isis circuit-type level-2 + isis metric 60 + isis network point-to-point + no isis hello padding + isis authentication mode md5 + isis authentication key 7 $1c$sTNAlR6rKSw= +! +interface Port-Channel16 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_A + no shutdown + mtu 1500 + no switchport + ip address 100.64.48.16/31 + ipv6 enable + mpls ip + mpls ldp interface + mpls ldp igp sync + isis enable CORE + isis circuit-type level-2 + isis metric 60 + isis network point-to-point + no isis hello padding + isis authentication mode md5 + isis authentication key 7 $1c$sTNAlR6rKSw= +! interface Ethernet1 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet1 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet1 no shutdown mtu 1500 speed forced 1000full @@ -59,7 +95,7 @@ interface Ethernet1 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet2 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet2 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet2 no shutdown mtu 1601 speed 100full @@ -76,7 +112,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet3 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet3 no shutdown mtu 1500 speed forced 1000full @@ -95,7 +131,7 @@ interface Ethernet3 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet4 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet4 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet4 no shutdown mtu 1500 speed forced 1000full @@ -111,7 +147,7 @@ interface Ethernet4 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet5 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet5 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet5 no shutdown mtu 1500 speed forced 1000full @@ -148,7 +184,7 @@ interface Ethernet6 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface Ethernet10 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet10 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet10 no shutdown mtu 1500 speed forced 1000full @@ -164,19 +200,43 @@ interface Ethernet10 isis network point-to-point ! interface Ethernet12 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet12 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet12 no shutdown speed forced 1000full channel-group 12 mode active ! interface Ethernet13 - description P2P_LINK_TO_core-2-ospf-ldp_Ethernet13 + description P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet13 no shutdown speed forced 1000full channel-group 12 mode active ! +interface Ethernet14 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_A + no shutdown + speed forced 1000full + channel-group 14 mode active +! +interface Ethernet15 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_A + no shutdown + speed forced 1000full + channel-group 14 mode active +! +interface Ethernet16 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_A + no shutdown + speed forced 1000full + channel-group 16 mode active +! +interface Ethernet17 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_A + no shutdown + speed forced 1000full + channel-group 16 mode active +! interface ethernet21 - description P2P_LINK_TO_peer2_ethernet21 + description P2P_LINK_TO_PEER2_ethernet21 no shutdown mtu 1600 no switchport @@ -188,7 +248,7 @@ interface ethernet21 isis network point-to-point ! interface ethernet22 - description P2P_LINK_TO_peer3_ethernet22 + description P2P_LINK_TO_PEER3_ethernet22 no shutdown mtu 1600 no switchport @@ -196,7 +256,7 @@ interface ethernet22 mpls ip ! interface ethernet23 - description P2P_LINK_TO_peer4_ethernet23 + description P2P_LINK_TO_PEER4_ethernet23 no shutdown mtu 1600 no switchport @@ -204,7 +264,7 @@ interface ethernet23 mpls ip ! interface ethernet24 - description P2P_LINK_TO_peer5_ethernet22 + description P2P_LINK_TO_PEER5_ethernet22 no shutdown mtu 1600 no switchport @@ -212,7 +272,7 @@ interface ethernet24 mpls ip ! interface ethernet25 - description P2P_LINK_TO_peer6_ethernet23 + description P2P_LINK_TO_PEER6_ethernet23 no shutdown mtu 1600 no switchport @@ -240,10 +300,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.1 mpls ip ! mpls ldp - interface disabled default router-id 10.0.0.1 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0100.0000.0001.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg index 60df8bb966a..027509ddeae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg @@ -34,8 +34,34 @@ interface Port-Channel12 mpls ldp interface mpls ldp igp sync ! +interface Port-Channel14 + description CUSTOM_DESCRIPTION_ON_P2P_PORT_CHANNEL_14 + no shutdown + mtu 1500 + no switchport + ip address 100.64.48.17/31 + ipv6 enable + ip ospf network point-to-point + ip ospf area 0.0.0.0 + mpls ip + mpls ldp interface + mpls ldp igp sync +! +interface Port-Channel16 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_B + no shutdown + mtu 1500 + no switchport + ip address 100.64.48.17/31 + ipv6 enable + ip ospf network point-to-point + ip ospf area 0.0.0.0 + mpls ip + mpls ldp interface + mpls ldp igp sync +! interface Ethernet1 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet1 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet1 no shutdown mtu 1500 speed forced 1000full @@ -49,7 +75,7 @@ interface Ethernet1 ip ospf area 0.0.0.0 ! interface Ethernet2 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet2 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet2 no shutdown mtu 1601 speed 100full @@ -63,7 +89,7 @@ interface Ethernet2 service-profile test_qos_profile ! interface Ethernet3 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet3 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet3 no shutdown mtu 1500 speed forced 1000full @@ -77,7 +103,7 @@ interface Ethernet3 ip ospf area 0.0.0.0 ! interface Ethernet4 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet4 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet4 no shutdown mtu 1500 speed forced 1000full @@ -88,7 +114,7 @@ interface Ethernet4 ip ospf area 0.0.0.0 ! interface Ethernet5 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet5 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet5 no shutdown mtu 1500 speed forced 1000full @@ -115,7 +141,7 @@ interface Ethernet6 service-profile test_qos_profile ! interface Ethernet10 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet10 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet10 no shutdown mtu 1500 speed forced 1000full @@ -128,17 +154,41 @@ interface Ethernet10 ip ospf area 0.0.0.0 ! interface Ethernet12 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet12 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet12 no shutdown speed forced 1000full channel-group 12 mode active ! interface Ethernet13 - description P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet13 + description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet13 no shutdown speed forced 1000full channel-group 12 mode active ! +interface Ethernet14 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_B + no shutdown + speed forced 1000full + channel-group 14 mode active +! +interface Ethernet15 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_B + no shutdown + speed forced 1000full + channel-group 14 mode active +! +interface Ethernet16 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_B + no shutdown + speed forced 1000full + channel-group 16 mode active +! +interface Ethernet17 + description CUSTOM_DESCRIPTION_ON_P2P_LINK_B + no shutdown + speed forced 1000full + channel-group 16 mode active +! interface Loopback0 description ROUTER_ID no shutdown @@ -157,10 +207,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.1 mpls ip ! mpls ldp - interface disabled default router-id 10.0.0.2 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router ospf 101 router-id 10.0.0.2 @@ -173,6 +223,8 @@ router ospf 101 no passive-interface Ethernet6 no passive-interface Ethernet10 no passive-interface Port-Channel12 + no passive-interface Port-Channel14 + no passive-interface Port-Channel16 bfd default max-lsa 12000 ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-3-isis-sr-ldp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-3-isis-sr-ldp.cfg index a41bc515a5f..4260ac58b44 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-3-isis-sr-ldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-3-isis-sr-ldp.cfg @@ -42,10 +42,10 @@ ip route vrf MGMT 0.0.0.0/0 192.168.0.1 mpls ip ! mpls ldp - interface disabled default router-id 10.0.0.3 - no shutdown transport-address interface Loopback0 + interface disabled default + no shutdown ! router isis CORE net 49.0001.0100.0000.0003.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-4-multicast.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-4-multicast.cfg index f910fae2bfa..dc4d986834c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-4-multicast.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-4-multicast.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_peer1_Ethernet1 + description P2P_LINK_TO_PEER1_Ethernet1 no shutdown mtu 1600 no switchport @@ -31,7 +31,7 @@ interface Ethernet1 pim ipv4 sparse-mode ! interface Ethernet2 - description P2P_LINK_TO_peer2_Ethernet2 + description P2P_LINK_TO_PEER2_Ethernet2 no shutdown mtu 1600 no switchport @@ -39,7 +39,7 @@ interface Ethernet2 mpls ip ! interface Ethernet3 - description P2P_LINK_TO_peer3_Ethernet3 + description P2P_LINK_TO_PEER3_Ethernet3 no shutdown mtu 1600 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg index 375dd3502fd..160b17172d0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg @@ -92,8 +92,8 @@ router path-selection ipv4 address 10.9.9.9 ! load-balance policy LB-CUSTOM-CP-POLICY - hop count lowest jitter 5 + hop count lowest path-group INET ! load-balance policy LB-DEFAULT-POLICY-DEFAULT @@ -269,13 +269,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 neighbor IPv4-UNDERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg index 6934e4bc4f7..8c62ff5a847 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg @@ -92,8 +92,8 @@ router path-selection ipv4 address 10.9.9.9 ! load-balance policy LB-CUSTOM-CP-POLICY - hop count lowest jitter 5 + hop count lowest path-group INET ! load-balance policy LB-DEFAULT-POLICY-DEFAULT @@ -269,13 +269,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 neighbor IPv4-UNDERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg index a5f7a956093..6d8ce2ae484 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg @@ -92,8 +92,8 @@ router path-selection ipv4 address 10.9.9.9 ! load-balance policy LB-CUSTOM-CP-POLICY - hop count lowest jitter 5 + hop count lowest path-group INET ! load-balance policy LB-DEFAULT-POLICY-DEFAULT @@ -233,13 +233,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 neighbor IPv4-UNDERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg index 0f227436159..1d6aab4a375 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg @@ -109,8 +109,8 @@ router path-selection path-group Satellite id 104 ! load-balance policy LB-CUSTOM-CP-POLICY - hop count lowest jitter 5 + hop count lowest path-group INET path-group LAN_HA path-group MPLS priority 2 @@ -288,12 +288,14 @@ router bgp 65000 neighbor WAN-RR-OVERLAY-PEERS send-community neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-RR-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor WAN-RR-OVERLAY-PEERS activate + neighbor WAN-RR-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg index 3ac3fb3cf15..667f486c5d4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg @@ -253,13 +253,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg index c7460a3d40a..9118cdf8b99 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg @@ -245,13 +245,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg index a932624481e..8396cf7c5c7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg @@ -125,28 +125,27 @@ router adaptive-virtual-topology avt profile PROD-AVT-POLICY-MPLS-ONLY id 5 ! router internet-exit - ! - exit-group DIRECT-EXIT-POLICY-1 - local connection IE-Ethernet2 - local connection IE-Ethernet2_1 - ! - exit-group ZSCALER-EXIT-POLICY-1_PRI - local connection IE-Tunnel100 - ! - exit-group ZSCALER-EXIT-POLICY-1_SEC - local connection IE-Tunnel101 - ! - exit-group ZSCALER-EXIT-POLICY-1_TER - local connection IE-Tunnel102 - ! - policy DIRECT-EXIT-POLICY-1 - exit-group DIRECT-EXIT-POLICY-1 - ! - policy ZSCALER-EXIT-POLICY-1 - exit-group ZSCALER-EXIT-POLICY-1_PRI - exit-group ZSCALER-EXIT-POLICY-1_SEC - exit-group ZSCALER-EXIT-POLICY-1_TER - exit-group system-default-exit-group + exit-group DIRECT-EXIT-POLICY-1 + local connection IE-Ethernet2 + local connection IE-Ethernet2_1 + ! + exit-group ZSCALER-EXIT-POLICY-1_PRI + local connection IE-Tunnel100 + ! + exit-group ZSCALER-EXIT-POLICY-1_SEC + local connection IE-Tunnel101 + ! + exit-group ZSCALER-EXIT-POLICY-1_TER + local connection IE-Tunnel102 + ! + policy DIRECT-EXIT-POLICY-1 + exit-group DIRECT-EXIT-POLICY-1 + ! + policy ZSCALER-EXIT-POLICY-1 + exit-group ZSCALER-EXIT-POLICY-1_PRI + exit-group ZSCALER-EXIT-POLICY-1_SEC + exit-group ZSCALER-EXIT-POLICY-1_TER + exit-group system-default-exit-group ! router path-selection tcp mss ceiling ipv4 ingress @@ -218,8 +217,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group MPLS path-group INET priority 2 ! @@ -341,14 +340,14 @@ interface Ethernet3 ip address 172.20.20.20/31 ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1 + description P2P_site-ha-disabled-leaf_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.17.0.1/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.142_vrf_PROD + description P2P_site-ha-disabled-leaf_Ethernet1.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -356,7 +355,7 @@ interface Ethernet52.142 ip address 172.17.0.1/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-disabled-leaf_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -364,7 +363,7 @@ interface Ethernet52.666 ip address 172.17.0.1/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.1000_vrf_IT + description P2P_site-ha-disabled-leaf_Ethernet1.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -613,7 +612,7 @@ router bgp 65000 neighbor 172.17.0.0 remote-as 65199 neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1 neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP redistribute static route-map RM-STATIC-2-BGP ! @@ -621,6 +620,7 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 neighbor IPv4-UNDERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg index d176217eb9d..398257ff642 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg @@ -119,41 +119,40 @@ router adaptive-virtual-topology avt profile PROD-AVT-POLICY-VIDEO id 4 ! router internet-exit - ! - exit-group DIRECT-EXIT-POLICY-1 - local connection IE-Ethernet3 - ! - exit-group ZSCALER-EXIT-POLICY-1_PRI - local connection IE-Tunnel100 - ! - exit-group ZSCALER-EXIT-POLICY-1_SEC - local connection IE-Tunnel101 - ! - exit-group ZSCALER-EXIT-POLICY-1_TER - local connection IE-Tunnel102 - ! - exit-group ZSCALER-EXIT-POLICY-2_PRI - local connection IE-Tunnel110 - ! - exit-group ZSCALER-EXIT-POLICY-2_SEC - local connection IE-Tunnel111 - ! - exit-group ZSCALER-EXIT-POLICY-2_TER - local connection IE-Tunnel112 - ! - policy DIRECT-EXIT-POLICY-1 - exit-group DIRECT-EXIT-POLICY-1 - ! - policy ZSCALER-EXIT-POLICY-1 - exit-group ZSCALER-EXIT-POLICY-1_PRI - exit-group ZSCALER-EXIT-POLICY-1_SEC - exit-group ZSCALER-EXIT-POLICY-1_TER - exit-group system-default-exit-group - ! - policy ZSCALER-EXIT-POLICY-2 - exit-group ZSCALER-EXIT-POLICY-2_PRI - exit-group ZSCALER-EXIT-POLICY-2_SEC - exit-group ZSCALER-EXIT-POLICY-2_TER + exit-group DIRECT-EXIT-POLICY-1 + local connection IE-Ethernet3 + ! + exit-group ZSCALER-EXIT-POLICY-1_PRI + local connection IE-Tunnel100 + ! + exit-group ZSCALER-EXIT-POLICY-1_SEC + local connection IE-Tunnel101 + ! + exit-group ZSCALER-EXIT-POLICY-1_TER + local connection IE-Tunnel102 + ! + exit-group ZSCALER-EXIT-POLICY-2_PRI + local connection IE-Tunnel110 + ! + exit-group ZSCALER-EXIT-POLICY-2_SEC + local connection IE-Tunnel111 + ! + exit-group ZSCALER-EXIT-POLICY-2_TER + local connection IE-Tunnel112 + ! + policy DIRECT-EXIT-POLICY-1 + exit-group DIRECT-EXIT-POLICY-1 + ! + policy ZSCALER-EXIT-POLICY-1 + exit-group ZSCALER-EXIT-POLICY-1_PRI + exit-group ZSCALER-EXIT-POLICY-1_SEC + exit-group ZSCALER-EXIT-POLICY-1_TER + exit-group system-default-exit-group + ! + policy ZSCALER-EXIT-POLICY-2 + exit-group ZSCALER-EXIT-POLICY-2_PRI + exit-group ZSCALER-EXIT-POLICY-2_SEC + exit-group ZSCALER-EXIT-POLICY-2_TER ! router path-selection tcp mss ceiling ipv4 ingress @@ -212,8 +211,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group INET priority 2 ! router service-insertion @@ -369,14 +368,14 @@ interface Ethernet5 dhcp client accept default-route ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2 + description P2P_site-ha-disabled-leaf_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.17.0.3/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.142_vrf_PROD + description P2P_site-ha-disabled-leaf_Ethernet2.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -384,7 +383,7 @@ interface Ethernet52.142 ip address 172.17.0.3/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-disabled-leaf_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -392,7 +391,7 @@ interface Ethernet52.666 ip address 172.17.0.3/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.1000_vrf_IT + description P2P_site-ha-disabled-leaf_Ethernet2.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -678,15 +677,16 @@ router bgp 65000 neighbor 172.29.0.13 route-map RM-BGP-172.29.0.13-IN in neighbor 172.29.0.13 route-map RM-BGP-172.29.0.13-OUT out neighbor 192.168.144.2 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.2 description cv-pathfinder-pathfinder1 + neighbor 192.168.144.2 description cv-pathfinder-pathfinder1_Dps1 neighbor 192.168.144.3 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.3 description cv-pathfinder-pathfinder2 + neighbor 192.168.144.3 description cv-pathfinder-pathfinder2_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 neighbor IPv4-UNDERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg index ac913fd1e30..ec77e2adc8e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg @@ -173,8 +173,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group INET priority 2 ! @@ -243,14 +243,14 @@ interface Ethernet1 dhcp client accept default-route ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1 + description P2P_site-ha-enabled-leaf2A_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.17.0.5/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.142_vrf_PROD + description P2P_site-ha-enabled-leaf2A_Ethernet1.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -258,7 +258,7 @@ interface Ethernet52.142 ip address 172.17.0.5/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf2A_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -266,7 +266,7 @@ interface Ethernet52.666 ip address 172.17.0.5/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.1000_vrf_IT + description P2P_site-ha-enabled-leaf2A_Ethernet1.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -274,14 +274,14 @@ interface Ethernet52.1000 ip address 172.17.0.5/31 ! interface Ethernet53 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1 + description P2P_site-ha-enabled-leaf2B_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.17.0.7/31 ! interface Ethernet53.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.142_vrf_PROD + description P2P_site-ha-enabled-leaf2B_Ethernet1.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -289,7 +289,7 @@ interface Ethernet53.142 ip address 172.17.0.7/31 ! interface Ethernet53.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf2B_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -297,7 +297,7 @@ interface Ethernet53.666 ip address 172.17.0.7/31 ! interface Ethernet53.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.1000_vrf_IT + description P2P_site-ha-enabled-leaf2B_Ethernet1.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -477,14 +477,16 @@ router bgp 65000 neighbor 192.168.142.3 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.142.3 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor 192.168.142.3 activate + neighbor 192.168.142.3 encapsulation path-selection neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg index a6686ae6fd9..1e0ccfefbe7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg @@ -174,8 +174,8 @@ router path-selection path-group MPLS ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group CUSTOM_LAN_HA path-group MPLS ! @@ -228,14 +228,14 @@ interface Ethernet2 ip address 172.15.6.6/31 ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2 + description P2P_site-ha-enabled-leaf2A_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.17.0.9/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.142_vrf_PROD + description P2P_site-ha-enabled-leaf2A_Ethernet2.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -243,7 +243,7 @@ interface Ethernet52.142 ip address 172.17.0.9/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf2A_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -251,7 +251,7 @@ interface Ethernet52.666 ip address 172.17.0.9/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.1000_vrf_IT + description P2P_site-ha-enabled-leaf2A_Ethernet2.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -259,14 +259,14 @@ interface Ethernet52.1000 ip address 172.17.0.9/31 ! interface Ethernet53 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2 + description P2P_site-ha-enabled-leaf2B_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.17.0.11/31 ! interface Ethernet53.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.142_vrf_PROD + description P2P_site-ha-enabled-leaf2B_Ethernet2.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -274,7 +274,7 @@ interface Ethernet53.142 ip address 172.17.0.11/31 ! interface Ethernet53.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf2B_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -282,7 +282,7 @@ interface Ethernet53.666 ip address 172.17.0.11/31 ! interface Ethernet53.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.1000_vrf_IT + description P2P_site-ha-enabled-leaf2B_Ethernet2.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -462,14 +462,16 @@ router bgp 65000 neighbor 192.168.142.2 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.142.2 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation vxlan neighbor 192.168.142.2 activate + neighbor 192.168.142.2 encapsulation vxlan neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg index 8e053582629..23fc3ec5752 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg @@ -127,7 +127,7 @@ router path-selection ! peer static router-ip 192.168.142.7 name cv-pathfinder-edge3B - ipv4 address 10.10.10.1 + ipv4 address 10.10.10.2 ! load-balance policy LB-DEFAULT-AVT-POLICY-CONTROL-PLANE path-group INET @@ -154,8 +154,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group INET priority 2 ! @@ -222,11 +222,12 @@ interface Ethernet1 dhcp client accept default-route ! interface Ethernet52 - description DIRECT LAN HA LINK + description WAN_HA_cv-pathfinder-edge3B_Ethernet52 no shutdown mtu 9100 no switchport - ip address 10.10.10.0/31 + flow tracker hardware FLOW-TRACKER + ip address 10.10.10.1/24 ! interface Loopback0 description ROUTER_ID @@ -371,14 +372,16 @@ router bgp 65000 neighbor 192.168.142.7 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.142.7 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor 192.168.142.7 activate + neighbor 192.168.142.7 encapsulation path-selection neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg index afb6f3d38a7..d41fcd8b64b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg @@ -114,7 +114,7 @@ router path-selection ! peer static router-ip 192.168.142.6 name cv-pathfinder-edge3A - ipv4 address 10.10.10.0 + ipv4 address 10.10.10.1 ! path-group MPLS id 100 keepalive interval 300 milliseconds failure-threshold 5 intervals @@ -155,8 +155,8 @@ router path-selection path-group MPLS ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS ! @@ -222,11 +222,12 @@ interface Ethernet2 ip address 172.15.6.6/31 ! interface Ethernet52 - description DIRECT LAN HA LINK + description WAN_HA_cv-pathfinder-edge3A_Ethernet52 no shutdown mtu 9100 no switchport - ip address 10.10.10.1/31 + flow tracker hardware FLOW-TRACKER + ip address 10.10.10.2/24 ! interface Loopback0 description ROUTER_ID @@ -371,14 +372,16 @@ router bgp 65000 neighbor 192.168.142.6 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.142.6 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor 192.168.142.6 activate + neighbor 192.168.142.6 encapsulation path-selection neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4A.cfg new file mode 100644 index 00000000000..0cfb90d6f40 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4A.cfg @@ -0,0 +1,445 @@ +! +no enable password +no aaa root +! +agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP=1 +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +! +flow tracking hardware + tracker FLOW-TRACKER + record export on inactive timeout 70000 + record export on interval 300000 + exporter CV-TELEMETRY + collector 127.0.0.1 + local interface Loopback0 + template interval 3600000 + no shutdown +! +service routing protocols model multi-agent +! +hostname cv-pathfinder-edge4A +! +router adaptive-virtual-topology + topology role transit region + region AVD_Land_West id 42 + zone AVD_Land_West-ZONE id 1 + site Site405 id 405 + ! + policy DEFAULT-AVT-POLICY + ! + match application-profile VIDEO + avt profile DEFAULT-AVT-POLICY-VIDEO + ! + match application-profile default + avt profile DEFAULT-AVT-POLICY-DEFAULT + ! + policy DEFAULT-AVT-POLICY-WITH-CP + ! + match application-profile APP-PROFILE-CONTROL-PLANE + avt profile DEFAULT-AVT-POLICY-CONTROL-PLANE + ! + match application-profile VIDEO + avt profile DEFAULT-AVT-POLICY-VIDEO + ! + match application-profile default + avt profile DEFAULT-AVT-POLICY-DEFAULT + ! + policy PROD-AVT-POLICY + ! + match application-profile VOICE + avt profile PROD-AVT-POLICY-VOICE + ! + match application-profile VIDEO + avt profile PROD-AVT-POLICY-VIDEO + ! + match application-profile MPLS-ONLY + avt profile PROD-AVT-POLICY-MPLS-ONLY + ! + match application-profile default + avt profile PROD-AVT-POLICY-DEFAULT + ! + profile DEFAULT-AVT-POLICY-CONTROL-PLANE + path-selection load-balance LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + ! + profile DEFAULT-AVT-POLICY-DEFAULT + path-selection load-balance LB-DEFAULT-AVT-POLICY-DEFAULT + ! + profile DEFAULT-AVT-POLICY-VIDEO + path-selection load-balance LB-DEFAULT-AVT-POLICY-VIDEO + ! + profile PROD-AVT-POLICY-DEFAULT + path-selection load-balance LB-PROD-AVT-POLICY-DEFAULT + ! + profile PROD-AVT-POLICY-MPLS-ONLY + path-selection load-balance LB-PROD-AVT-POLICY-MPLS-ONLY + ! + profile PROD-AVT-POLICY-VIDEO + path-selection load-balance LB-PROD-AVT-POLICY-VIDEO + ! + profile PROD-AVT-POLICY-VOICE + path-selection load-balance LB-PROD-AVT-POLICY-VOICE + ! + vrf default + avt policy DEFAULT-AVT-POLICY-WITH-CP + avt profile DEFAULT-AVT-POLICY-DEFAULT id 1 + avt profile DEFAULT-AVT-POLICY-VIDEO id 3 + avt profile DEFAULT-AVT-POLICY-CONTROL-PLANE id 254 + ! + vrf IT + avt policy DEFAULT-AVT-POLICY + avt profile DEFAULT-AVT-POLICY-DEFAULT id 1 + avt profile DEFAULT-AVT-POLICY-VIDEO id 3 + ! + vrf PROD + avt policy PROD-AVT-POLICY + avt profile PROD-AVT-POLICY-DEFAULT id 1 + avt profile PROD-AVT-POLICY-VOICE id 2 + avt profile PROD-AVT-POLICY-VIDEO id 4 + avt profile PROD-AVT-POLICY-MPLS-ONLY id 5 +! +router path-selection + tcp mss ceiling ipv4 ingress + ! + path-group INET id 101 + ipsec profile CP-PROFILE + ! + local interface Ethernet1.42 + stun server-profile INET-cv-pathfinder-pathfinder-Ethernet1 INET-cv-pathfinder-pathfinder-Ethernet3 + ! + peer dynamic + ! + peer static router-ip 192.168.144.1 + name cv-pathfinder-pathfinder + ipv4 address 172.17.7.7 + ipv4 address 10.9.9.9 + ! + path-group LAN_HA id 65535 + flow assignment lan + ! + local interface Port-Channel666 + ! + peer static router-ip 192.168.142.9 + name cv-pathfinder-edge4B + ipv4 address 10.10.10.2 + ! + load-balance policy LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + path-group INET + path-group LAN_HA + ! + load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT + path-group INET + path-group LAN_HA + ! + load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO + path-group INET + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-DEFAULT + path-group INET + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-MPLS-ONLY + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-VIDEO + loss-rate 42.0 + path-group LAN_HA + path-group INET priority 2 + ! + load-balance policy LB-PROD-AVT-POLICY-VOICE + jitter 42 + hop count lowest + path-group LAN_HA + path-group INET priority 2 +! +spanning-tree mode none +! +vrf instance IT +! +vrf instance MGMT +! +vrf instance PROD +! +management security + ! + ssl profile profileA + tls versions 1.2 + trust certificate aristaDeviceCertProvisionerDefaultRootCA.crt + certificate profileA.crt key profileA.key +! +ip security + ike policy CP-IKE-POLICY + local-id 192.168.142.8 + ! + sa policy CP-SA-POLICY + esp encryption aes256gcm128 + pfs dh-group 14 + ! + sa policy DP-SA-POLICY + esp encryption aes256gcm128 + pfs dh-group 14 + ! + profile CP-PROFILE + ike-policy CP-IKE-POLICY + sa-policy CP-SA-POLICY + connection start + shared-key 7 ABCDEF1234567890 + dpd 10 50 clear + mode transport + ! + profile DP-PROFILE + sa-policy DP-SA-POLICY + connection start + shared-key 7 ABCDEF1234567890666 + dpd 10 50 clear + mode transport + ! + key controller + profile DP-PROFILE +! +interface Port-Channel666 + description WAN_HA_cv-pathfinder-edge4B_Port-Channel666 + no shutdown + mtu 9194 + no switchport + flow tracker hardware FLOW-TRACKER + ip address 10.10.10.1/24 +! +interface Dps1 + description DPS Interface + mtu 9194 + flow tracker hardware FLOW-TRACKER + ip address 192.168.142.8/32 +! +interface Ethernet1 + no shutdown + no switchport +! +interface Ethernet1.42 + description Comcast + no shutdown + encapsulation dot1q vlan 42 + ip address dhcp + dhcp client accept default-route +! +interface Ethernet42 + description WAN_HA_cv-pathfinder-edge4B_Ethernet42 + no shutdown + mtu 9194 + channel-group 666 mode active +! +interface Ethernet43 + description WAN_HA_cv-pathfinder-edge4B_Ethernet43 + no shutdown + mtu 9194 + channel-group 666 mode active +! +interface Loopback0 + description ROUTER_ID + no shutdown + ip address 192.168.42.8/32 +! +interface Vxlan1 + description cv-pathfinder-edge4A_VTEP + vxlan source-interface Dps1 + vxlan udp-port 4789 + vxlan vrf default vni 1 + vxlan vrf IT vni 100 + vxlan vrf PROD vni 42 +! +application traffic recognition + ! + application ipv4 APP-CONTROL-PLANE + destination prefix field-set PFX-PATHFINDERS + ! + application ipv4 CUSTOM-APPLICATION-1 + source prefix field-set CUSTOM-SRC-PREFIX-1 + destination prefix field-set CUSTOM-DEST-PREFIX-1 + protocol tcp + ! + application ipv4 CUSTOM-APPLICATION-2 + protocol tcp source port field-set TCP-SRC-2 destination port field-set TCP-DEST-2 + ! + application ipv4 CUSTOM-DSCP-APPLICATION + dscp ef 12-14 cs6 42 + ! + category VIDEO1 + application CUSTOM-APPLICATION-2 + application CUSTOM-DSCP-APPLICATION + application microsoft-teams + ! + application-profile APP-PROFILE-CONTROL-PLANE + application APP-CONTROL-PLANE + ! + application-profile MPLS-ONLY + ! + application-profile VIDEO + application CUSTOM-APPLICATION-1 + application skype + application rtp transport + category VIDEO1 + ! + application-profile VOICE + application CUSTOM-VOICE-APPLICATION + ! + field-set ipv4 prefix CUSTOM-DEST-PREFIX-1 + 6.6.6.0/24 + ! + field-set ipv4 prefix CUSTOM-SRC-PREFIX-1 + 42.42.42.0/24 + ! + field-set ipv4 prefix PFX-PATHFINDERS + 192.168.144.1/32 + ! + field-set l4-port TCP-DEST-2 + 666, 777 + ! + field-set l4-port TCP-SRC-2 + 42 +! +ip routing +ip routing vrf IT +no ip routing vrf MGMT +ip routing vrf PROD +! +ip extcommunity-list ECL-EVPN-SOO permit soo 192.168.42.8:405 +! +ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY + seq 10 permit 192.168.42.0/24 eq 32 +! +route-map RM-BGP-UNDERLAY-PEERS-IN permit 40 + description Mark prefixes originated from the LAN + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-BGP-UNDERLAY-PEERS-OUT permit 10 + description Make routes learned from WAN HA peer less preferred on LAN routers + match route-type internal + match tag 50 + set metric 50 +! +route-map RM-BGP-UNDERLAY-PEERS-OUT permit 20 +! +route-map RM-CONN-2-BGP permit 10 + match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-EVPN-EXPORT-VRF-DEFAULT permit 10 + match extcommunity ECL-EVPN-SOO +! +route-map RM-EVPN-SOO-IN deny 10 + match extcommunity ECL-EVPN-SOO +! +route-map RM-EVPN-SOO-IN permit 20 +! +route-map RM-EVPN-SOO-OUT permit 10 + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-WAN-HA-PEER-IN permit 10 + description Set tag 50 on routes received from HA peer over EVPN + set tag 50 +! +route-map RM-WAN-HA-PEER-OUT permit 10 + description Make EVPN routes learned from WAN less preferred on HA peer + match route-type internal + set local-preference 50 +! +route-map RM-WAN-HA-PEER-OUT permit 20 + description Make locally injected routes less preferred on HA peer + set local-preference 75 +! +router bfd + multihop interval 300 min-rx 300 multiplier 3 +! +router bgp 65000 + router-id 192.168.42.8 + maximum-paths 16 + 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 IPv4-UNDERLAY-PEERS route-map RM-BGP-UNDERLAY-PEERS-IN in + neighbor IPv4-UNDERLAY-PEERS route-map RM-BGP-UNDERLAY-PEERS-OUT out + neighbor WAN-OVERLAY-PEERS peer group + neighbor WAN-OVERLAY-PEERS remote-as 65000 + neighbor WAN-OVERLAY-PEERS update-source Dps1 + neighbor WAN-OVERLAY-PEERS bfd + neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10 + neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1 + neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ== + neighbor WAN-OVERLAY-PEERS send-community + neighbor WAN-OVERLAY-PEERS maximum-routes 0 + neighbor 192.168.142.9 remote-as 65000 + neighbor 192.168.142.9 description cv-pathfinder-edge4B + neighbor 192.168.142.9 route-reflector-client + neighbor 192.168.142.9 update-source Dps1 + neighbor 192.168.142.9 route-map RM-WAN-HA-PEER-IN in + neighbor 192.168.142.9 route-map RM-WAN-HA-PEER-OUT out + neighbor 192.168.142.9 send-community + neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 + redistribute connected route-map RM-CONN-2-BGP + ! + address-family evpn + neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in + neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out + neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection + neighbor 192.168.142.9 activate + neighbor 192.168.142.9 encapsulation path-selection + neighbor default next-hop-self received-evpn-routes route-type ip-prefix + ! + address-family ipv4 + neighbor IPv4-UNDERLAY-PEERS activate + no neighbor WAN-OVERLAY-PEERS activate + ! + address-family ipv4 sr-te + neighbor WAN-OVERLAY-PEERS activate + ! + address-family link-state + neighbor WAN-OVERLAY-PEERS activate + path-selection + ! + address-family path-selection + bgp additional-paths receive + bgp additional-paths send any + neighbor WAN-OVERLAY-PEERS activate + ! + vrf default + rd 192.168.42.8:1 + route-target import evpn 1:1 + route-target export evpn 1:1 + route-target export evpn route-map RM-EVPN-EXPORT-VRF-DEFAULT + ! + vrf IT + rd 192.168.42.8:1000 + route-target import evpn 1000:1000 + route-target export evpn 1000:1000 + router-id 192.168.42.8 + redistribute connected + ! + vrf PROD + rd 192.168.42.8:142 + route-target import evpn 142:142 + route-target export evpn 142:142 + router-id 192.168.42.8 + redistribute connected +! +router traffic-engineering +! +stun + client + server-profile INET-cv-pathfinder-pathfinder-Ethernet1 + ip address 172.17.7.7 + ssl profile profileA + server-profile INET-cv-pathfinder-pathfinder-Ethernet3 + ip address 10.9.9.9 + ssl profile profileA +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4B.cfg new file mode 100644 index 00000000000..9c916ea5e4d --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge4B.cfg @@ -0,0 +1,445 @@ +! +no enable password +no aaa root +! +agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP=1 +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +! +flow tracking hardware + tracker FLOW-TRACKER + record export on inactive timeout 70000 + record export on interval 300000 + exporter CV-TELEMETRY + collector 127.0.0.1 + local interface Loopback0 + template interval 3600000 + no shutdown +! +service routing protocols model multi-agent +! +hostname cv-pathfinder-edge4B +! +router adaptive-virtual-topology + topology role transit region + region AVD_Land_West id 42 + zone AVD_Land_West-ZONE id 1 + site Site405 id 405 + ! + policy DEFAULT-AVT-POLICY + ! + match application-profile VIDEO + avt profile DEFAULT-AVT-POLICY-VIDEO + ! + match application-profile default + avt profile DEFAULT-AVT-POLICY-DEFAULT + ! + policy DEFAULT-AVT-POLICY-WITH-CP + ! + match application-profile APP-PROFILE-CONTROL-PLANE + avt profile DEFAULT-AVT-POLICY-CONTROL-PLANE + ! + match application-profile VIDEO + avt profile DEFAULT-AVT-POLICY-VIDEO + ! + match application-profile default + avt profile DEFAULT-AVT-POLICY-DEFAULT + ! + policy PROD-AVT-POLICY + ! + match application-profile VOICE + avt profile PROD-AVT-POLICY-VOICE + ! + match application-profile VIDEO + avt profile PROD-AVT-POLICY-VIDEO + ! + match application-profile MPLS-ONLY + avt profile PROD-AVT-POLICY-MPLS-ONLY + ! + match application-profile default + avt profile PROD-AVT-POLICY-DEFAULT + ! + profile DEFAULT-AVT-POLICY-CONTROL-PLANE + path-selection load-balance LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + ! + profile DEFAULT-AVT-POLICY-DEFAULT + path-selection load-balance LB-DEFAULT-AVT-POLICY-DEFAULT + ! + profile DEFAULT-AVT-POLICY-VIDEO + path-selection load-balance LB-DEFAULT-AVT-POLICY-VIDEO + ! + profile PROD-AVT-POLICY-DEFAULT + path-selection load-balance LB-PROD-AVT-POLICY-DEFAULT + ! + profile PROD-AVT-POLICY-MPLS-ONLY + path-selection load-balance LB-PROD-AVT-POLICY-MPLS-ONLY + ! + profile PROD-AVT-POLICY-VIDEO + path-selection load-balance LB-PROD-AVT-POLICY-VIDEO + ! + profile PROD-AVT-POLICY-VOICE + path-selection load-balance LB-PROD-AVT-POLICY-VOICE + ! + vrf default + avt policy DEFAULT-AVT-POLICY-WITH-CP + avt profile DEFAULT-AVT-POLICY-DEFAULT id 1 + avt profile DEFAULT-AVT-POLICY-VIDEO id 3 + avt profile DEFAULT-AVT-POLICY-CONTROL-PLANE id 254 + ! + vrf IT + avt policy DEFAULT-AVT-POLICY + avt profile DEFAULT-AVT-POLICY-DEFAULT id 1 + avt profile DEFAULT-AVT-POLICY-VIDEO id 3 + ! + vrf PROD + avt policy PROD-AVT-POLICY + avt profile PROD-AVT-POLICY-DEFAULT id 1 + avt profile PROD-AVT-POLICY-VOICE id 2 + avt profile PROD-AVT-POLICY-VIDEO id 4 + avt profile PROD-AVT-POLICY-MPLS-ONLY id 5 +! +router path-selection + tcp mss ceiling ipv4 ingress + ! + path-group INET id 101 + ipsec profile CP-PROFILE + ! + local interface Ethernet1.42 + stun server-profile INET-cv-pathfinder-pathfinder-Ethernet1 INET-cv-pathfinder-pathfinder-Ethernet3 + ! + peer dynamic + ! + peer static router-ip 192.168.144.1 + name cv-pathfinder-pathfinder + ipv4 address 172.17.7.7 + ipv4 address 10.9.9.9 + ! + path-group LAN_HA id 65535 + flow assignment lan + ! + local interface Port-Channel666 + ! + peer static router-ip 192.168.142.8 + name cv-pathfinder-edge4A + ipv4 address 10.10.10.1 + ! + load-balance policy LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + path-group INET + path-group LAN_HA + ! + load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT + path-group INET + path-group LAN_HA + ! + load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO + path-group INET + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-DEFAULT + path-group INET + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-MPLS-ONLY + path-group LAN_HA + ! + load-balance policy LB-PROD-AVT-POLICY-VIDEO + loss-rate 42.0 + path-group LAN_HA + path-group INET priority 2 + ! + load-balance policy LB-PROD-AVT-POLICY-VOICE + jitter 42 + hop count lowest + path-group LAN_HA + path-group INET priority 2 +! +spanning-tree mode none +! +vrf instance IT +! +vrf instance MGMT +! +vrf instance PROD +! +management security + ! + ssl profile profileA + tls versions 1.2 + trust certificate aristaDeviceCertProvisionerDefaultRootCA.crt + certificate profileA.crt key profileA.key +! +ip security + ike policy CP-IKE-POLICY + local-id 192.168.142.9 + ! + sa policy CP-SA-POLICY + esp encryption aes256gcm128 + pfs dh-group 14 + ! + sa policy DP-SA-POLICY + esp encryption aes256gcm128 + pfs dh-group 14 + ! + profile CP-PROFILE + ike-policy CP-IKE-POLICY + sa-policy CP-SA-POLICY + connection start + shared-key 7 ABCDEF1234567890 + dpd 10 50 clear + mode transport + ! + profile DP-PROFILE + sa-policy DP-SA-POLICY + connection start + shared-key 7 ABCDEF1234567890666 + dpd 10 50 clear + mode transport + ! + key controller + profile DP-PROFILE +! +interface Port-Channel666 + description WAN_HA_cv-pathfinder-edge4A_Port-Channel666 + no shutdown + mtu 9194 + no switchport + flow tracker hardware FLOW-TRACKER + ip address 10.10.10.2/24 +! +interface Dps1 + description DPS Interface + mtu 9194 + flow tracker hardware FLOW-TRACKER + ip address 192.168.142.9/32 +! +interface Ethernet1 + no shutdown + no switchport +! +interface Ethernet1.42 + description Comcast + no shutdown + encapsulation dot1q vlan 42 + ip address dhcp + dhcp client accept default-route +! +interface Ethernet42 + description WAN_HA_cv-pathfinder-edge4A_Ethernet42 + no shutdown + mtu 9194 + channel-group 666 mode active +! +interface Ethernet43 + description WAN_HA_cv-pathfinder-edge4A_Ethernet43 + no shutdown + mtu 9194 + channel-group 666 mode active +! +interface Loopback0 + description ROUTER_ID + no shutdown + ip address 192.168.42.9/32 +! +interface Vxlan1 + description cv-pathfinder-edge4B_VTEP + vxlan source-interface Dps1 + vxlan udp-port 4789 + vxlan vrf default vni 1 + vxlan vrf IT vni 100 + vxlan vrf PROD vni 42 +! +application traffic recognition + ! + application ipv4 APP-CONTROL-PLANE + destination prefix field-set PFX-PATHFINDERS + ! + application ipv4 CUSTOM-APPLICATION-1 + source prefix field-set CUSTOM-SRC-PREFIX-1 + destination prefix field-set CUSTOM-DEST-PREFIX-1 + protocol tcp + ! + application ipv4 CUSTOM-APPLICATION-2 + protocol tcp source port field-set TCP-SRC-2 destination port field-set TCP-DEST-2 + ! + application ipv4 CUSTOM-DSCP-APPLICATION + dscp ef 12-14 cs6 42 + ! + category VIDEO1 + application CUSTOM-APPLICATION-2 + application CUSTOM-DSCP-APPLICATION + application microsoft-teams + ! + application-profile APP-PROFILE-CONTROL-PLANE + application APP-CONTROL-PLANE + ! + application-profile MPLS-ONLY + ! + application-profile VIDEO + application CUSTOM-APPLICATION-1 + application skype + application rtp transport + category VIDEO1 + ! + application-profile VOICE + application CUSTOM-VOICE-APPLICATION + ! + field-set ipv4 prefix CUSTOM-DEST-PREFIX-1 + 6.6.6.0/24 + ! + field-set ipv4 prefix CUSTOM-SRC-PREFIX-1 + 42.42.42.0/24 + ! + field-set ipv4 prefix PFX-PATHFINDERS + 192.168.144.1/32 + ! + field-set l4-port TCP-DEST-2 + 666, 777 + ! + field-set l4-port TCP-SRC-2 + 42 +! +ip routing +ip routing vrf IT +no ip routing vrf MGMT +ip routing vrf PROD +! +ip extcommunity-list ECL-EVPN-SOO permit soo 192.168.42.8:405 +! +ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY + seq 10 permit 192.168.42.0/24 eq 32 +! +route-map RM-BGP-UNDERLAY-PEERS-IN permit 40 + description Mark prefixes originated from the LAN + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-BGP-UNDERLAY-PEERS-OUT permit 10 + description Make routes learned from WAN HA peer less preferred on LAN routers + match route-type internal + match tag 50 + set metric 50 +! +route-map RM-BGP-UNDERLAY-PEERS-OUT permit 20 +! +route-map RM-CONN-2-BGP permit 10 + match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-EVPN-EXPORT-VRF-DEFAULT permit 10 + match extcommunity ECL-EVPN-SOO +! +route-map RM-EVPN-SOO-IN deny 10 + match extcommunity ECL-EVPN-SOO +! +route-map RM-EVPN-SOO-IN permit 20 +! +route-map RM-EVPN-SOO-OUT permit 10 + set extcommunity soo 192.168.42.8:405 additive +! +route-map RM-WAN-HA-PEER-IN permit 10 + description Set tag 50 on routes received from HA peer over EVPN + set tag 50 +! +route-map RM-WAN-HA-PEER-OUT permit 10 + description Make EVPN routes learned from WAN less preferred on HA peer + match route-type internal + set local-preference 50 +! +route-map RM-WAN-HA-PEER-OUT permit 20 + description Make locally injected routes less preferred on HA peer + set local-preference 75 +! +router bfd + multihop interval 300 min-rx 300 multiplier 3 +! +router bgp 65000 + router-id 192.168.42.9 + maximum-paths 16 + 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 IPv4-UNDERLAY-PEERS route-map RM-BGP-UNDERLAY-PEERS-IN in + neighbor IPv4-UNDERLAY-PEERS route-map RM-BGP-UNDERLAY-PEERS-OUT out + neighbor WAN-OVERLAY-PEERS peer group + neighbor WAN-OVERLAY-PEERS remote-as 65000 + neighbor WAN-OVERLAY-PEERS update-source Dps1 + neighbor WAN-OVERLAY-PEERS bfd + neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10 + neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1 + neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ== + neighbor WAN-OVERLAY-PEERS send-community + neighbor WAN-OVERLAY-PEERS maximum-routes 0 + neighbor 192.168.142.8 remote-as 65000 + neighbor 192.168.142.8 description cv-pathfinder-edge4A + neighbor 192.168.142.8 route-reflector-client + neighbor 192.168.142.8 update-source Dps1 + neighbor 192.168.142.8 route-map RM-WAN-HA-PEER-IN in + neighbor 192.168.142.8 route-map RM-WAN-HA-PEER-OUT out + neighbor 192.168.142.8 send-community + neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 + redistribute connected route-map RM-CONN-2-BGP + ! + address-family evpn + neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in + neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out + neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection + neighbor 192.168.142.8 activate + neighbor 192.168.142.8 encapsulation path-selection + neighbor default next-hop-self received-evpn-routes route-type ip-prefix + ! + address-family ipv4 + neighbor IPv4-UNDERLAY-PEERS activate + no neighbor WAN-OVERLAY-PEERS activate + ! + address-family ipv4 sr-te + neighbor WAN-OVERLAY-PEERS activate + ! + address-family link-state + neighbor WAN-OVERLAY-PEERS activate + path-selection + ! + address-family path-selection + bgp additional-paths receive + bgp additional-paths send any + neighbor WAN-OVERLAY-PEERS activate + ! + vrf default + rd 192.168.42.9:1 + route-target import evpn 1:1 + route-target export evpn 1:1 + route-target export evpn route-map RM-EVPN-EXPORT-VRF-DEFAULT + ! + vrf IT + rd 192.168.42.9:1000 + route-target import evpn 1000:1000 + route-target export evpn 1000:1000 + router-id 192.168.42.9 + redistribute connected + ! + vrf PROD + rd 192.168.42.9:142 + route-target import evpn 142:142 + route-target export evpn 142:142 + router-id 192.168.42.9 + redistribute connected +! +router traffic-engineering +! +stun + client + server-profile INET-cv-pathfinder-pathfinder-Ethernet1 + ip address 172.17.7.7 + ssl profile profileA + server-profile INET-cv-pathfinder-pathfinder-Ethernet3 + ip address 10.9.9.9 + ssl profile profileA +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg index 211230f4da6..b87482a5b07 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg @@ -208,8 +208,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS path-group INET priority 2 @@ -383,6 +383,7 @@ router bgp 65000 ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg index d90abddddbb..7ebf66d9e34 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg @@ -211,8 +211,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS path-group INET priority 2 @@ -378,14 +378,16 @@ router bgp 65000 neighbor WAN-RR-OVERLAY-PEERS send-community neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0 neighbor 6.6.6.6 peer group WAN-RR-OVERLAY-PEERS - neighbor 6.6.6.6 description cv-pathfinder-pathfinder3 + neighbor 6.6.6.6 description cv-pathfinder-pathfinder3_Dps1 neighbor 192.168.144.3 peer group WAN-RR-OVERLAY-PEERS - neighbor 192.168.144.3 description cv-pathfinder-pathfinder2 + neighbor 192.168.144.3 description cv-pathfinder-pathfinder2_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor WAN-RR-OVERLAY-PEERS activate + neighbor WAN-RR-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg index eb872159bcc..0d0cb1e9bb4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg @@ -218,8 +218,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS path-group INET priority 2 @@ -391,14 +391,16 @@ router bgp 65000 neighbor WAN-RR-OVERLAY-PEERS send-community neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0 neighbor 6.6.6.6 peer group WAN-RR-OVERLAY-PEERS - neighbor 6.6.6.6 description cv-pathfinder-pathfinder3 + neighbor 6.6.6.6 description cv-pathfinder-pathfinder3_Dps1 neighbor 192.168.144.2 peer group WAN-RR-OVERLAY-PEERS - neighbor 192.168.144.2 description cv-pathfinder-pathfinder1 + neighbor 192.168.144.2 description cv-pathfinder-pathfinder1_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor WAN-RR-OVERLAY-PEERS activate + neighbor WAN-RR-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg index 24a5702858d..a003ebff499 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg @@ -140,13 +140,12 @@ router adaptive-virtual-topology avt profile CUSTOM-VOICE-PROFILE-NAME id 42 ! router internet-exit - ! - exit-group DIRECT-EXIT-POLICY-2 - local connection IE-Ethernet2.42 - ! - policy DIRECT-EXIT-POLICY-2 - exit-group DIRECT-EXIT-POLICY-2 - exit-group system-default-exit-group + exit-group DIRECT-EXIT-POLICY-2 + local connection IE-Ethernet2.42 + ! + policy DIRECT-EXIT-POLICY-2 + exit-group DIRECT-EXIT-POLICY-2 + exit-group system-default-exit-group ! router path-selection tcp mss ceiling ipv4 ingress @@ -227,8 +226,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS path-group INET priority 2 @@ -323,14 +322,14 @@ interface Ethernet2.42 ip nat service-profile NAT-IE-DIRECT ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1 + description P2P_site-ha-enabled-leaf1_Ethernet1 no shutdown mtu 9214 no switchport ip address 172.17.0.1/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.142_vrf_PROD + description P2P_site-ha-enabled-leaf1_Ethernet1.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -338,7 +337,7 @@ interface Ethernet52.142 ip address 172.17.0.1/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf1_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -346,7 +345,7 @@ interface Ethernet52.666 ip address 172.17.0.1/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.1000_vrf_IT + description P2P_site-ha-enabled-leaf1_Ethernet1.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -539,14 +538,16 @@ router bgp 65000 neighbor 192.168.143.2 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.143.2 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor 192.168.143.2 activate + neighbor 192.168.143.2 encapsulation path-selection neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg index 1b5d83c1932..92650f97f9e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg @@ -213,8 +213,8 @@ router path-selection path-group INET priority 2 ! load-balance policy LB-PROD-AVT-POLICY-VOICE - hop count lowest jitter 42 + hop count lowest path-group LAN_HA path-group MPLS path-group INET priority 2 @@ -303,14 +303,14 @@ interface Ethernet2.42 ip address 172.16.6.6/31 ! interface Ethernet52 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2 + description P2P_site-ha-enabled-leaf1_Ethernet2 no shutdown mtu 9214 no switchport ip address 172.17.0.3/31 ! interface Ethernet52.142 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.142_vrf_PROD + description P2P_site-ha-enabled-leaf1_Ethernet2.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -318,7 +318,7 @@ interface Ethernet52.142 ip address 172.17.0.3/31 ! interface Ethernet52.666 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_site-ha-enabled-leaf1_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -326,7 +326,7 @@ interface Ethernet52.666 ip address 172.17.0.3/31 ! interface Ethernet52.1000 - description P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.1000_vrf_IT + description P2P_site-ha-enabled-leaf1_Ethernet2.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -504,14 +504,16 @@ router bgp 65000 neighbor 192.168.143.1 route-map RM-WAN-HA-PEER-OUT out neighbor 192.168.143.1 send-community neighbor 192.168.144.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.144.1 description cv-pathfinder-pathfinder + neighbor 192.168.144.1 description cv-pathfinder-pathfinder_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor 192.168.143.1 activate + neighbor 192.168.143.1 encapsulation path-selection neighbor default next-hop-self received-evpn-routes route-type ip-prefix ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf1.cfg index e93bf0ed2d2..96447bc28a1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf1.cfg @@ -20,14 +20,14 @@ hostname downlink-pools-l3leaf1 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet3 + description P2P_downlink-pools-spine1_Ethernet3 no shutdown mtu 9214 no switchport ip address 10.0.1.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet4 + description P2P_downlink-pools-spine1_Ethernet4 no shutdown mtu 9214 no switchport @@ -83,7 +83,7 @@ router bgp 65009 neighbor 10.0.1.2 description downlink-pools-spine1_Ethernet4 neighbor 192.168.0.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.10 remote-as 65000 - neighbor 192.168.0.10 description downlink-pools-spine1 + neighbor 192.168.0.10 description downlink-pools-spine1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf2.cfg index 0cc23a91052..a5bf4965944 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf2.cfg @@ -20,14 +20,14 @@ hostname downlink-pools-l3leaf2 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet3 + description P2P_downlink-pools-spine2_Ethernet3 no shutdown mtu 9214 no switchport ip address 10.0.2.1/31 ! interface Ethernet2 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet4 + description P2P_downlink-pools-spine2_Ethernet4 no shutdown mtu 9214 no switchport @@ -83,7 +83,7 @@ router bgp 65019 neighbor 10.0.2.2 description downlink-pools-spine2_Ethernet4 neighbor 192.168.0.20 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.20 remote-as 65000 - neighbor 192.168.0.20 description downlink-pools-spine2 + neighbor 192.168.0.20 description downlink-pools-spine2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf3.cfg index 57bb906f2ef..d8eb2d7e38e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf3.cfg @@ -20,28 +20,28 @@ hostname downlink-pools-l3leaf3 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet5 + description P2P_downlink-pools-spine1_Ethernet5 no shutdown mtu 9214 no switchport ip address 10.0.1.5/31 ! interface Ethernet2 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet5 + description P2P_downlink-pools-spine2_Ethernet5 no shutdown mtu 9214 no switchport ip address 10.0.4.1/31 ! interface Ethernet3 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet15 + description P2P_downlink-pools-spine1_Ethernet15 no shutdown mtu 9214 no switchport ip address 10.0.3.1/31 ! interface Ethernet4 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet15 + description P2P_downlink-pools-spine2_Ethernet15 no shutdown mtu 9214 no switchport @@ -103,10 +103,10 @@ router bgp 65029 neighbor 10.0.4.4 description downlink-pools-spine2_Ethernet15 neighbor 192.168.0.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.10 remote-as 65000 - neighbor 192.168.0.10 description downlink-pools-spine1 + neighbor 192.168.0.10 description downlink-pools-spine1_Loopback0 neighbor 192.168.0.20 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.20 remote-as 65000 - neighbor 192.168.0.20 description downlink-pools-spine2 + neighbor 192.168.0.20 description downlink-pools-spine2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf4.cfg index f6117201141..a0696889466 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-l3leaf4.cfg @@ -20,28 +20,28 @@ hostname downlink-pools-l3leaf4 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet6 + description P2P_downlink-pools-spine1_Ethernet6 no shutdown mtu 9214 no switchport ip address 10.0.1.7/31 ! interface Ethernet2 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet6 + description P2P_downlink-pools-spine2_Ethernet6 no shutdown mtu 9214 no switchport ip address 10.0.4.3/31 ! interface Ethernet3 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet16 + description P2P_downlink-pools-spine1_Ethernet16 no shutdown mtu 9214 no switchport ip address 10.0.3.19/31 ! interface Ethernet4 - description P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet16 + description P2P_downlink-pools-spine2_Ethernet16 no shutdown mtu 9214 no switchport @@ -103,10 +103,10 @@ router bgp 65039 neighbor 10.0.4.6 description downlink-pools-spine2_Ethernet16 neighbor 192.168.0.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.10 remote-as 65000 - neighbor 192.168.0.10 description downlink-pools-spine1 + neighbor 192.168.0.10 description downlink-pools-spine1_Loopback0 neighbor 192.168.0.20 peer group EVPN-OVERLAY-PEERS neighbor 192.168.0.20 remote-as 65000 - neighbor 192.168.0.20 description downlink-pools-spine2 + neighbor 192.168.0.20 description downlink-pools-spine2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine1.cfg index ec5d29a8e82..22028977740 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine1.cfg @@ -22,42 +22,42 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet3 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF1_Ethernet1 + description P2P_downlink-pools-l3leaf1_Ethernet1 no shutdown mtu 9214 no switchport ip address 10.0.1.0/31 ! interface Ethernet4 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF1_Ethernet2 + description P2P_downlink-pools-l3leaf1_Ethernet2 no shutdown mtu 9214 no switchport ip address 10.0.1.2/31 ! interface Ethernet5 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet1 + description P2P_downlink-pools-l3leaf3_Ethernet1 no shutdown mtu 9214 no switchport ip address 10.0.1.4/31 ! interface Ethernet6 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet1 + description P2P_downlink-pools-l3leaf4_Ethernet1 no shutdown mtu 9214 no switchport ip address 10.0.1.6/31 ! interface Ethernet15 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet3 + description P2P_downlink-pools-l3leaf3_Ethernet3 no shutdown mtu 9214 no switchport ip address 10.0.3.0/31 ! interface Ethernet16 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet3 + description P2P_downlink-pools-l3leaf4_Ethernet3 no shutdown mtu 9214 no switchport @@ -115,13 +115,13 @@ router bgp 65000 neighbor 10.0.3.19 description downlink-pools-l3leaf4_Ethernet3 neighbor 192.168.1.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.10 remote-as 65009 - neighbor 192.168.1.10 description downlink-pools-l3leaf1 + neighbor 192.168.1.10 description downlink-pools-l3leaf1_Loopback0 neighbor 192.168.1.30 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.30 remote-as 65029 - neighbor 192.168.1.30 description downlink-pools-l3leaf3 + neighbor 192.168.1.30 description downlink-pools-l3leaf3_Loopback0 neighbor 192.168.1.40 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.40 remote-as 65039 - neighbor 192.168.1.40 description downlink-pools-l3leaf4 + neighbor 192.168.1.40 description downlink-pools-l3leaf4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine2.cfg index d84bec2432c..744181a4f14 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/downlink-pools-spine2.cfg @@ -22,42 +22,42 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet3 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF2_Ethernet1 + description P2P_downlink-pools-l3leaf2_Ethernet1 no shutdown mtu 9214 no switchport ip address 10.0.2.0/31 ! interface Ethernet4 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF2_Ethernet2 + description P2P_downlink-pools-l3leaf2_Ethernet2 no shutdown mtu 9214 no switchport ip address 10.0.2.2/31 ! interface Ethernet5 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet2 + description P2P_downlink-pools-l3leaf3_Ethernet2 no shutdown mtu 9214 no switchport ip address 10.0.4.0/31 ! interface Ethernet6 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet2 + description P2P_downlink-pools-l3leaf4_Ethernet2 no shutdown mtu 9214 no switchport ip address 10.0.4.2/31 ! interface Ethernet15 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet4 + description P2P_downlink-pools-l3leaf3_Ethernet4 no shutdown mtu 9214 no switchport ip address 10.0.4.4/31 ! interface Ethernet16 - description P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet4 + description P2P_downlink-pools-l3leaf4_Ethernet4 no shutdown mtu 9214 no switchport @@ -115,13 +115,13 @@ router bgp 65000 neighbor 10.0.4.7 description downlink-pools-l3leaf4_Ethernet4 neighbor 192.168.1.20 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.20 remote-as 65019 - neighbor 192.168.1.20 description downlink-pools-l3leaf2 + neighbor 192.168.1.20 description downlink-pools-l3leaf2_Loopback0 neighbor 192.168.1.30 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.30 remote-as 65029 - neighbor 192.168.1.30 description downlink-pools-l3leaf3 + neighbor 192.168.1.30 description downlink-pools-l3leaf3_Loopback0 neighbor 192.168.1.40 peer group EVPN-OVERLAY-PEERS neighbor 192.168.1.40 remote-as 65039 - neighbor 192.168.1.40 description downlink-pools-l3leaf4 + neighbor 192.168.1.40 description downlink-pools-l3leaf4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg index 1c6d6e60d96..9aafde8bba4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg @@ -37,7 +37,7 @@ vlan 4092 vrf instance MGMT ! interface Port-Channel1 - description FLOW-TRACKING-TESTS-LEAF-MLAG_Po31 + description flow-tracking-tests-leaf-mlag_Po31 no shutdown switchport trunk allowed vlan 11,4092 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg index 00083bc8dfb..93b88681bda 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg @@ -37,7 +37,7 @@ vlan 4092 vrf instance MGMT ! interface Port-Channel1 - description FLOW-TRACKING-TESTS-LEAF-MLAG_Po32 + description flow-tracking-tests-leaf-mlag_Po32 no shutdown switchport trunk allowed vlan 11,4092 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg index fa1f3b269ed..f66abb1f9fb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg @@ -46,7 +46,7 @@ vrf instance MGMT vrf instance VRF1 ! interface Ethernet1 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet1 + description P2P_flow-tracking-tests-spine1_Ethernet1 no shutdown mtu 9214 no switchport @@ -54,7 +54,7 @@ interface Ethernet1 ip address 10.254.2.1/31 ! interface Ethernet2 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet2 + description P2P_flow-tracking-tests-spine2_Ethernet2 no shutdown mtu 9214 no switchport @@ -187,10 +187,10 @@ router bgp 65101 neighbor 10.254.2.2 description flow-tracking-tests-spine2_Ethernet2 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description flow-tracking-tests-spine1 + neighbor 10.255.0.1 description flow-tracking-tests-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65200 - neighbor 10.255.0.2 description flow-tracking-tests-spine2 + neighbor 10.255.0.2 description flow-tracking-tests-spine2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg index 5f08d794a60..eca218d92a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg @@ -50,14 +50,14 @@ vrf instance MGMT vrf instance VRF1 ! interface Ethernet1 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet3 + description P2P_flow-tracking-tests-spine1_Ethernet3 no shutdown mtu 9214 no switchport ip address 10.254.2.5/31 ! interface Ethernet2 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet4 + description P2P_flow-tracking-tests-spine2_Ethernet4 no shutdown mtu 9214 no switchport @@ -186,10 +186,10 @@ router bgp 65102 neighbor 10.254.2.6 description flow-tracking-tests-spine2_Ethernet4 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description flow-tracking-tests-spine1 + neighbor 10.255.0.1 description flow-tracking-tests-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65200 - neighbor 10.255.0.2 description flow-tracking-tests-spine2 + neighbor 10.255.0.2 description flow-tracking-tests-spine2_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg index 7f37e0d6f9c..f55b7f6b313 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg @@ -43,18 +43,18 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4092 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -115,7 +115,7 @@ interface Port-Channel32 mlag 32 ! interface Ethernet1 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet5 + description P2P_flow-tracking-tests-spine1_Ethernet5 no shutdown mtu 9214 no switchport @@ -123,7 +123,7 @@ interface Ethernet1 ip address 10.254.2.17/31 ! interface Ethernet2 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet6 + description P2P_flow-tracking-tests-spine2_Ethernet6 no shutdown mtu 9214 no switchport @@ -187,7 +187,7 @@ interface Vlan11 vrf VRF1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 @@ -202,13 +202,13 @@ interface Vlan4092 ip virtual-router address 10.254.254.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.104/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -279,7 +279,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.105 description flow-tracking-tests-leaf4 + neighbor 10.254.1.105 description flow-tracking-tests-leaf4_Vlan4093 neighbor 10.254.2.16 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.16 remote-as 65200 neighbor 10.254.2.16 description flow-tracking-tests-spine1_Ethernet5 @@ -288,10 +288,10 @@ router bgp 65105 neighbor 10.254.2.18 description flow-tracking-tests-spine2_Ethernet6 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description flow-tracking-tests-spine1 + neighbor 10.255.0.1 description flow-tracking-tests-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65200 - neighbor 10.255.0.2 description flow-tracking-tests-spine2 + neighbor 10.255.0.2 description flow-tracking-tests-spine2_Loopback0 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -314,7 +314,7 @@ router bgp 65105 route-target export evpn 1:1 router-id 10.254.1.5 neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.105 description flow-tracking-tests-leaf4 + neighbor 10.254.1.105 description flow-tracking-tests-leaf4_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg index 014419c1304..9bf78d9da2e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg @@ -43,18 +43,18 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4092 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -115,7 +115,7 @@ interface Port-Channel32 mlag 32 ! interface Ethernet1 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet7 + description P2P_flow-tracking-tests-spine1_Ethernet7 no shutdown mtu 9214 no switchport @@ -123,7 +123,7 @@ interface Ethernet1 ip address 10.254.2.21/31 ! interface Ethernet2 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet8 + description P2P_flow-tracking-tests-spine2_Ethernet8 no shutdown mtu 9214 no switchport @@ -187,7 +187,7 @@ interface Vlan11 vrf VRF1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 @@ -202,13 +202,13 @@ interface Vlan4092 ip virtual-router address 10.254.254.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.105/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -279,7 +279,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.104 description flow-tracking-tests-leaf3 + neighbor 10.254.1.104 description flow-tracking-tests-leaf3_Vlan4093 neighbor 10.254.2.20 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.20 remote-as 65200 neighbor 10.254.2.20 description flow-tracking-tests-spine1_Ethernet7 @@ -288,10 +288,10 @@ router bgp 65105 neighbor 10.254.2.22 description flow-tracking-tests-spine2_Ethernet8 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description flow-tracking-tests-spine1 + neighbor 10.255.0.1 description flow-tracking-tests-spine1_Loopback0 neighbor 10.255.0.2 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.2 remote-as 65200 - neighbor 10.255.0.2 description flow-tracking-tests-spine2 + neighbor 10.255.0.2 description flow-tracking-tests-spine2_Loopback0 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -314,7 +314,7 @@ router bgp 65105 route-target export evpn 1:1 router-id 10.254.1.6 neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.104 description flow-tracking-tests-leaf3 + neighbor 10.254.1.104 description flow-tracking-tests-leaf3_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg index b20297cc6d4..fbaef009387 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg @@ -43,7 +43,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF1_Ethernet1 + description P2P_flow-tracking-tests-leaf1_Ethernet1 no shutdown mtu 9214 no switchport @@ -51,7 +51,7 @@ interface Ethernet1 ip address 10.254.2.0/31 ! interface Ethernet3 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF2_Ethernet1 + description P2P_flow-tracking-tests-leaf2_Ethernet1 no shutdown mtu 9214 no switchport @@ -59,7 +59,7 @@ interface Ethernet3 ip address 10.254.2.4/31 ! interface Ethernet5 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF3_Ethernet1 + description P2P_flow-tracking-tests-leaf3_Ethernet1 no shutdown mtu 9214 no switchport @@ -67,7 +67,7 @@ interface Ethernet5 ip address 10.254.2.16/31 ! interface Ethernet7 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF4_Ethernet1 + description P2P_flow-tracking-tests-leaf4_Ethernet1 no shutdown mtu 9214 no switchport @@ -75,54 +75,54 @@ interface Ethernet7 ip address 10.254.2.20/31 ! interface Ethernet9 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet9 + description P2P_flow-tracking-tests-spine2_Ethernet9 no shutdown mtu 9214 no switchport flow tracker sampled FLOW-TRACKER ! interface Ethernet10 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet10 + description P2P_flow-tracking-tests-spine2_Ethernet10 no shutdown mtu 9214 no switchport flow tracker sampled FLOW-TRACKER-1 ! interface Ethernet11 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet11 + description P2P_flow-tracking-tests-spine2_Ethernet11 no shutdown mtu 9214 no switchport ! interface Ethernet12 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet12 + description P2P_flow-tracking-tests-spine2_Ethernet12 no shutdown mtu 9214 no switchport flow tracker sampled FLOW-TRACKER ! interface Ethernet13 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet13 + description P2P_flow-tracking-tests-spine2_Ethernet13 no shutdown mtu 9214 no switchport flow tracker sampled FLOW-TRACKER ! interface Ethernet14 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet14 + description P2P_flow-tracking-tests-spine2_Ethernet14 no shutdown mtu 9214 no switchport flow tracker sampled FLOW-TRACKER-1 ! interface Ethernet15 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet15 + description P2P_flow-tracking-tests-spine2_Ethernet15 no shutdown mtu 9214 no switchport ! interface Ethernet16 - description P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet16 + description P2P_flow-tracking-tests-spine2_Ethernet16 no shutdown mtu 9214 no switchport @@ -170,16 +170,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.254.1.1 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.1 remote-as 65101 - neighbor 10.254.1.1 description flow-tracking-tests-leaf1 + neighbor 10.254.1.1 description flow-tracking-tests-leaf1_Loopback0 neighbor 10.254.1.2 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.2 remote-as 65102 - neighbor 10.254.1.2 description flow-tracking-tests-leaf2 + neighbor 10.254.1.2 description flow-tracking-tests-leaf2_Loopback0 neighbor 10.254.1.5 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.5 remote-as 65105 - neighbor 10.254.1.5 description flow-tracking-tests-leaf3 + neighbor 10.254.1.5 description flow-tracking-tests-leaf3_Loopback0 neighbor 10.254.1.6 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.6 remote-as 65105 - neighbor 10.254.1.6 description flow-tracking-tests-leaf4 + neighbor 10.254.1.6 description flow-tracking-tests-leaf4_Loopback0 neighbor 10.254.2.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.1 remote-as 65101 neighbor 10.254.2.1 description flow-tracking-tests-leaf1_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg index c155b9988f6..268673a707c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg @@ -41,7 +41,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet2 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF1_Ethernet2 + description P2P_flow-tracking-tests-leaf1_Ethernet2 no shutdown mtu 9214 no switchport @@ -49,7 +49,7 @@ interface Ethernet2 ip address 10.254.2.2/31 ! interface Ethernet4 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF2_Ethernet2 + description P2P_flow-tracking-tests-leaf2_Ethernet2 no shutdown mtu 9214 no switchport @@ -57,7 +57,7 @@ interface Ethernet4 ip address 10.254.2.6/31 ! interface Ethernet6 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF3_Ethernet2 + description P2P_flow-tracking-tests-leaf3_Ethernet2 no shutdown mtu 9214 no switchport @@ -65,7 +65,7 @@ interface Ethernet6 ip address 10.254.2.18/31 ! interface Ethernet8 - description P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF4_Ethernet2 + description P2P_flow-tracking-tests-leaf4_Ethernet2 no shutdown mtu 9214 no switchport @@ -73,53 +73,53 @@ interface Ethernet8 ip address 10.254.2.22/31 ! interface Ethernet9 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet9 + description P2P_flow-tracking-tests-spine1_Ethernet9 no shutdown mtu 9214 no switchport flow tracker hardware FLOW-TRACKER-2 ! interface Ethernet10 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet10 + description P2P_flow-tracking-tests-spine1_Ethernet10 no shutdown mtu 9214 no switchport flow tracker hardware FLOW-TRACKER-1 ! interface Ethernet11 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet11 + description P2P_flow-tracking-tests-spine1_Ethernet11 no shutdown mtu 9214 no switchport ! interface Ethernet12 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet12 + description P2P_flow-tracking-tests-spine1_Ethernet12 no shutdown mtu 9214 no switchport ! interface Ethernet13 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet13 + description P2P_flow-tracking-tests-spine1_Ethernet13 no shutdown mtu 9214 no switchport flow tracker hardware FLOW-TRACKER-2 ! interface Ethernet14 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet14 + description P2P_flow-tracking-tests-spine1_Ethernet14 no shutdown mtu 9214 no switchport flow tracker hardware FLOW-TRACKER-1 ! interface Ethernet15 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet15 + description P2P_flow-tracking-tests-spine1_Ethernet15 no shutdown mtu 9214 no switchport ! interface Ethernet16 - description P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet16 + description P2P_flow-tracking-tests-spine1_Ethernet16 no shutdown mtu 9214 no switchport @@ -166,16 +166,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.254.1.1 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.1 remote-as 65101 - neighbor 10.254.1.1 description flow-tracking-tests-leaf1 + neighbor 10.254.1.1 description flow-tracking-tests-leaf1_Loopback0 neighbor 10.254.1.2 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.2 remote-as 65102 - neighbor 10.254.1.2 description flow-tracking-tests-leaf2 + neighbor 10.254.1.2 description flow-tracking-tests-leaf2_Loopback0 neighbor 10.254.1.5 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.5 remote-as 65105 - neighbor 10.254.1.5 description flow-tracking-tests-leaf3 + neighbor 10.254.1.5 description flow-tracking-tests-leaf3_Loopback0 neighbor 10.254.1.6 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.6 remote-as 65105 - neighbor 10.254.1.6 description flow-tracking-tests-leaf4 + neighbor 10.254.1.6 description flow-tracking-tests-leaf4_Loopback0 neighbor 10.254.2.3 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.3 remote-as 65101 neighbor 10.254.2.3 description flow-tracking-tests-leaf1_Ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg index 1825b258a89..5861b070874 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg @@ -23,7 +23,7 @@ vlan 105 vrf instance MGMT ! interface Port-Channel1 - description INBAND-MGMT-PARENTS-DUALSTACK_Po25 + description inband-mgmt-parents-dualstack_Po25 no shutdown switchport trunk allowed vlan 105 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg index d95d7d786f6..8c454d8ced5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg @@ -23,7 +23,7 @@ vlan 104 vrf instance MGMT ! interface Port-Channel1 - description INBAND-MGMT-PARENTS-DUALSTACK_Po24 + description inband-mgmt-parents-dualstack_Po24 no shutdown switchport trunk allowed vlan 104 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg index f0efc890e46..6359a814d57 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg @@ -23,7 +23,7 @@ vlan 107 vrf instance MGMT ! interface Port-Channel1 - description INBAND-MGMT-PARENTS-IPV6_Po27 + description inband-mgmt-parents-ipv6_Po27 no shutdown switchport trunk allowed vlan 107 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg index ded3f5a5166..d527a575250 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg @@ -23,7 +23,7 @@ vlan 106 vrf instance MGMT ! interface Port-Channel1 - description INBAND-MGMT-PARENTS-IPV6_Po26 + description inband-mgmt-parents-ipv6_Po26 no shutdown switchport trunk allowed vlan 106 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg index 519ade420d9..b8a2f7d8adc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg @@ -23,7 +23,7 @@ vlan 101 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -142,7 +142,7 @@ interface Vlan101 ip address 192.168.101.22/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg index 84546c94e21..032cb9afb8c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg @@ -23,7 +23,7 @@ vlan 101 name INBAND_MGMT ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -142,7 +142,7 @@ interface Vlan101 ip address 192.168.101.23/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg index 5d4503430a7..1fd751a9271 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg @@ -26,15 +26,15 @@ vlan 105 name Inband_management_vlan_ipv6 ! vlan 3000 - name MLAG_iBGP_INBANDMGMT + name MLAG_L3_VRF_INBANDMGMT trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance INBANDMGMT @@ -167,20 +167,20 @@ interface Vlan105 ip virtual-router address 192.168.105.1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf INBANDMGMT + description MLAG_L3_VRF_INBANDMGMT no shutdown mtu 9214 vrf INBANDMGMT ip address 100.64.1.4/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 100.64.1.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -257,7 +257,7 @@ router bgp 65002 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 100.64.1.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.5 description inband-mgmt-parent-dualstack2 + neighbor 100.64.1.5 description inband-mgmt-parent-dualstack2_Vlan4093 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -276,7 +276,7 @@ router bgp 65002 router-id 10.0.255.3 update wait-install neighbor 100.64.1.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.5 description inband-mgmt-parent-dualstack2 + neighbor 100.64.1.5 description inband-mgmt-parent-dualstack2_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg index b8fac5c7140..aec0d515b88 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg @@ -26,15 +26,15 @@ vlan 105 name Inband_management_vlan_ipv6 ! vlan 3000 - name MLAG_iBGP_INBANDMGMT + name MLAG_L3_VRF_INBANDMGMT trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance INBANDMGMT @@ -167,20 +167,20 @@ interface Vlan105 ip virtual-router address 192.168.105.1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf INBANDMGMT + description MLAG_L3_VRF_INBANDMGMT no shutdown mtu 9214 vrf INBANDMGMT ip address 100.64.1.5/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 100.64.1.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -257,7 +257,7 @@ router bgp 65002 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 100.64.1.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.4 description inband-mgmt-parent-dualstack1 + neighbor 100.64.1.4 description inband-mgmt-parent-dualstack1_Vlan4093 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -276,7 +276,7 @@ router bgp 65002 router-id 10.0.255.4 update wait-install neighbor 100.64.1.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.4 description inband-mgmt-parent-dualstack1 + neighbor 100.64.1.4 description inband-mgmt-parent-dualstack1_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg index 2d6390b38d2..4ddbadb1dad 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg @@ -26,11 +26,11 @@ vlan 107 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -157,13 +157,13 @@ interface Vlan107 ipv6 virtual-router address 2a00:107::1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 100.64.1.8/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -231,7 +231,7 @@ router bgp 65004 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 100.64.1.9 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.9 description inband-mgmt-parent-ipv6-2 + neighbor 100.64.1.9 description inband-mgmt-parent-ipv6-2_Vlan4093 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg index 87382838265..f25dcbd62d8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg @@ -26,11 +26,11 @@ vlan 107 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance INBANDMGMT @@ -161,13 +161,13 @@ interface Vlan107 ipv6 virtual-router address 2a00:107::1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 100.64.1.9/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -228,7 +228,7 @@ router bgp 65004 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 100.64.1.8 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 100.64.1.8 description inband-mgmt-parent-ipv6-1 + neighbor 100.64.1.8 description inband-mgmt-parent-ipv6-1_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg index e2ad689031f..f36c8324426 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg @@ -56,7 +56,7 @@ interface Port-Channel23 switchport ! interface Port-Channel101 - description INBAND-MGMT-MLAG-TEST_Po1 + description inband-mgmt-mlag-test_Po1 no shutdown switchport trunk allowed vlan 101 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent.cfg index 951af6e581f..743fb78cc72 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent.cfg @@ -56,7 +56,7 @@ interface Port-Channel23 switchport ! interface Port-Channel101 - description INBAND-MGMT-MLAG-TEST_Po1 + description inband-mgmt-mlag-test_Po1 no shutdown switchport trunk allowed vlan 101 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg index 5ddbfeafa3f..eff7f97132a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg @@ -22,21 +22,21 @@ spanning-tree mode none vrf instance MGMT ! interface Port-Channel5 - description P2P_LINK_TO_peer5_Port-Channel5 + description P2P_peer5_Port-Channel5 no shutdown mtu 9214 no switchport ip address 192.168.0.8/31 ! interface Port-Channel7 - description P2P_LINK_TO_peer6_Port-Channel7 + description P2P_peer6_Port-Channel7 no shutdown mtu 9214 no switchport ip address 192.168.0.10/31 ! interface ethernet1 - description P2P_LINK_TO_peer1_ethernet1 + description P2P_peer1_ethernet1 no shutdown mtu 2000 speed forced 10000full @@ -50,7 +50,7 @@ interface ethernet1 ! interface ethernet2 - description P2P_LINK_TO_peer2_ethernet2 + description P2P_peer2_ethernet2 no shutdown mtu 9214 no switchport @@ -58,7 +58,7 @@ interface ethernet2 ipv6 enable ! interface ethernet3 - description P2P_LINK_TO_peer3_ethernet3 + description P2P_peer3_ethernet3 no shutdown mtu 9214 no switchport @@ -72,22 +72,22 @@ interface ethernet4 ip address 192.168.0.6/31 ! interface Ethernet5 - description P2P_LINK_TO_peer5_Ethernet5 + description P2P_peer5_Ethernet5 no shutdown channel-group 5 mode active ! interface Ethernet6 - description P2P_LINK_TO_peer5_Ethernet6 + description P2P_peer5_Ethernet6 no shutdown channel-group 5 mode active ! interface Ethernet7 - description P2P_LINK_TO_peer6_Ethernet7 + description P2P_peer6_Ethernet7 no shutdown channel-group 7 mode active ! interface Ethernet8 - description P2P_LINK_TO_peer6_Ethernet8 + description P2P_peer6_Ethernet8 no shutdown channel-group 7 mode active ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg index 45c3553a68c..0020cc55df4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface ethernet1 - description P2P_LINK_TO_peer1_ethernet1 + description P2P_peer1_ethernet1 no shutdown mtu 2000 speed forced 10000full @@ -33,7 +33,7 @@ interface ethernet1 service-profile TEST-QOS-PROFILE ! interface ethernet2 - description P2P_LINK_TO_peer2_ethernet2 + description P2P_peer2_ethernet2 no shutdown mtu 9214 no switchport @@ -48,7 +48,7 @@ interface ethernet2 isis authentication key 7 $1c$sTNAlR6rKSw= ! interface ethernet3 - description P2P_LINK_TO_peer3_ethernet3 + description P2P_peer3_ethernet3 no shutdown mtu 9214 no switchport @@ -61,7 +61,7 @@ interface ethernet3 isis network point-to-point ! interface ethernet4 - description P2P_LINK_TO_peer4_ethernet4 + description P2P_peer4_ethernet4 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_multicast.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_multicast.cfg index f50964c9285..40a09c1ec2d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_multicast.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_multicast.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface ethernet1 - description P2P_LINK_TO_peer1_ethernet1 + description P2P_peer1_ethernet1 no shutdown mtu 9214 no switchport @@ -31,7 +31,7 @@ interface ethernet1 ip ospf area 0.0.0.0 ! interface ethernet2 - description P2P_LINK_TO_peer2_ethernet2 + description P2P_peer2_ethernet2 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg index 3a803615df8..f8eefd8c7c6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg @@ -22,7 +22,7 @@ spanning-tree mode none vrf instance MGMT ! interface ethernet1 - description P2P_LINK_TO_peer1_ethernet1 + description P2P_peer1_ethernet1 no shutdown mtu 2000 speed forced 10000full @@ -33,7 +33,7 @@ interface ethernet1 service-profile TEST-QOS-PROFILE ! interface ethernet2 - description P2P_LINK_TO_peer2_ethernet2 + description P2P_peer2_ethernet2 no shutdown mtu 9214 no switchport @@ -42,7 +42,7 @@ interface ethernet2 ip ospf area 0.0.0.0 ! interface ethernet3 - description P2P_LINK_TO_peer3_ethernet3 + description P2P_peer3_ethernet3 no shutdown mtu 9214 no switchport @@ -51,7 +51,7 @@ interface ethernet3 ip ospf area 0.0.0.0 ! interface ethernet4 - description P2P_LINK_TO_peer4_ethernet4 + description P2P_peer4_ethernet4 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg index 2a0b66f6599..e260d64385d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg @@ -53,6 +53,7 @@ router path-selection policy DEFAULT-POLICY-WITH-CP default-match load-balance LB-DEFAULT-POLICY-DEFAULT + ! 10 application-profile APP-PROFILE-CONTROL-PLANE load-balance LB-DEFAULT-POLICY-CONTROL-PLANE ! @@ -177,13 +178,14 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 2.2.2.2 peer group WAN-OVERLAY-PEERS - neighbor 2.2.2.2 description legacy-autovpn-rr3 + neighbor 2.2.2.2 description legacy-autovpn-rr3_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg index 6ab78a32ba8..ef675c79762 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg @@ -71,14 +71,17 @@ router path-selection policy DEFAULT-AUTOVPN-POLICY-WITH-CP 10 application-profile APP-PROFILE-CONTROL-PLANE load-balance LB-DEFAULT-AUTOVPN-POLICY-CONTROL-PLANE + ! 20 application-profile IT load-balance LB-DEFAULT-AUTOVPN-POLICY-IT ! policy PROD-AUTOVPN-POLICY default-match load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT + ! 10 application-profile VOICE load-balance LB-PROD-AUTOVPN-POLICY-VOICE + ! 20 application-profile VIDEO load-balance LB-PROD-AUTOVPN-POLICY-VIDEO ! @@ -204,15 +207,16 @@ router bgp 65000 neighbor WAN-OVERLAY-PEERS send-community neighbor WAN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.131.1 peer group WAN-OVERLAY-PEERS - neighbor 192.168.131.1 description legacy-autovpn-rr1 + neighbor 192.168.131.1 description legacy-autovpn-rr1_Dps1 neighbor 192.168.131.2 peer group WAN-OVERLAY-PEERS - neighbor 192.168.131.2 description legacy-autovpn-rr2 + neighbor 192.168.131.2 description legacy-autovpn-rr2_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg index 80dedca27a8..c4c31744a6c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg @@ -62,14 +62,17 @@ router path-selection policy DEFAULT-AUTOVPN-POLICY-WITH-CP 10 application-profile APP-PROFILE-CONTROL-PLANE load-balance LB-DEFAULT-AUTOVPN-POLICY-CONTROL-PLANE + ! 20 application-profile IT load-balance LB-DEFAULT-AUTOVPN-POLICY-IT ! policy PROD-AUTOVPN-POLICY default-match load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT + ! 10 application-profile VOICE load-balance LB-PROD-AUTOVPN-POLICY-VOICE + ! 20 application-profile VIDEO load-balance LB-PROD-AUTOVPN-POLICY-VIDEO ! @@ -186,12 +189,14 @@ router bgp 65000 neighbor WAN-RR-OVERLAY-PEERS send-community neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.131.2 peer group WAN-RR-OVERLAY-PEERS - neighbor 192.168.131.2 description legacy-autovpn-rr2 + neighbor 192.168.131.2 description legacy-autovpn-rr2_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor WAN-RR-OVERLAY-PEERS activate + neighbor WAN-RR-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg index 60bd116fa26..2ee3ada17ea 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg @@ -62,14 +62,17 @@ router path-selection policy DEFAULT-AUTOVPN-POLICY-WITH-CP 10 application-profile APP-PROFILE-CONTROL-PLANE load-balance LB-DEFAULT-AUTOVPN-POLICY-CONTROL-PLANE + ! 20 application-profile IT load-balance LB-DEFAULT-AUTOVPN-POLICY-IT ! policy PROD-AUTOVPN-POLICY default-match load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT + ! 10 application-profile VOICE load-balance LB-PROD-AUTOVPN-POLICY-VOICE + ! 20 application-profile VIDEO load-balance LB-PROD-AUTOVPN-POLICY-VIDEO ! @@ -187,12 +190,14 @@ router bgp 65000 neighbor WAN-RR-OVERLAY-PEERS send-community neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.131.1 peer group WAN-RR-OVERLAY-PEERS - neighbor 192.168.131.1 description legacy-autovpn-rr1 + neighbor 192.168.131.1 description legacy-autovpn-rr1_Dps1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection neighbor WAN-RR-OVERLAY-PEERS activate + neighbor WAN-RR-OVERLAY-PEERS encapsulation path-selection next-hop resolution disabled ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests-2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests-2.cfg index 533e06041e5..5bf07b78cbd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests-2.cfg @@ -26,7 +26,7 @@ vlan 300 name VLAN300_PHONE_ON_L2LEAF1_AND_2 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -606,7 +606,7 @@ interface Ethernet52 channel-group 43 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests.1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests.1.cfg index e386683e3f3..5d6d84ca698 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests.1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests.1.cfg @@ -29,7 +29,7 @@ vlan 300 name VLAN300_PHONE_ON_L2LEAF1_AND_2 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -561,7 +561,7 @@ interface Ethernet54 switchport ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/only-connected-endpoints.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/only-connected-endpoints.cfg new file mode 100644 index 00000000000..ad1a58920ca --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/only-connected-endpoints.cfg @@ -0,0 +1,108 @@ +! +hostname only-connected-endpoints +! +interface Port-Channel1 + description SERVER_TEST_SERVER_01 + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet1 + description SERVER_TEST_SERVER_01_Nic1 + no shutdown + channel-group 1 mode active +! +interface Ethernet2 + description SERVER_TEST_SERVER_01_Nic2 + no shutdown + channel-group 1 mode active +! +interface Ethernet12 + description SERVER_TEST_SERVER_01_Nic1 + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet20 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet21 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet22 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet23 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet24 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet25 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet26 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet27 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet28 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport +! +interface Ethernet29 + description Network Port + no shutdown + switchport trunk native vlan 1000 + switchport trunk allowed vlan 1-100 + switchport mode trunk + switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf1-ptp-disabled.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf1-ptp-disabled.cfg index c77f4eaddb2..ee0ac5ea40b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf1-ptp-disabled.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf1-ptp-disabled.cfg @@ -26,7 +26,7 @@ vlan 11 vrf instance MGMT ! interface Port-Channel1 - description PTP-TEST-LEAF_Po11 + description ptp-test-leaf_Po11 no shutdown switchport trunk allowed vlan 11 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.cfg index dea8fed0f94..ee2b2206f91 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.cfg @@ -18,17 +18,17 @@ service routing protocols model multi-agent hostname ptp-tests-l2leaf2-ptp-enabled-uplink-disabled ! ptp clock-identity 00:1C:73:7f:00:03 -ptp priority1 127 -ptp priority2 3 ptp domain 127 ptp mode boundary +ptp priority1 127 +ptp priority2 3 ptp monitor threshold offset-from-master 250 ptp monitor threshold mean-path-delay 1500 ptp monitor sequence-id -ptp monitor threshold missing-message announce 3 sequence-ids -ptp monitor threshold missing-message delay-resp 3 sequence-ids -ptp monitor threshold missing-message follow-up 3 sequence-ids ptp monitor threshold missing-message sync 3 sequence-ids +ptp monitor threshold missing-message follow-up 3 sequence-ids +ptp monitor threshold missing-message delay-resp 3 sequence-ids +ptp monitor threshold missing-message announce 3 sequence-ids ! spanning-tree mode mstp spanning-tree mst 0 priority 32768 @@ -39,7 +39,7 @@ vlan 11 vrf instance MGMT ! interface Port-Channel1 - description PTP-TEST-LEAF_Po14 + description ptp-test-leaf_Po14 no shutdown switchport trunk allowed vlan 11 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled.cfg index 1a854fda30c..66c2e089862 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf2-ptp-enabled.cfg @@ -18,17 +18,17 @@ service routing protocols model multi-agent hostname ptp-tests-l2leaf2-ptp-enabled ! ptp clock-identity 00:1C:73:7f:00:02 -ptp priority1 127 -ptp priority2 2 ptp domain 127 ptp mode boundary +ptp priority1 127 +ptp priority2 2 ptp monitor threshold offset-from-master 250 ptp monitor threshold mean-path-delay 1500 ptp monitor sequence-id -ptp monitor threshold missing-message announce 3 sequence-ids -ptp monitor threshold missing-message delay-resp 3 sequence-ids -ptp monitor threshold missing-message follow-up 3 sequence-ids ptp monitor threshold missing-message sync 3 sequence-ids +ptp monitor threshold missing-message follow-up 3 sequence-ids +ptp monitor threshold missing-message delay-resp 3 sequence-ids +ptp monitor threshold missing-message announce 3 sequence-ids ! spanning-tree mode mstp spanning-tree mst 0 priority 32768 @@ -39,7 +39,7 @@ vlan 11 vrf instance MGMT ! interface Port-Channel1 - description PTP-TEST-LEAF_Po12 + description ptp-test-leaf_Po12 no shutdown switchport trunk allowed vlan 11 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg index ea3cf19f51d..a8862e36df8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg @@ -18,17 +18,17 @@ service routing protocols model multi-agent hostname ptp-tests-leaf1 ! ptp clock-identity 11:11:11:11:11:11 -ptp priority1 30 -ptp priority2 1 ptp domain 127 ptp mode boundary one-step +ptp priority1 30 +ptp priority2 1 ptp monitor threshold offset-from-master 250 ptp monitor threshold mean-path-delay 1500 ptp monitor sequence-id -ptp monitor threshold missing-message announce 3 sequence-ids -ptp monitor threshold missing-message delay-resp 3 sequence-ids -ptp monitor threshold missing-message follow-up 3 sequence-ids ptp monitor threshold missing-message sync 3 sequence-ids +ptp monitor threshold missing-message follow-up 3 sequence-ids +ptp monitor threshold missing-message delay-resp 3 sequence-ids +ptp monitor threshold missing-message announce 3 sequence-ids ! spanning-tree mode mstp no spanning-tree vlan-id 4093-4094 @@ -38,15 +38,15 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -113,7 +113,7 @@ interface Port-Channel14 mlag 14 ! interface Ethernet1 - description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet1 + description P2P_ptp-tests-spine1_Ethernet1 no shutdown mtu 9214 no switchport @@ -126,7 +126,7 @@ interface Ethernet1 ptp delay-req interval -3 ! interface Ethernet2 - description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet2 + description P2P_ptp-tests-spine1_Ethernet2 no shutdown mtu 9214 no switchport @@ -233,20 +233,20 @@ interface Vlan11 ip address 172.16.11.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 ip address 10.254.1.96/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.96/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -309,7 +309,7 @@ router bgp 65101 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.97 description ptp-tests-leaf2 + neighbor 10.254.1.97 description ptp-tests-leaf2_Vlan4093 neighbor 10.254.2.0 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.0 remote-as 65200 neighbor 10.254.2.0 description ptp-tests-spine1_Ethernet1 @@ -318,7 +318,7 @@ router bgp 65101 neighbor 10.254.2.2 description ptp-tests-spine1_Ethernet2 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description ptp-tests-spine1 + neighbor 10.255.0.1 description ptp-tests-spine1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 @@ -340,7 +340,7 @@ router bgp 65101 route-target export evpn 1:1 router-id 10.254.1.1 neighbor 10.254.1.97 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.97 description ptp-tests-leaf2 + neighbor 10.254.1.97 description ptp-tests-leaf2_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg index 51444be97b5..7f157892034 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg @@ -17,25 +17,25 @@ service routing protocols model multi-agent ! hostname ptp-tests-leaf2 ! -ptp source ip 10.254.1.2 -ptp priority1 40 -ptp priority2 1 -ptp ttl 16 ptp domain 127 -ptp message-type general dscp 46 default ptp message-type event dscp 48 default +ptp message-type general dscp 46 default ptp mode boundary +ptp priority1 40 +ptp priority2 1 +ptp source ip 10.254.1.2 +ptp ttl 16 ptp forward-unicast ptp monitor threshold offset-from-master 1234 ptp monitor threshold mean-path-delay 4567 -ptp monitor threshold missing-message announce 10 intervals -ptp monitor threshold missing-message follow-up 9 intervals ptp monitor threshold missing-message sync 8 intervals +ptp monitor threshold missing-message follow-up 9 intervals +ptp monitor threshold missing-message announce 10 intervals ptp monitor sequence-id -ptp monitor threshold missing-message announce 11 sequence-ids -ptp monitor threshold missing-message delay-resp 12 sequence-ids -ptp monitor threshold missing-message follow-up 13 sequence-ids ptp monitor threshold missing-message sync 14 sequence-ids +ptp monitor threshold missing-message follow-up 13 sequence-ids +ptp monitor threshold missing-message delay-resp 12 sequence-ids +ptp monitor threshold missing-message announce 11 sequence-ids ! spanning-tree mode mstp no spanning-tree vlan-id 4093-4094 @@ -45,15 +45,15 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -120,7 +120,7 @@ interface Port-Channel14 mlag 14 ! interface Ethernet1 - description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet3 + description P2P_ptp-tests-spine1_Ethernet3 no shutdown mtu 9214 no switchport @@ -133,7 +133,7 @@ interface Ethernet1 ptp delay-req interval -3 ! interface Ethernet2 - description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet4 + description P2P_ptp-tests-spine1_Ethernet4 no shutdown mtu 9214 no switchport @@ -213,20 +213,20 @@ interface Vlan11 ip address 172.17.11.1/24 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 ip address 10.254.1.97/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.97/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -289,7 +289,7 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.96 description ptp-tests-leaf1 + neighbor 10.254.1.96 description ptp-tests-leaf1_Vlan4093 neighbor 10.254.2.4 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.4 remote-as 65200 neighbor 10.254.2.4 description ptp-tests-spine1_Ethernet3 @@ -298,7 +298,7 @@ router bgp 65102 neighbor 10.254.2.6 description ptp-tests-spine1_Ethernet4 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description ptp-tests-spine1 + neighbor 10.255.0.1 description ptp-tests-spine1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 @@ -320,7 +320,7 @@ router bgp 65102 route-target export evpn 1:1 router-id 10.254.1.2 neighbor 10.254.1.96 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.96 description ptp-tests-leaf1 + neighbor 10.254.1.96 description ptp-tests-leaf1_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg index e3804189dfa..dabb333920e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg @@ -18,24 +18,24 @@ service routing protocols model multi-agent hostname ptp-tests-spine1 ! ptp clock-identity 00:00:00:00:00:00 -ptp priority1 20 -ptp priority2 1 ptp domain 127 ptp mode boundary one-step +ptp priority1 20 +ptp priority2 1 ptp monitor threshold offset-from-master 250 ptp monitor threshold mean-path-delay 1500 ptp monitor sequence-id -ptp monitor threshold missing-message announce 3 sequence-ids -ptp monitor threshold missing-message delay-resp 3 sequence-ids -ptp monitor threshold missing-message follow-up 3 sequence-ids ptp monitor threshold missing-message sync 3 sequence-ids +ptp monitor threshold missing-message follow-up 3 sequence-ids +ptp monitor threshold missing-message delay-resp 3 sequence-ids +ptp monitor threshold missing-message announce 3 sequence-ids ! spanning-tree mode none ! vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_PTP-TESTS-LEAF1_Ethernet1 + description P2P_ptp-tests-leaf1_Ethernet1 no shutdown mtu 9214 no switchport @@ -48,7 +48,7 @@ interface Ethernet1 ptp delay-req interval -3 ! interface Ethernet2 - description P2P_LINK_TO_PTP-TESTS-LEAF1_Ethernet2 + description P2P_ptp-tests-leaf1_Ethernet2 no shutdown mtu 9214 no switchport @@ -61,7 +61,7 @@ interface Ethernet2 ptp delay-req interval -3 ! interface Ethernet3 - description P2P_LINK_TO_PTP-TESTS-LEAF2_Ethernet1 + description P2P_ptp-tests-leaf2_Ethernet1 no shutdown mtu 9214 no switchport @@ -74,7 +74,7 @@ interface Ethernet3 ptp delay-req interval -3 ! interface Ethernet4 - description P2P_LINK_TO_PTP-TESTS-LEAF2_Ethernet2 + description P2P_ptp-tests-leaf2_Ethernet2 no shutdown mtu 9214 no switchport @@ -87,7 +87,7 @@ interface Ethernet4 ptp delay-req interval -3 ! interface Ethernet6 - description P2P_LINK_TO_ptp-tests-spine2_Ethernet6 + description P2P_ptp-tests-spine2_Ethernet6 no shutdown mtu 9214 no switchport @@ -99,7 +99,7 @@ interface Ethernet6 ptp delay-req interval -3 ! interface Ethernet7 - description P2P_LINK_TO_ptp-tests-spine2_Ethernet7 + description P2P_ptp-tests-spine2_Ethernet7 no shutdown mtu 9214 no switchport @@ -111,7 +111,7 @@ interface Ethernet7 ptp delay-req interval -3 ! interface Ethernet8 - description P2P_LINK_TO_ptp-tests-spine2_Ethernet8 + description P2P_ptp-tests-spine2_Ethernet8 no shutdown mtu 9214 no switchport @@ -123,7 +123,7 @@ interface Ethernet8 ptp delay-req interval -3 ! interface Ethernet9 - description P2P_LINK_TO_ptp-tests-spine2_Ethernet9 + description P2P_ptp-tests-spine2_Ethernet9 no shutdown mtu 9214 no switchport @@ -176,10 +176,10 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.254.1.1 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.1 remote-as 65101 - neighbor 10.254.1.1 description ptp-tests-leaf1 + neighbor 10.254.1.1 description ptp-tests-leaf1_Loopback0 neighbor 10.254.1.2 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.2 remote-as 65102 - neighbor 10.254.1.2 description ptp-tests-leaf2 + neighbor 10.254.1.2 description ptp-tests-leaf2_Loopback0 neighbor 10.254.2.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.1 remote-as 65101 neighbor 10.254.2.1 description ptp-tests-leaf1_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg index ece4043dc8b..9b9c10c22a6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg @@ -18,32 +18,32 @@ service routing protocols model multi-agent hostname ptp-tests-spine2 ! ptp clock-identity 01:02:03:14:00:0a -ptp source ip 10.255.0.1 -ptp priority1 20 -ptp priority2 10 -ptp ttl 128 ptp domain 127 -ptp message-type general dscp 46 default ptp message-type event dscp 48 default +ptp message-type general dscp 46 default ptp mode boundary one-step +ptp priority1 20 +ptp priority2 10 +ptp source ip 10.255.0.1 +ptp ttl 128 ptp forward-unicast ptp monitor threshold offset-from-master 1234 ptp monitor threshold mean-path-delay 4567 -ptp monitor threshold missing-message announce 10 intervals -ptp monitor threshold missing-message follow-up 9 intervals ptp monitor threshold missing-message sync 8 intervals +ptp monitor threshold missing-message follow-up 9 intervals +ptp monitor threshold missing-message announce 10 intervals ptp monitor sequence-id -ptp monitor threshold missing-message announce 11 sequence-ids -ptp monitor threshold missing-message delay-resp 12 sequence-ids -ptp monitor threshold missing-message follow-up 13 sequence-ids ptp monitor threshold missing-message sync 14 sequence-ids +ptp monitor threshold missing-message follow-up 13 sequence-ids +ptp monitor threshold missing-message delay-resp 12 sequence-ids +ptp monitor threshold missing-message announce 11 sequence-ids ! spanning-tree mode none ! vrf instance MGMT ! interface Ethernet6 - description P2P_LINK_TO_ptp-tests-spine1_Ethernet6 + description P2P_ptp-tests-spine1_Ethernet6 no shutdown mtu 9214 no switchport @@ -55,7 +55,7 @@ interface Ethernet6 ptp delay-req interval -3 ! interface Ethernet7 - description P2P_LINK_TO_ptp-tests-spine1_Ethernet7 + description P2P_ptp-tests-spine1_Ethernet7 no shutdown mtu 9214 no switchport @@ -67,7 +67,7 @@ interface Ethernet7 ptp delay-req interval -3 ! interface Ethernet8 - description P2P_LINK_TO_ptp-tests-spine1_Ethernet8 + description P2P_ptp-tests-spine1_Ethernet8 no shutdown mtu 9214 no switchport @@ -79,7 +79,7 @@ interface Ethernet8 ptp delay-req interval -3 ! interface Ethernet9 - description P2P_LINK_TO_ptp-tests-spine1_Ethernet9 + description P2P_ptp-tests-spine1_Ethernet9 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine3.cfg index f45e95a887d..0ca103fa971 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine3.cfg @@ -17,17 +17,17 @@ service routing protocols model multi-agent ! hostname ptp-tests-spine3 ! -ptp priority1 20 -ptp priority2 3 ptp domain 127 ptp mode boundary one-step +ptp priority1 20 +ptp priority2 3 ptp monitor threshold offset-from-master 250 ptp monitor threshold mean-path-delay 1500 ptp monitor sequence-id -ptp monitor threshold missing-message announce 3 sequence-ids -ptp monitor threshold missing-message delay-resp 3 sequence-ids -ptp monitor threshold missing-message follow-up 3 sequence-ids ptp monitor threshold missing-message sync 3 sequence-ids +ptp monitor threshold missing-message follow-up 3 sequence-ids +ptp monitor threshold missing-message delay-resp 3 sequence-ids +ptp monitor threshold missing-message announce 3 sequence-ids ! spanning-tree mode none ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg index 65316638ffe..6d4a83c9ccb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg @@ -34,7 +34,7 @@ vlan 4092 vrf instance MGMT ! interface Port-Channel1 - description SFLOW-TESTS-LEAF-MLAG_Po16 + description sflow-tests-leaf-mlag_Po16 no shutdown switchport trunk allowed vlan 11,4092 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg index 761c8a3bd90..b56cebc5c40 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg @@ -34,7 +34,7 @@ vlan 4092 vrf instance MGMT ! interface Port-Channel1 - description SFLOW-TESTS-LEAF-MLAG_Po17 + description sflow-tests-leaf-mlag_Po17 no shutdown switchport trunk allowed vlan 11,4092 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf1.cfg index fd5b1e239be..6cde38e9a03 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf1.cfg @@ -35,7 +35,7 @@ vrf instance MGMT vrf instance VRF1 ! interface Ethernet1 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet1 + description P2P_sflow-tests-spine1_Ethernet1 no shutdown mtu 9214 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 sflow enable ! interface Ethernet2 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet2 + description P2P_sflow-tests-spine1_Ethernet2 no shutdown mtu 9214 no switchport @@ -142,7 +142,7 @@ router bgp 65101 neighbor 10.254.2.2 description sflow-tests-spine1_Ethernet2 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description sflow-tests-spine1 + neighbor 10.255.0.1 description sflow-tests-spine1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf2.cfg index 494ba3d6049..49949a4fe03 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf2.cfg @@ -35,7 +35,7 @@ vrf instance MGMT vrf instance VRF1 ! interface Ethernet1 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet3 + description P2P_sflow-tests-spine1_Ethernet3 no shutdown mtu 9214 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 sflow enable ! interface Ethernet2 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet4 + description P2P_sflow-tests-spine1_Ethernet4 no shutdown mtu 9214 no switchport @@ -118,7 +118,7 @@ router bgp 65102 neighbor 10.254.2.6 description sflow-tests-spine1_Ethernet4 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description sflow-tests-spine1 + neighbor 10.255.0.1 description sflow-tests-spine1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan 11 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg index 22e3e3ba4a7..e2827748365 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf3.cfg @@ -32,18 +32,18 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4092 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -100,7 +100,7 @@ interface Port-Channel17 sflow enable ! interface Ethernet1 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet5 + description P2P_sflow-tests-spine1_Ethernet5 no shutdown mtu 9214 no switchport @@ -108,7 +108,7 @@ interface Ethernet1 sflow enable ! interface Ethernet2 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet6 + description P2P_sflow-tests-spine1_Ethernet6 no shutdown mtu 9214 no switchport @@ -167,7 +167,7 @@ interface Vlan11 vrf VRF1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 @@ -182,13 +182,13 @@ interface Vlan4092 ip virtual-router address 10.254.254.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.104/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -259,7 +259,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.105 description sflow-tests-leaf4 + neighbor 10.254.1.105 description sflow-tests-leaf4_Vlan4093 neighbor 10.254.2.16 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.16 remote-as 65200 neighbor 10.254.2.16 description sflow-tests-spine1_Ethernet5 @@ -268,7 +268,7 @@ router bgp 65105 neighbor 10.254.2.18 description sflow-tests-spine1_Ethernet6 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description sflow-tests-spine1 + neighbor 10.255.0.1 description sflow-tests-spine1_Loopback0 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -291,7 +291,7 @@ router bgp 65105 route-target export evpn 1:1 router-id 10.254.1.5 neighbor 10.254.1.105 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.105 description sflow-tests-leaf4 + neighbor 10.254.1.105 description sflow-tests-leaf4_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg index 20b3ca357a8..ea6aa23165b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf4.cfg @@ -32,18 +32,18 @@ vlan 11 name VLAN11 ! vlan 3000 - name MLAG_iBGP_VRF1 + name MLAG_L3_VRF_VRF1 trunk group MLAG ! vlan 4092 name INBAND_MGMT ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -100,7 +100,7 @@ interface Port-Channel17 sflow enable ! interface Ethernet1 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet7 + description P2P_sflow-tests-spine1_Ethernet7 no shutdown mtu 9214 no switchport @@ -108,7 +108,7 @@ interface Ethernet1 sflow enable ! interface Ethernet2 - description P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet8 + description P2P_sflow-tests-spine1_Ethernet8 no shutdown mtu 9214 no switchport @@ -167,7 +167,7 @@ interface Vlan11 vrf VRF1 ! interface Vlan3000 - description MLAG_PEER_L3_iBGP: vrf VRF1 + description MLAG_L3_VRF_VRF1 no shutdown mtu 9214 vrf VRF1 @@ -182,13 +182,13 @@ interface Vlan4092 ip virtual-router address 10.254.254.1 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.254.1.105/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -259,7 +259,7 @@ router bgp 65105 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.104 description sflow-tests-leaf3 + neighbor 10.254.1.104 description sflow-tests-leaf3_Vlan4093 neighbor 10.254.2.20 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.20 remote-as 65200 neighbor 10.254.2.20 description sflow-tests-spine1_Ethernet7 @@ -268,7 +268,7 @@ router bgp 65105 neighbor 10.254.2.22 description sflow-tests-spine1_Ethernet8 neighbor 10.255.0.1 peer group EVPN-OVERLAY-PEERS neighbor 10.255.0.1 remote-as 65200 - neighbor 10.255.0.1 description sflow-tests-spine1 + neighbor 10.255.0.1 description sflow-tests-spine1_Loopback0 redistribute attached-host redistribute connected route-map RM-CONN-2-BGP ! @@ -291,7 +291,7 @@ router bgp 65105 route-target export evpn 1:1 router-id 10.254.1.6 neighbor 10.254.1.104 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.254.1.104 description sflow-tests-leaf3 + neighbor 10.254.1.104 description sflow-tests-leaf3_Vlan3000 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine1.cfg index 2f95109baa3..20c38f678ae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine1.cfg @@ -29,7 +29,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_SFLOW-TESTS-LEAF1_Ethernet1 + description P2P_sflow-tests-leaf1_Ethernet1 no shutdown mtu 9214 no switchport @@ -37,7 +37,7 @@ interface Ethernet1 sflow enable ! interface Ethernet2 - description P2P_LINK_TO_SFLOW-TESTS-LEAF1_Ethernet2 + description P2P_sflow-tests-leaf1_Ethernet2 no shutdown mtu 9214 no switchport @@ -45,7 +45,7 @@ interface Ethernet2 sflow enable ! interface Ethernet3 - description P2P_LINK_TO_SFLOW-TESTS-LEAF2_Ethernet1 + description P2P_sflow-tests-leaf2_Ethernet1 no shutdown mtu 9214 no switchport @@ -53,7 +53,7 @@ interface Ethernet3 sflow enable ! interface Ethernet4 - description P2P_LINK_TO_SFLOW-TESTS-LEAF2_Ethernet2 + description P2P_sflow-tests-leaf2_Ethernet2 no shutdown mtu 9214 no switchport @@ -61,7 +61,7 @@ interface Ethernet4 sflow enable ! interface Ethernet5 - description P2P_LINK_TO_SFLOW-TESTS-LEAF3_Ethernet1 + description P2P_sflow-tests-leaf3_Ethernet1 no shutdown mtu 9214 no switchport @@ -69,7 +69,7 @@ interface Ethernet5 sflow enable ! interface Ethernet6 - description P2P_LINK_TO_SFLOW-TESTS-LEAF3_Ethernet2 + description P2P_sflow-tests-leaf3_Ethernet2 no shutdown mtu 9214 no switchport @@ -77,7 +77,7 @@ interface Ethernet6 sflow enable ! interface Ethernet7 - description P2P_LINK_TO_SFLOW-TESTS-LEAF4_Ethernet1 + description P2P_sflow-tests-leaf4_Ethernet1 no shutdown mtu 9214 no switchport @@ -85,7 +85,7 @@ interface Ethernet7 sflow enable ! interface Ethernet8 - description P2P_LINK_TO_SFLOW-TESTS-LEAF4_Ethernet2 + description P2P_sflow-tests-leaf4_Ethernet2 no shutdown mtu 9214 no switchport @@ -93,42 +93,42 @@ interface Ethernet8 sflow enable ! interface Ethernet9 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet9 + description P2P_sflow-tests-spine2_Ethernet9 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet10 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet10 + description P2P_sflow-tests-spine2_Ethernet10 no shutdown mtu 9214 no switchport no sflow enable ! interface Ethernet11 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet11 + description P2P_sflow-tests-spine2_Ethernet11 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet12 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet12 + description P2P_sflow-tests-spine2_Ethernet12 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet13 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet13 + description P2P_sflow-tests-spine2_Ethernet13 no shutdown mtu 9214 no switchport no sflow enable ! interface Ethernet14 - description P2P_LINK_TO_sflow-tests-spine2_Ethernet14 + description P2P_sflow-tests-spine2_Ethernet14 no shutdown mtu 9214 no switchport @@ -176,16 +176,16 @@ router bgp 65200 neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 neighbor 10.254.1.1 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.1 remote-as 65101 - neighbor 10.254.1.1 description sflow-tests-leaf1 + neighbor 10.254.1.1 description sflow-tests-leaf1_Loopback0 neighbor 10.254.1.2 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.2 remote-as 65102 - neighbor 10.254.1.2 description sflow-tests-leaf2 + neighbor 10.254.1.2 description sflow-tests-leaf2_Loopback0 neighbor 10.254.1.5 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.5 remote-as 65105 - neighbor 10.254.1.5 description sflow-tests-leaf3 + neighbor 10.254.1.5 description sflow-tests-leaf3_Loopback0 neighbor 10.254.1.6 peer group EVPN-OVERLAY-PEERS neighbor 10.254.1.6 remote-as 65105 - neighbor 10.254.1.6 description sflow-tests-leaf4 + neighbor 10.254.1.6 description sflow-tests-leaf4_Loopback0 neighbor 10.254.2.1 peer group IPv4-UNDERLAY-PEERS neighbor 10.254.2.1 remote-as 65101 neighbor 10.254.2.1 description sflow-tests-leaf1_Ethernet1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine2.cfg index 40336e9a9c2..6e0e20b00a4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-spine2.cfg @@ -29,42 +29,42 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet9 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet9 + description P2P_sflow-tests-spine1_Ethernet9 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet10 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet10 + description P2P_sflow-tests-spine1_Ethernet10 no shutdown mtu 9214 no switchport no sflow enable ! interface Ethernet11 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet11 + description P2P_sflow-tests-spine1_Ethernet11 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet12 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet12 + description P2P_sflow-tests-spine1_Ethernet12 no shutdown mtu 9214 no switchport sflow enable ! interface Ethernet13 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet13 + description P2P_sflow-tests-spine1_Ethernet13 no shutdown mtu 9214 no switchport no sflow enable ! interface Ethernet14 - description P2P_LINK_TO_sflow-tests-spine1_Ethernet14 + description P2P_sflow-tests-spine1_Ethernet14 no shutdown mtu 9214 no switchport diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg index 4a0c6cfba01..a11359e4cdf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg @@ -35,14 +35,14 @@ vrf instance MGMT vrf instance PROD ! interface Ethernet1 - description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52 + description P2P_cv-pathfinder-edge_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.0/31 ! interface Ethernet1.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-edge_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -50,7 +50,7 @@ interface Ethernet1.142 ip address 172.17.0.0/31 ! interface Ethernet1.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -58,7 +58,7 @@ interface Ethernet1.666 ip address 172.17.0.0/31 ! interface Ethernet1.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-edge_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -66,14 +66,14 @@ interface Ethernet1.1000 ip address 172.17.0.0/31 ! interface Ethernet2 - description P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52 + description P2P_cv-pathfinder-edge1_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.2/31 ! interface Ethernet2.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-edge1_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -81,7 +81,7 @@ interface Ethernet2.142 ip address 172.17.0.2/31 ! interface Ethernet2.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge1_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -89,7 +89,7 @@ interface Ethernet2.666 ip address 172.17.0.2/31 ! interface Ethernet2.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-edge1_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf1.cfg index 8722ccbcc58..3564135219f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf1.cfg @@ -35,14 +35,14 @@ vrf instance MGMT vrf instance PROD ! interface Ethernet1 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52 + description P2P_cv-pathfinder-transit1A_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.0/31 ! interface Ethernet1.142 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-transit1A_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -50,7 +50,7 @@ interface Ethernet1.142 ip address 172.17.0.0/31 ! interface Ethernet1.666 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-transit1A_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -58,7 +58,7 @@ interface Ethernet1.666 ip address 172.17.0.0/31 ! interface Ethernet1.1000 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-transit1A_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -66,14 +66,14 @@ interface Ethernet1.1000 ip address 172.17.0.0/31 ! interface Ethernet2 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52 + description P2P_cv-pathfinder-transit1B_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.2/31 ! interface Ethernet2.142 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-transit1B_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -81,7 +81,7 @@ interface Ethernet2.142 ip address 172.17.0.2/31 ! interface Ethernet2.666 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-transit1B_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -89,7 +89,7 @@ interface Ethernet2.666 ip address 172.17.0.2/31 ! interface Ethernet2.1000 - description P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-transit1B_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2A.cfg index 58c8068ef33..13a847233f4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2A.cfg @@ -35,14 +35,14 @@ vrf instance MGMT vrf instance PROD ! interface Ethernet1 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52 + description P2P_cv-pathfinder-edge2A_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.4/31 ! interface Ethernet1.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-edge2A_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -50,7 +50,7 @@ interface Ethernet1.142 ip address 172.17.0.4/31 ! interface Ethernet1.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge2A_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -58,7 +58,7 @@ interface Ethernet1.666 ip address 172.17.0.4/31 ! interface Ethernet1.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-edge2A_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -66,14 +66,14 @@ interface Ethernet1.1000 ip address 172.17.0.4/31 ! interface Ethernet2 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52 + description P2P_cv-pathfinder-edge2B_Ethernet52 no shutdown mtu 9214 no switchport ip address 172.17.0.8/31 ! interface Ethernet2.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.142_vrf_PROD + description P2P_cv-pathfinder-edge2B_Ethernet52.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -81,7 +81,7 @@ interface Ethernet2.142 ip address 172.17.0.8/31 ! interface Ethernet2.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge2B_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -89,7 +89,7 @@ interface Ethernet2.666 ip address 172.17.0.8/31 ! interface Ethernet2.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.1000_vrf_IT + description P2P_cv-pathfinder-edge2B_Ethernet52.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2B.cfg index 8306ca67754..c7e811ae16e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-enabled-leaf2B.cfg @@ -35,14 +35,14 @@ vrf instance MGMT vrf instance PROD ! interface Ethernet1 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53 + description P2P_cv-pathfinder-edge2A_Ethernet53 no shutdown mtu 9214 no switchport ip address 172.17.0.6/31 ! interface Ethernet1.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.142_vrf_PROD + description P2P_cv-pathfinder-edge2A_Ethernet53.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -50,7 +50,7 @@ interface Ethernet1.142 ip address 172.17.0.6/31 ! interface Ethernet1.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge2A_Ethernet53.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -58,7 +58,7 @@ interface Ethernet1.666 ip address 172.17.0.6/31 ! interface Ethernet1.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.1000_vrf_IT + description P2P_cv-pathfinder-edge2A_Ethernet53.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 @@ -66,14 +66,14 @@ interface Ethernet1.1000 ip address 172.17.0.6/31 ! interface Ethernet2 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53 + description P2P_cv-pathfinder-edge2B_Ethernet53 no shutdown mtu 9214 no switchport ip address 172.17.0.10/31 ! interface Ethernet2.142 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.142_vrf_PROD + description P2P_cv-pathfinder-edge2B_Ethernet53.142_VRF_PROD no shutdown mtu 9214 encapsulation dot1q vlan 142 @@ -81,7 +81,7 @@ interface Ethernet2.142 ip address 172.17.0.10/31 ! interface Ethernet2.666 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description P2P_cv-pathfinder-edge2B_Ethernet53.666_VRF_ATTRACTED-VRF-FROM-UPLINK no shutdown mtu 9214 encapsulation dot1q vlan 666 @@ -89,7 +89,7 @@ interface Ethernet2.666 ip address 172.17.0.10/31 ! interface Ethernet2.1000 - description P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.1000_vrf_IT + description P2P_cv-pathfinder-edge2B_Ethernet53.1000_VRF_IT no shutdown mtu 9214 encapsulation dot1q vlan 1000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/snmp-settings-1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/snmp-settings-1.cfg index df21d44b1a8..97560aee4ff 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/snmp-settings-1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/snmp-settings-1.cfg @@ -17,13 +17,13 @@ service routing protocols model multi-agent ! hostname snmp-settings-1 ! -snmp-server contact example@example.com snmp-server ipv4 access-list SNMP-MGMT vrf MGMT snmp-server ipv4 access-list onur snmp-server ipv6 access-list SNMP-MGMT vrf MGMT snmp-server ipv6 access-list onur_v6 -snmp-server view VW-WRITE iso included +snmp-server contact example@example.com snmp-server view VW-READ iso included +snmp-server view VW-WRITE iso included snmp-server community SNMP-COMMUNITY-1 ro onur snmp-server community SNMP-COMMUNITY-2 view VW-READ rw ipv6 SNMP-MGMT SNMP-MGMT snmp-server community SNMP-COMMUNITY-3 ro diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1a.cfg index 758c0b850e0..067c7262f77 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1a.cfg @@ -72,7 +72,7 @@ vlan 399 trunk group UPLINK ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -127,7 +127,7 @@ interface Ethernet13 channel-group 13 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg index 33acab1495a..6f3cd14f8e6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg @@ -64,7 +64,7 @@ vlan 399 trunk group CUSTOM_UPLINK_TG_NAME ! vlan 4094 - name MLAG_PEER + name MLAG trunk group CUSTOM_MLAG_TG_NAME ! vrf instance MGMT @@ -127,7 +127,7 @@ interface Ethernet13 channel-group 13 mode active ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg index 45920c520e5..2e0dc05dea4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg @@ -86,23 +86,23 @@ vlan 399 trunk group TRUNK_GROUP_TESTS_L2LEAF1 ! vlan 3099 - name MLAG_iBGP_TG_100 + name MLAG_L3_VRF_TG_100 trunk group MLAG ! vlan 3199 - name MLAG_iBGP_TG_200 + name MLAG_L3_VRF_TG_200 trunk group MLAG ! vlan 3299 - name MLAG_iBGP_TG_300 + name MLAG_L3_VRF_TG_300 trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -224,34 +224,34 @@ interface Vlan398 ip address virtual 10.3.1.1/24 ! interface Vlan3099 - description MLAG_PEER_L3_iBGP: vrf TG_100 + description MLAG_L3_VRF_TG_100 no shutdown mtu 9214 vrf TG_100 ip address 10.255.247.0/31 ! interface Vlan3199 - description MLAG_PEER_L3_iBGP: vrf TG_200 + description MLAG_L3_VRF_TG_200 no shutdown mtu 9214 vrf TG_200 ip address 10.255.247.0/31 ! interface Vlan3299 - description MLAG_PEER_L3_iBGP: vrf TG_300 + description MLAG_L3_VRF_TG_300 no shutdown mtu 9214 vrf TG_300 ip address 10.255.247.0/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.247.0/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -330,7 +330,7 @@ router bgp 65001 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b + neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 100 @@ -398,7 +398,7 @@ router bgp 65001 router-id 192.168.250.9 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b + neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b_Vlan3099 redistribute connected ! vrf TG_200 @@ -408,7 +408,7 @@ router bgp 65001 router-id 192.168.250.9 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b + neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b_Vlan3199 redistribute connected ! vrf TG_300 @@ -418,7 +418,7 @@ router bgp 65001 router-id 192.168.250.9 update wait-install neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b + neighbor 10.255.247.1 description trunk-group-tests-l3leaf1b_Vlan3299 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg index cb2617a6168..3961f1731a8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg @@ -74,23 +74,23 @@ vlan 399 trunk group TRUNK_GROUP_TESTS_L2LEAF1 ! vlan 3099 - name MLAG_iBGP_TG_100 + name MLAG_L3_VRF_TG_100 trunk group CUSTOM_LEAF_PEER_L3_TG_NAME ! vlan 3199 - name MLAG_iBGP_TG_200 + name MLAG_L3_VRF_TG_200 trunk group CUSTOM_LEAF_PEER_L3_TG_NAME ! vlan 3299 - name MLAG_iBGP_TG_300 + name MLAG_L3_VRF_TG_300 trunk group CUSTOM_LEAF_PEER_L3_TG_NAME ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group CUSTOM_LEAF_PEER_L3_TG_NAME ! vlan 4094 - name MLAG_PEER + name MLAG trunk group CUSTOM_MLAG_TG_NAME ! vrf instance MGMT @@ -205,34 +205,34 @@ interface Vlan398 ip address virtual 10.3.1.1/24 ! interface Vlan3099 - description MLAG_PEER_L3_iBGP: vrf TG_100 + description MLAG_L3_VRF_TG_100 no shutdown mtu 9214 vrf TG_100 ip address 10.255.247.1/31 ! interface Vlan3199 - description MLAG_PEER_L3_iBGP: vrf TG_200 + description MLAG_L3_VRF_TG_200 no shutdown mtu 9214 vrf TG_200 ip address 10.255.247.1/31 ! interface Vlan3299 - description MLAG_PEER_L3_iBGP: vrf TG_300 + description MLAG_L3_VRF_TG_300 no shutdown mtu 9214 vrf TG_300 ip address 10.255.247.1/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.247.1/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -311,7 +311,7 @@ router bgp 65001 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a + neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 100 @@ -379,7 +379,7 @@ router bgp 65001 router-id 192.168.250.10 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a + neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a_Vlan3099 redistribute connected ! vrf TG_200 @@ -389,7 +389,7 @@ router bgp 65001 router-id 192.168.250.10 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a + neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a_Vlan3199 redistribute connected ! vrf TG_300 @@ -399,7 +399,7 @@ router bgp 65001 router-id 192.168.250.10 update wait-install neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a + neighbor 10.255.247.0 description trunk-group-tests-l3leaf1a_Vlan3299 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg index 0132ddbcc4a..be6f670099e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg @@ -34,15 +34,15 @@ vlan 210 trunk group trunk-group-tests-l2leaf4 ! vlan 3199 - name MLAG_iBGP_TG_200 + name MLAG_L3_VRF_TG_200 trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -96,20 +96,20 @@ interface Vlan200 ip address virtual 10.2.0.1/24 ! interface Vlan3199 - description MLAG_PEER_L3_iBGP: vrf TG_200 + description MLAG_L3_VRF_TG_200 no shutdown mtu 9214 vrf TG_200 ip address 10.255.247.4/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.247.4/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -176,7 +176,7 @@ router bgp 65002 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.247.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.5 description trunk-group-tests-l3leaf2b + neighbor 10.255.247.5 description trunk-group-tests-l3leaf2b_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 200 @@ -204,7 +204,7 @@ router bgp 65002 router-id 192.168.250.11 update wait-install neighbor 10.255.247.5 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.5 description trunk-group-tests-l3leaf2b + neighbor 10.255.247.5 description trunk-group-tests-l3leaf2b_Vlan3199 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg index a8d6ea0412c..f3bb376cf8b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg @@ -30,15 +30,15 @@ vlan 210 trunk group trunk-group-tests-l2leaf4 ! vlan 3199 - name MLAG_iBGP_TG_200 + name MLAG_L3_VRF_TG_200 trunk group CUSTOM_MLAG_TG_NAME ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group CUSTOM_MLAG_TG_NAME ! vlan 4094 - name MLAG_PEER + name MLAG trunk group CUSTOM_MLAG_TG_NAME ! vrf instance MGMT @@ -92,20 +92,20 @@ interface Vlan200 ip address virtual 10.2.0.1/24 ! interface Vlan3199 - description MLAG_PEER_L3_iBGP: vrf TG_200 + description MLAG_L3_VRF_TG_200 no shutdown mtu 9214 vrf TG_200 ip address 10.255.247.5/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 9214 ip address 10.255.247.5/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 9214 no autostate @@ -172,7 +172,7 @@ router bgp 65002 neighbor MLAG-IPv4-UNDERLAY-PEER maximum-routes 12000 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 10.255.247.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.4 description trunk-group-tests-l3leaf2a + neighbor 10.255.247.4 description trunk-group-tests-l3leaf2a_Vlan4093 redistribute connected route-map RM-CONN-2-BGP ! vlan 200 @@ -200,7 +200,7 @@ router bgp 65002 router-id 192.168.250.12 update wait-install neighbor 10.255.247.4 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.247.4 description trunk-group-tests-l3leaf2a + neighbor 10.255.247.4 description trunk-group-tests-l3leaf2a_Vlan3199 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_1.cfg index 1d2b71c8818..7bc5872fcd5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_1.cfg @@ -20,14 +20,14 @@ hostname underlay_filter_peer_as_evpn_1 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_2_Ethernet1 + description P2P_underlay_filter_peer_as_evpn_2_Ethernet1 no shutdown mtu 9214 no switchport ip address 192.168.153.1/31 ! interface Ethernet2 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_3_Ethernet1 + description P2P_underlay_filter_peer_as_evpn_3_Ethernet1 no shutdown mtu 9214 no switchport @@ -92,10 +92,10 @@ router bgp 64512 neighbor 192.168.153.2 route-map RM-BGP-AS64513-OUT out neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 64513 - neighbor 192.168.255.2 description underlay_filter_peer_as_evpn_2 + neighbor 192.168.255.2 description underlay_filter_peer_as_evpn_2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 64513 - neighbor 192.168.255.3 description underlay_filter_peer_as_evpn_3 + neighbor 192.168.255.3 description underlay_filter_peer_as_evpn_3_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_2.cfg index 5b60ec3f10d..ac8d8a5dbdc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_2.cfg @@ -20,7 +20,7 @@ hostname underlay_filter_peer_as_evpn_2 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_1_Ethernet1 + description P2P_underlay_filter_peer_as_evpn_1_Ethernet1 no shutdown mtu 9214 no switchport @@ -82,7 +82,7 @@ router bgp 64513 neighbor 192.168.153.1 route-map RM-BGP-AS64512-OUT out neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 64512 - neighbor 192.168.255.1 description underlay_filter_peer_as_evpn_1 + neighbor 192.168.255.1 description underlay_filter_peer_as_evpn_1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_3.cfg index ec63482dcc0..604168100e5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/underlay_filter_peer_as_evpn_3.cfg @@ -20,7 +20,7 @@ hostname underlay_filter_peer_as_evpn_3 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_1_Ethernet2 + description P2P_underlay_filter_peer_as_evpn_1_Ethernet2 no shutdown mtu 9214 no switchport @@ -82,7 +82,7 @@ router bgp 64513 neighbor 192.168.153.3 route-map RM-BGP-AS64512-OUT out neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 64512 - neighbor 192.168.255.1 description underlay_filter_peer_as_evpn_1 + neighbor 192.168.255.1 description underlay_filter_peer_as_evpn_1_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg index f6bd5eccb58..c88ff4027e8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg @@ -207,6 +207,7 @@ router bgp 65100 neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg index 769ad34af98..db0f72f2ae9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg @@ -213,6 +213,7 @@ router bgp 65100 neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-IN in neighbor WAN-OVERLAY-PEERS route-map RM-EVPN-SOO-OUT out neighbor WAN-OVERLAY-PEERS activate + neighbor WAN-OVERLAY-PEERS encapsulation path-selection ! address-family ipv4 no neighbor WAN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml index 12414d62a6e..f79ff5bc02b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF1.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: 7010TX-LEAF2 - description: 7010TX-LEAF2 + description: 7010TX-LEAF2_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,21 +84,21 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false ip_address: 10.10.224.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 10.10.255.4/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml index 5a538bb93f1..1303be2fb73 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/7010TX-LEAF2.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: 7010TX-LEAF1 - description: 7010TX-LEAF1 + description: 7010TX-LEAF1_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,21 +84,21 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false ip_address: 10.10.224.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true ip_address: 10.10.255.5/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml index 6a579fc7baf..f6fb62003ba 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3A.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.9 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF3B - description: AUTO_BGP_ASN_LEAF3B + description: AUTO_BGP_ASN_LEAF3B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.8/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml index ae894890ad4..05064e5eba6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF3B.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.8 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF3A - description: AUTO_BGP_ASN_LEAF3A + description: AUTO_BGP_ASN_LEAF3A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.9/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml index 584f5b61b4a..0dad615854c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4A.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.13 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF4B - description: AUTO_BGP_ASN_LEAF4B + description: AUTO_BGP_ASN_LEAF4B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.12/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml index 1640e092d5d..59822032e7d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF4B.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.12 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF4A - description: AUTO_BGP_ASN_LEAF4A + description: AUTO_BGP_ASN_LEAF4A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.13/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml index ad8228a7138..54fe2be6833 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7A.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.21 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF7B - description: AUTO_BGP_ASN_LEAF7B + description: AUTO_BGP_ASN_LEAF7B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.20/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml index f5fe3b4a84d..e66a790862f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF7B.yml @@ -45,7 +45,7 @@ router_bgp: - ip_address: 10.255.251.20 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: AUTO_BGP_ASN_LEAF7A - description: AUTO_BGP_ASN_LEAF7A + description: AUTO_BGP_ASN_LEAF7A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -94,22 +94,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.21/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml index fa2583d991b..e82725d2238 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_LEAF01.yml @@ -48,12 +48,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_SPINE01 - description: AUTO_NODE_TYPE_SPINE01 + description: AUTO_NODE_TYPE_SPINE01_Loopback0 remote_as: '65100' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_SPINE02 - description: AUTO_NODE_TYPE_SPINE02 + description: AUTO_NODE_TYPE_SPINE02_Loopback0 remote_as: '65100' address_family_evpn: peer_groups: @@ -101,7 +101,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_SPINE01 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_AUTO_NODE_TYPE_SPINE01_Ethernet1 + description: P2P_AUTO_NODE_TYPE_SPINE01_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -111,7 +111,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_SPINE02 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_AUTO_NODE_TYPE_SPINE02_Ethernet1 + description: P2P_AUTO_NODE_TYPE_SPINE02_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml index a3ff096d2c5..8f40b13fa0e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE01.yml @@ -49,12 +49,12 @@ router_bgp: - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_LEAF01 - description: AUTO_NODE_TYPE_LEAF01 + description: AUTO_NODE_TYPE_LEAF01_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_UNGROUPED_LEAF02 - description: AUTO_NODE_TYPE_UNGROUPED_LEAF02 + description: AUTO_NODE_TYPE_UNGROUPED_LEAF02_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -99,7 +99,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_LEAF01 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_AUTO_NODE_TYPE_LEAF01_Ethernet1 + description: P2P_AUTO_NODE_TYPE_LEAF01_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -109,7 +109,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_UNGROUPED_LEAF02 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet1 + description: P2P_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml index 67ba7287918..c48fcc7bb28 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_SPINE02.yml @@ -49,12 +49,12 @@ router_bgp: - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_LEAF01 - description: AUTO_NODE_TYPE_LEAF01 + description: AUTO_NODE_TYPE_LEAF01_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_UNGROUPED_LEAF02 - description: AUTO_NODE_TYPE_UNGROUPED_LEAF02 + description: AUTO_NODE_TYPE_UNGROUPED_LEAF02_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -99,7 +99,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_LEAF01 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_AUTO_NODE_TYPE_LEAF01_Ethernet2 + description: P2P_AUTO_NODE_TYPE_LEAF01_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -109,7 +109,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_UNGROUPED_LEAF02 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet2 + description: P2P_AUTO_NODE_TYPE_UNGROUPED_LEAF02_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml index 739732b4105..7aa8d405a0b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_NODE_TYPE_UNGROUPED_LEAF02.yml @@ -48,12 +48,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_SPINE01 - description: AUTO_NODE_TYPE_SPINE01 + description: AUTO_NODE_TYPE_SPINE01_Loopback0 remote_as: '65100' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: AUTO_NODE_TYPE_SPINE02 - description: AUTO_NODE_TYPE_SPINE02 + description: AUTO_NODE_TYPE_SPINE02_Loopback0 remote_as: '65100' address_family_evpn: peer_groups: @@ -101,7 +101,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_SPINE01 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_AUTO_NODE_TYPE_SPINE01_Ethernet2 + description: P2P_AUTO_NODE_TYPE_SPINE01_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -111,7 +111,7 @@ ethernet_interfaces: peer: AUTO_NODE_TYPE_SPINE02 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_AUTO_NODE_TYPE_SPINE02_Ethernet2 + description: P2P_AUTO_NODE_TYPE_SPINE02_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml index 4d17068c753..4c7638b29e3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: CUSTOM-PYTHON_MODULES-L3LEAF1B - description: CUSTOM-PYTHON_MODULES-L3LEAF1B + description: CUSTOM-PYTHON_MODULES-L3LEAF1B_Vlan4093 - ip_address: 172.31.255.20 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -57,7 +57,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-PYTHON_MODULES-SPINE1 - description: CUSTOM-PYTHON_MODULES-SPINE1 + description: CUSTOM-PYTHON_MODULES-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -72,7 +72,7 @@ router_bgp: description: CUSTOM-PYTHON_MODULES-L3LEAF2_Ethernet1.1_vrf_TEST_VRF - ip_address: 10.255.240.11 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: CUSTOM-PYTHON_MODULES-L3LEAF1B + description: CUSTOM-PYTHON_MODULES-L3LEAF1B_Vlan3000 rd: 192.168.255.21:1 route_targets: import: @@ -140,19 +140,19 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 name: Tenant_A_OP_Zone_1 tenant: CUSTOM_PYTHON_MODULES_TENANT - id: 3000 - name: MLAG_iBGP_TEST_VRF + name: MLAG_L3_VRF_TEST_VRF trunk_groups: - MLAG tenant: CUSTOM_PYTHON_MODULES_TENANT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml index aeb0db30052..185b05d8f95 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: CUSTOM-PYTHON_MODULES-L3LEAF1A - description: CUSTOM-PYTHON_MODULES-L3LEAF1A + description: CUSTOM-PYTHON_MODULES-L3LEAF1A_Vlan4093 - ip_address: 172.31.255.22 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-PYTHON_MODULES-SPINE1 - description: CUSTOM-PYTHON_MODULES-SPINE1 + description: CUSTOM-PYTHON_MODULES-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -79,7 +79,7 @@ router_bgp: neighbors: - ip_address: 10.255.240.10 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: CUSTOM-PYTHON_MODULES-L3LEAF1A + description: CUSTOM-PYTHON_MODULES-L3LEAF1A_Vlan3000 updates: wait_install: true vlans: @@ -131,19 +131,19 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 name: Tenant_A_OP_Zone_1 tenant: CUSTOM_PYTHON_MODULES_TENANT - id: 3000 - name: MLAG_iBGP_TEST_VRF + name: MLAG_L3_VRF_TEST_VRF trunk_groups: - MLAG tenant: CUSTOM_PYTHON_MODULES_TENANT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml index 3c76e2a1294..322a25142e8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-PYTHON_MODULES-SPINE1.yml @@ -47,12 +47,12 @@ router_bgp: - ip_address: 192.168.255.21 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-PYTHON_MODULES-L3LEAF1A - description: CUSTOM-PYTHON_MODULES-L3LEAF1A + description: CUSTOM-PYTHON_MODULES-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.22 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-PYTHON_MODULES-L3LEAF1B - description: CUSTOM-PYTHON_MODULES-L3LEAF1B + description: CUSTOM-PYTHON_MODULES-L3LEAF1B_Loopback0 remote_as: '65101' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1A.yml index 34adf55c379..63fcfd4a9c5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1A.yml @@ -36,12 +36,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -57,7 +57,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_CUSTOM_TEMPLATES_L3LEAF1 + description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_ switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1B.yml index 3df63e98bf1..547df696c02 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L2LEAF1B.yml @@ -36,12 +36,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -57,7 +57,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_CUSTOM_TEMPLATES_L3LEAF1 + description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L3LEAF1A_Po1_To_Po5_ switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml index 42111abc6d6..8f738310dfe 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.11 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: CUSTOM-TEMPLATES-L3LEAF1B - description: CUSTOM-TEMPLATES-L3LEAF1B + description: CUSTOM-TEMPLATES-L3LEAF1B_Vlan4093 - ip_address: 172.31.255.20 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-TEMPLATES-SPINE1 - description: CUSTOM-TEMPLATES-SPINE1 + description: CUSTOM-TEMPLATES-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -79,7 +79,7 @@ router_bgp: neighbors: - ip_address: 10.255.240.11 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: CUSTOM-TEMPLATES-L3LEAF1B + description: CUSTOM-TEMPLATES-L3LEAF1B_Vlan3000 updates: wait_install: true vlans: @@ -131,30 +131,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 name: Tenant_A_OP_Zone_1 tenant: CUSTOM_TEMPLATES_TENANT - id: 3000 - name: MLAG_iBGP_TEST_VRF + name: MLAG_L3_VRF_TEST_VRF trunk_groups: - MLAG tenant: CUSTOM_TEMPLATES_TENANT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.10/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -171,7 +171,7 @@ vlan_interfaces: tenant: CUSTOM_TEMPLATES_TENANT type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST_VRF' + description: MLAG_L3_VRF_TEST_VRF vrf: TEST_VRF mtu: 9214 ip_address: 10.255.240.10/31 @@ -186,7 +186,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel5 - description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_CUSTOM_TEMPLATES_L2LEAF1 + description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_ switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml index 26a4bc82db2..f8a98c5e736 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.10 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: CUSTOM-TEMPLATES-L3LEAF1A - description: CUSTOM-TEMPLATES-L3LEAF1A + description: CUSTOM-TEMPLATES-L3LEAF1A_Vlan4093 - ip_address: 172.31.255.22 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-TEMPLATES-SPINE1 - description: CUSTOM-TEMPLATES-SPINE1 + description: CUSTOM-TEMPLATES-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -79,7 +79,7 @@ router_bgp: neighbors: - ip_address: 10.255.240.10 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: CUSTOM-TEMPLATES-L3LEAF1A + description: CUSTOM-TEMPLATES-L3LEAF1A_Vlan3000 updates: wait_install: true vlans: @@ -131,30 +131,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 110 name: Tenant_A_OP_Zone_1 tenant: CUSTOM_TEMPLATES_TENANT - id: 3000 - name: MLAG_iBGP_TEST_VRF + name: MLAG_L3_VRF_TEST_VRF trunk_groups: - MLAG tenant: CUSTOM_TEMPLATES_TENANT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.11/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -171,7 +171,7 @@ vlan_interfaces: tenant: CUSTOM_TEMPLATES_TENANT type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST_VRF' + description: MLAG_L3_VRF_TEST_VRF vrf: TEST_VRF mtu: 9214 ip_address: 10.255.240.11/31 @@ -186,7 +186,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel5 - description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_CUSTOM_TEMPLATES_L2LEAF1 + description: TEST_CUSTOM_PREFIX_CUSTOM-TEMPLATES-L2LEAF1A_Po5_To_Po1_ switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml index d2784ea4510..7786aa815e3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-SPINE1.yml @@ -47,12 +47,12 @@ router_bgp: - ip_address: 192.168.255.21 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-TEMPLATES-L3LEAF1A - description: CUSTOM-TEMPLATES-L3LEAF1A + description: CUSTOM-TEMPLATES-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.22 peer_group: EVPN-OVERLAY-PEERS peer: CUSTOM-TEMPLATES-L3LEAF1B - description: CUSTOM-TEMPLATES-L3LEAF1B + description: CUSTOM-TEMPLATES-L3LEAF1B_Loopback0 remote_as: '65101' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml index 3675e4cf54d..9b0aa153b57 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml @@ -91,17 +91,22 @@ router_bgp: peer: DC1-BL2A description: DC1-BL2A remote_as: '65106' + - ip_address: 192.168.42.42 + peer_group: EVPN-OVERLAY-CORE + peer: DC1-BL2B + description: DC1-BL2B + remote_as: '65042' address_family_evpn: neighbor_default: next_hop_self_received_evpn_routes: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true evpn_hostflap_detection: window: 180 threshold: 5 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml index 4deb11a7bf6..8e820450245 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml @@ -102,11 +102,11 @@ router_bgp: enable: true inter_domain: false peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true evpn_hostflap_detection: window: 180 threshold: 5 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml index 7ef41f7d4f4..8d89e624a91 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1A.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65108' next_hop_self: true - description: DC1-CL1B + description: MLAG_PEER_DC1-CL1B password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml index e9aabfce928..7af940d9b7a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65109' next_hop_self: true - description: DC1-CL1A + description: MLAG_PEER_DC1-CL1A password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml index 7cbadc8b981..52c14cfafae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65103' next_hop_self: true - description: DC1-SVC3B + description: MLAG_PEER_DC1-SVC3B password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml index d9f7226168a..8c295031512 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65103' next_hop_self: true - description: DC1-SVC3A + description: MLAG_PEER_DC1-SVC3A password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml index cbfca3396a5..bb939559fcf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65110' next_hop_self: true - description: DC1_UNDEPLOYED_LEAF1B + description: MLAG_PEER_DC1_UNDEPLOYED_LEAF1B password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml index d1f91930045..31591aa6859 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml @@ -18,7 +18,7 @@ router_bgp: type: ipv4 remote_as: '65111' next_hop_self: true - description: DC1_UNDEPLOYED_LEAF1A + description: MLAG_PEER_DC1_UNDEPLOYED_LEAF1A password: 15AwQNBEJ1nyF/kBEtoAGw== maximum_routes: 12000 send_community: all diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml index bc8f24dc885..89f9e9eac3a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -647,7 +647,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet6 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet6 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml index e28bdd9a2f2..c99963a739a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: EVPN-MULTICAST-L3LEAF1B - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan4093 - ip_address: 172.31.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -79,7 +79,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3012 updates: wait_install: true - name: MULTICAST_ENABLED_110_111 @@ -99,7 +99,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3010 updates: wait_install: true - name: MULTICAST_ENABLED_210_DISABLED_211 @@ -119,7 +119,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3011 updates: wait_install: true - name: MULTICAST_DISABLED_5_6 @@ -139,7 +139,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3022 updates: wait_install: true - name: MULTICAST_ENABLED_1_2 @@ -159,7 +159,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3020 updates: wait_install: true - name: MULTICAST_ENABLED_3_DISABLED_4 @@ -179,7 +179,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3021 updates: wait_install: true - name: TEN_C_L3_MULTICAST_DISABLED_330_331 @@ -200,7 +200,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3032 updates: wait_install: true - name: TEN_C_L3_MULTICAST_ENABLED_130_131 @@ -221,7 +221,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3065 updates: wait_install: true - name: TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 @@ -242,7 +242,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3031 updates: wait_install: true - name: TEN_D_L3_MULTICAST_DISABLED_240_241 @@ -263,7 +263,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3041 updates: wait_install: true - name: TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 @@ -284,7 +284,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3040 updates: wait_install: true - name: TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE @@ -305,7 +305,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3054 updates: wait_install: true - name: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES @@ -329,7 +329,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3059 updates: wait_install: true - name: TEN_E_L3_MULTICAST_TRANSIT @@ -353,7 +353,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3051 updates: wait_install: true - name: TEN_E_PEG_L3_MULTICAST_ENABLED @@ -374,7 +374,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Vlan3050 updates: wait_install: true vlan_aware_bundles: @@ -703,12 +703,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 310 @@ -718,7 +718,7 @@ vlans: name: MULTICAST_DISABLED_311 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_MULTICAST_DISABLED_310_311 + name: MLAG_L3_VRF_MULTICAST_DISABLED_310_311 trunk_groups: - MLAG tenant: Tenant_A @@ -729,7 +729,7 @@ vlans: name: MULTICAST_ENABLED_111 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_MULTICAST_ENABLED_110_111 + name: MLAG_L3_VRF_MULTICAST_ENABLED_110_111 trunk_groups: - MLAG tenant: Tenant_A @@ -740,7 +740,7 @@ vlans: name: MULTICAST_DISABLED_211 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_MULTICAST_ENABLED_210_DISABLED_211 + name: MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 trunk_groups: - MLAG tenant: Tenant_A @@ -760,7 +760,7 @@ vlans: name: MULTICAST_DISABLED_6 tenant: Tenant_B - id: 3022 - name: MLAG_iBGP_MULTICAST_DISABLED_5_6 + name: MLAG_L3_VRF_MULTICAST_DISABLED_5_6 trunk_groups: - MLAG tenant: Tenant_B @@ -771,7 +771,7 @@ vlans: name: MULTICAST_ENABLED_2 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_MULTICAST_ENABLED_1_2 + name: MLAG_L3_VRF_MULTICAST_ENABLED_1_2 trunk_groups: - MLAG tenant: Tenant_B @@ -782,7 +782,7 @@ vlans: name: MULTICAST_DISABLED_4 tenant: Tenant_B - id: 3021 - name: MLAG_iBGP_MULTICAST_ENABLED_3_DISABLED_4 + name: MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 trunk_groups: - MLAG tenant: Tenant_B @@ -802,7 +802,7 @@ vlans: name: L3_MULTICAST_DISABLED_331 tenant: Tenant_C - id: 3032 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_DISABLED_330_331 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 trunk_groups: - MLAG tenant: Tenant_C @@ -819,7 +819,7 @@ vlans: name: L3_L2_MULTICAST_ENABLED_137 tenant: Tenant_C - id: 3065 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 trunk_groups: - MLAG tenant: Tenant_C @@ -830,7 +830,7 @@ vlans: name: L3_MULTICAST_DISABLED_231 tenant: Tenant_C - id: 3031 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 trunk_groups: - MLAG tenant: Tenant_C @@ -841,7 +841,7 @@ vlans: name: L3_MULTICAST_DISABLED_241 tenant: Tenant_D - id: 3041 - name: MLAG_iBGP_TEN_D_L3_MULTICAST_DISABLED_240_241 + name: MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 trunk_groups: - MLAG tenant: Tenant_D @@ -852,7 +852,7 @@ vlans: name: L3_MULTICAST_DISABLED_141 tenant: Tenant_D - id: 3040 - name: MLAG_iBGP_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + name: MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 trunk_groups: - MLAG tenant: Tenant_D @@ -860,7 +860,7 @@ vlans: name: L3_MULTICAST_ENABLED_550 tenant: Tenant_E - id: 3054 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE trunk_groups: - MLAG tenant: Tenant_E @@ -868,7 +868,7 @@ vlans: name: L3_MULTICAST_ENABLED_260 tenant: Tenant_E - id: 3059 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES trunk_groups: - MLAG tenant: Tenant_E @@ -876,7 +876,7 @@ vlans: name: L3_MULTICAST_ENABLED_250 tenant: Tenant_E - id: 3051 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_TRANSIT + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT trunk_groups: - MLAG tenant: Tenant_E @@ -884,7 +884,7 @@ vlans: name: L3_MULTICAST_ENABLED_150 tenant: Tenant_E - id: 3050 - name: MLAG_iBGP_TEN_E_PEG_L3_MULTICAST_ENABLED + name: MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED trunk_groups: - MLAG tenant: Tenant_E @@ -896,7 +896,7 @@ vlans: tenant: Tenant_F vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.0/31 @@ -904,7 +904,7 @@ vlan_interfaces: ipv4: sparse_mode: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -929,7 +929,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_310_311' + description: MLAG_L3_VRF_MULTICAST_DISABLED_310_311 vrf: MULTICAST_DISABLED_310_311 mtu: 9214 ip_address: 10.255.251.0/31 @@ -953,7 +953,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_110_111' + description: MLAG_L3_VRF_MULTICAST_ENABLED_110_111 vrf: MULTICAST_ENABLED_110_111 mtu: 9214 ip_address: 10.255.251.0/31 @@ -977,7 +977,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_210_DISABLED_211' + description: MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 vrf: MULTICAST_ENABLED_210_DISABLED_211 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1001,7 +1001,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_5_6' + description: MLAG_L3_VRF_MULTICAST_DISABLED_5_6 vrf: MULTICAST_DISABLED_5_6 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1025,7 +1025,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_1_2' + description: MLAG_L3_VRF_MULTICAST_ENABLED_1_2 vrf: MULTICAST_ENABLED_1_2 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1049,7 +1049,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_3_DISABLED_4' + description: MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 vrf: MULTICAST_ENABLED_3_DISABLED_4 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1073,7 +1073,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_DISABLED_330_331' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 vrf: TEN_C_L3_MULTICAST_DISABLED_330_331 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1124,7 +1124,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 vrf: TEN_C_L3_MULTICAST_ENABLED_130_131 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1152,7 +1152,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 vrf: TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1176,7 +1176,7 @@ vlan_interfaces: tenant: Tenant_D type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_DISABLED_240_241' + description: MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 vrf: TEN_D_L3_MULTICAST_DISABLED_240_241 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1204,7 +1204,7 @@ vlan_interfaces: tenant: Tenant_D type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141' + description: MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 vrf: TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 mtu: 9214 ip_address: 10.255.251.0/31 @@ -1224,7 +1224,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE vrf: TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE mtu: 9214 ip_address: 10.255.251.0/31 @@ -1244,7 +1244,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES vrf: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES mtu: 9214 ip_address: 10.255.251.0/31 @@ -1264,7 +1264,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_TRANSIT' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT vrf: TEN_E_L3_MULTICAST_TRANSIT mtu: 9214 ip_address: 10.255.251.0/31 @@ -1284,7 +1284,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_PEG_L3_MULTICAST_ENABLED' + description: MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED vrf: TEN_E_PEG_L3_MULTICAST_ENABLED mtu: 9214 ip_address: 10.255.251.0/31 @@ -1330,7 +1330,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet1 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml index 9ae28f68cb2..0d444f453ae 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: EVPN-MULTICAST-L3LEAF1A - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan4093 - ip_address: 172.31.255.2 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -79,7 +79,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3012 updates: wait_install: true - name: MULTICAST_ENABLED_110_111 @@ -99,7 +99,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3010 updates: wait_install: true - name: MULTICAST_ENABLED_210_DISABLED_211 @@ -119,7 +119,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3011 updates: wait_install: true - name: MULTICAST_DISABLED_5_6 @@ -139,7 +139,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3022 updates: wait_install: true - name: MULTICAST_ENABLED_1_2 @@ -159,7 +159,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3020 updates: wait_install: true - name: MULTICAST_ENABLED_3_DISABLED_4 @@ -179,7 +179,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3021 updates: wait_install: true - name: TEN_C_L3_MULTICAST_DISABLED_330_331 @@ -200,7 +200,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3032 updates: wait_install: true - name: TEN_C_L3_MULTICAST_ENABLED_130_131 @@ -221,7 +221,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3065 updates: wait_install: true - name: TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 @@ -242,7 +242,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3031 updates: wait_install: true - name: TEN_D_L3_MULTICAST_DISABLED_240_241 @@ -263,7 +263,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3041 updates: wait_install: true - name: TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 @@ -284,7 +284,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3040 updates: wait_install: true - name: TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE @@ -305,7 +305,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3054 updates: wait_install: true - name: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES @@ -329,7 +329,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3059 updates: wait_install: true - name: TEN_E_L3_MULTICAST_TRANSIT @@ -353,7 +353,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3051 updates: wait_install: true - name: TEN_E_PEG_L3_MULTICAST_ENABLED @@ -374,7 +374,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Vlan3050 updates: wait_install: true vlan_aware_bundles: @@ -703,12 +703,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 310 @@ -718,7 +718,7 @@ vlans: name: MULTICAST_DISABLED_311 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_MULTICAST_DISABLED_310_311 + name: MLAG_L3_VRF_MULTICAST_DISABLED_310_311 trunk_groups: - MLAG tenant: Tenant_A @@ -729,7 +729,7 @@ vlans: name: MULTICAST_ENABLED_111 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_MULTICAST_ENABLED_110_111 + name: MLAG_L3_VRF_MULTICAST_ENABLED_110_111 trunk_groups: - MLAG tenant: Tenant_A @@ -740,7 +740,7 @@ vlans: name: MULTICAST_DISABLED_211 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_MULTICAST_ENABLED_210_DISABLED_211 + name: MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 trunk_groups: - MLAG tenant: Tenant_A @@ -760,7 +760,7 @@ vlans: name: MULTICAST_DISABLED_6 tenant: Tenant_B - id: 3022 - name: MLAG_iBGP_MULTICAST_DISABLED_5_6 + name: MLAG_L3_VRF_MULTICAST_DISABLED_5_6 trunk_groups: - MLAG tenant: Tenant_B @@ -771,7 +771,7 @@ vlans: name: MULTICAST_ENABLED_2 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_MULTICAST_ENABLED_1_2 + name: MLAG_L3_VRF_MULTICAST_ENABLED_1_2 trunk_groups: - MLAG tenant: Tenant_B @@ -782,7 +782,7 @@ vlans: name: MULTICAST_DISABLED_4 tenant: Tenant_B - id: 3021 - name: MLAG_iBGP_MULTICAST_ENABLED_3_DISABLED_4 + name: MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 trunk_groups: - MLAG tenant: Tenant_B @@ -802,7 +802,7 @@ vlans: name: L3_MULTICAST_DISABLED_331 tenant: Tenant_C - id: 3032 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_DISABLED_330_331 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 trunk_groups: - MLAG tenant: Tenant_C @@ -819,7 +819,7 @@ vlans: name: L3_L2_MULTICAST_ENABLED_137 tenant: Tenant_C - id: 3065 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 trunk_groups: - MLAG tenant: Tenant_C @@ -830,7 +830,7 @@ vlans: name: L3_MULTICAST_DISABLED_231 tenant: Tenant_C - id: 3031 - name: MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 + name: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 trunk_groups: - MLAG tenant: Tenant_C @@ -841,7 +841,7 @@ vlans: name: L3_MULTICAST_DISABLED_241 tenant: Tenant_D - id: 3041 - name: MLAG_iBGP_TEN_D_L3_MULTICAST_DISABLED_240_241 + name: MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 trunk_groups: - MLAG tenant: Tenant_D @@ -852,7 +852,7 @@ vlans: name: L3_MULTICAST_DISABLED_141 tenant: Tenant_D - id: 3040 - name: MLAG_iBGP_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 + name: MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 trunk_groups: - MLAG tenant: Tenant_D @@ -860,7 +860,7 @@ vlans: name: L3_MULTICAST_ENABLED_550 tenant: Tenant_E - id: 3054 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE trunk_groups: - MLAG tenant: Tenant_E @@ -868,7 +868,7 @@ vlans: name: L3_MULTICAST_ENABLED_260 tenant: Tenant_E - id: 3059 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES trunk_groups: - MLAG tenant: Tenant_E @@ -876,7 +876,7 @@ vlans: name: L3_MULTICAST_ENABLED_250 tenant: Tenant_E - id: 3051 - name: MLAG_iBGP_TEN_E_L3_MULTICAST_TRANSIT + name: MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT trunk_groups: - MLAG tenant: Tenant_E @@ -884,7 +884,7 @@ vlans: name: L3_MULTICAST_ENABLED_150 tenant: Tenant_E - id: 3050 - name: MLAG_iBGP_TEN_E_PEG_L3_MULTICAST_ENABLED + name: MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED trunk_groups: - MLAG tenant: Tenant_E @@ -896,7 +896,7 @@ vlans: tenant: Tenant_F vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.1/31 @@ -904,7 +904,7 @@ vlan_interfaces: ipv4: sparse_mode: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -929,7 +929,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_310_311' + description: MLAG_L3_VRF_MULTICAST_DISABLED_310_311 vrf: MULTICAST_DISABLED_310_311 mtu: 9214 ip_address: 10.255.251.1/31 @@ -953,7 +953,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_110_111' + description: MLAG_L3_VRF_MULTICAST_ENABLED_110_111 vrf: MULTICAST_ENABLED_110_111 mtu: 9214 ip_address: 10.255.251.1/31 @@ -977,7 +977,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_210_DISABLED_211' + description: MLAG_L3_VRF_MULTICAST_ENABLED_210_DISABLED_211 vrf: MULTICAST_ENABLED_210_DISABLED_211 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1001,7 +1001,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_DISABLED_5_6' + description: MLAG_L3_VRF_MULTICAST_DISABLED_5_6 vrf: MULTICAST_DISABLED_5_6 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1025,7 +1025,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_1_2' + description: MLAG_L3_VRF_MULTICAST_ENABLED_1_2 vrf: MULTICAST_ENABLED_1_2 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1049,7 +1049,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf MULTICAST_ENABLED_3_DISABLED_4' + description: MLAG_L3_VRF_MULTICAST_ENABLED_3_DISABLED_4 vrf: MULTICAST_ENABLED_3_DISABLED_4 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1073,7 +1073,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_DISABLED_330_331' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_DISABLED_330_331 vrf: TEN_C_L3_MULTICAST_DISABLED_330_331 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1124,7 +1124,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_130_131 vrf: TEN_C_L3_MULTICAST_ENABLED_130_131 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1152,7 +1152,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231' + description: MLAG_L3_VRF_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 vrf: TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1176,7 +1176,7 @@ vlan_interfaces: tenant: Tenant_D type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_DISABLED_240_241' + description: MLAG_L3_VRF_TEN_D_L3_MULTICAST_DISABLED_240_241 vrf: TEN_D_L3_MULTICAST_DISABLED_240_241 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1204,7 +1204,7 @@ vlan_interfaces: tenant: Tenant_D type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141' + description: MLAG_L3_VRF_TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 vrf: TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 mtu: 9214 ip_address: 10.255.251.1/31 @@ -1224,7 +1224,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE vrf: TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE mtu: 9214 ip_address: 10.255.251.1/31 @@ -1244,7 +1244,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES vrf: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES mtu: 9214 ip_address: 10.255.251.1/31 @@ -1264,7 +1264,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_L3_MULTICAST_TRANSIT' + description: MLAG_L3_VRF_TEN_E_L3_MULTICAST_TRANSIT vrf: TEN_E_L3_MULTICAST_TRANSIT mtu: 9214 ip_address: 10.255.251.1/31 @@ -1284,7 +1284,7 @@ vlan_interfaces: tenant: Tenant_E type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEN_E_PEG_L3_MULTICAST_ENABLED' + description: MLAG_L3_VRF_TEN_E_PEG_L3_MULTICAST_ENABLED vrf: TEN_E_PEG_L3_MULTICAST_ENABLED mtu: 9214 ip_address: 10.255.251.1/31 @@ -1330,7 +1330,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet2 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml index a59abafdbed..b805c72d775 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF2A.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -694,7 +694,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet3 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet3 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml index e650b436c38..61b364641bd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3A.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -697,7 +697,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet4 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml index ca8b85bb1b9..af2e7b7053b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF3B.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-SPINE1 - description: EVPN-MULTICAST-SPINE1 + description: EVPN-MULTICAST-SPINE1_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -697,7 +697,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_EVPN-MULTICAST-SPINE1_Ethernet5 + description: P2P_EVPN-MULTICAST-SPINE1_Ethernet5 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml index b5beea9f649..f5125e8d1b6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-SPINE1.yml @@ -67,32 +67,32 @@ router_bgp: - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-DISABLED - description: EVPN-MULTICAST-DISABLED + description: EVPN-MULTICAST-DISABLED_Loopback0 remote_as: '65106' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-L3LEAF1A - description: EVPN-MULTICAST-L3LEAF1A + description: EVPN-MULTICAST-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-L3LEAF1B - description: EVPN-MULTICAST-L3LEAF1B + description: EVPN-MULTICAST-L3LEAF1B_Loopback0 remote_as: '65101' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-L3LEAF2A - description: EVPN-MULTICAST-L3LEAF2A + description: EVPN-MULTICAST-L3LEAF2A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-L3LEAF3A - description: EVPN-MULTICAST-L3LEAF3A + description: EVPN-MULTICAST-L3LEAF3A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: EVPN-MULTICAST-L3LEAF3B - description: EVPN-MULTICAST-L3LEAF3B + description: EVPN-MULTICAST-L3LEAF3B_Loopback0 remote_as: '65105' address_family_evpn: peer_groups: @@ -140,7 +140,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-L3LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-L3LEAF1A_Ethernet1 + description: P2P_EVPN-MULTICAST-L3LEAF1A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -153,7 +153,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-L3LEAF1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-L3LEAF1B_Ethernet1 + description: P2P_EVPN-MULTICAST-L3LEAF1B_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -166,7 +166,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-L3LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-L3LEAF2A_Ethernet1 + description: P2P_EVPN-MULTICAST-L3LEAF2A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -179,7 +179,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-L3LEAF3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-L3LEAF3A_Ethernet1 + description: P2P_EVPN-MULTICAST-L3LEAF3A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -192,7 +192,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-L3LEAF3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-L3LEAF3B_Ethernet1 + description: P2P_EVPN-MULTICAST-L3LEAF3B_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -205,7 +205,7 @@ ethernet_interfaces: peer: EVPN-MULTICAST-DISABLED peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_EVPN-MULTICAST-DISABLED_Ethernet1 + description: P2P_EVPN-MULTICAST-DISABLED_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml index 16c3038cd91..4344adec92c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_IPV6_L3LEAF1B - description: MLAG_IPV6_L3LEAF1B + description: MLAG_IPV6_L3LEAF1B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,22 +84,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml index 9d1a7cc3a4a..3822643532e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_IPV6_L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_IPV6_L3LEAF1A - description: MLAG_IPV6_L3LEAF1A + description: MLAG_IPV6_L3LEAF1A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,22 +84,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml index 32a15db00a5..18dcdf6fb79 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.3 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_ODD_ID_L3LEAF1B - description: MLAG_ODD_ID_L3LEAF1B + description: MLAG_ODD_ID_L3LEAF1B_Vlan4093 - ip_address: 10.254.255.250 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65123' @@ -89,22 +89,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.2/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -142,7 +142,7 @@ ethernet_interfaces: peer: P2P-UPLINKS-IPV4-PREFIX-LENGTH peer_interface: Ethernet1 peer_type: overlay-controller - description: P2P_LINK_TO_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet1 + description: P2P_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml index 194fd440bd4..1a06e3d0467 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.2 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_ODD_ID_L3LEAF1A - description: MLAG_ODD_ID_L3LEAF1A + description: MLAG_ODD_ID_L3LEAF1A_Vlan4093 - ip_address: 10.254.255.254 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65123' @@ -89,22 +89,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.3/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -142,7 +142,7 @@ ethernet_interfaces: peer: P2P-UPLINKS-IPV4-PREFIX-LENGTH peer_interface: Ethernet2 peer_type: overlay-controller - description: P2P_LINK_TO_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet2 + description: P2P_P2P-UPLINKS-IPV4-PREFIX-LENGTH_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml index 7c5c914b669..fd8ae6ca6fa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.2 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_SAME_SUBNET_L3LEAF1B - description: MLAG_SAME_SUBNET_L3LEAF1B + description: MLAG_SAME_SUBNET_L3LEAF1B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.10.224.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: MLAG_SAME_SUBNET_L3LEAF1B + description: MLAG_SAME_SUBNET_L3LEAF1B_Vlan3000 updates: wait_install: true vlans: @@ -117,30 +117,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 name: VLAN10 tenant: TEST_MLAG_SAME_SUBNET_ON_VRF - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST_MLAG_SAME_SUBNET_ON_VRF vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.1/30 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -155,7 +155,7 @@ vlan_interfaces: tenant: TEST_MLAG_SAME_SUBNET_ON_VRF type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 10.10.224.1/30 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml index 97054fee217..b9a2b2341ab 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_SAME_SUBNET_L3LEAF1A - description: MLAG_SAME_SUBNET_L3LEAF1A + description: MLAG_SAME_SUBNET_L3LEAF1A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.10.224.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: MLAG_SAME_SUBNET_L3LEAF1A + description: MLAG_SAME_SUBNET_L3LEAF1A_Vlan3000 updates: wait_install: true vlans: @@ -117,30 +117,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 name: VLAN10 tenant: TEST_MLAG_SAME_SUBNET_ON_VRF - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST_MLAG_SAME_SUBNET_ON_VRF vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.2/30 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -155,7 +155,7 @@ vlan_interfaces: tenant: TEST_MLAG_SAME_SUBNET_ON_VRF type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 10.10.224.2/30 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml index 15b71782ecc..02a4d97b569 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.2 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_SAME_SUBNET_L3LEAF2B - description: MLAG_SAME_SUBNET_L3LEAF2B + description: MLAG_SAME_SUBNET_L3LEAF2B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.10.224.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: MLAG_SAME_SUBNET_L3LEAF2B + description: MLAG_SAME_SUBNET_L3LEAF2B_Vlan3000 updates: wait_install: true vlans: @@ -117,30 +117,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 name: VLAN10 tenant: TEST_MLAG_SAME_SUBNET_ON_VRF - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST_MLAG_SAME_SUBNET_ON_VRF vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.1/30 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -155,7 +155,7 @@ vlan_interfaces: tenant: TEST_MLAG_SAME_SUBNET_ON_VRF type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 10.10.224.1/30 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml index 8832b3be40f..4a47dcc3820 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_SAME_SUBNET_L3LEAF2B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: MLAG_SAME_SUBNET_L3LEAF2A - description: MLAG_SAME_SUBNET_L3LEAF2A + description: MLAG_SAME_SUBNET_L3LEAF2A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.10.224.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: MLAG_SAME_SUBNET_L3LEAF2A + description: MLAG_SAME_SUBNET_L3LEAF2A_Vlan3000 updates: wait_install: true vlans: @@ -117,30 +117,30 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 10 name: VLAN10 tenant: TEST_MLAG_SAME_SUBNET_ON_VRF - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST_MLAG_SAME_SUBNET_ON_VRF vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.2/30 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -155,7 +155,7 @@ vlan_interfaces: tenant: TEST_MLAG_SAME_SUBNET_ON_VRF type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 10.10.224.2/30 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml index dd156dd4060..6100ff56aea 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A.yml @@ -34,7 +34,7 @@ router_bgp: - ip_address: 192.168.253.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B - description: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B + description: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -66,12 +66,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 3900 @@ -81,7 +81,7 @@ vlans: name: SVI_ON_LEAF2-3 tenant: TEST - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST @@ -93,12 +93,12 @@ vlans: tenant: TEST vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 192.168.253.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -124,7 +124,7 @@ vlan_interfaces: tenant: TEST type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 192.168.253.4/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml index a72dab93cef..abf2707b752 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3B.yml @@ -34,7 +34,7 @@ router_bgp: - ip_address: 192.168.253.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A - description: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A + description: OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF3A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -66,12 +66,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 3900 @@ -81,7 +81,7 @@ vlans: name: SVI_ON_LEAF2-3 tenant: TEST - id: 3000 - name: MLAG_iBGP_TEST + name: MLAG_L3_VRF_TEST trunk_groups: - MLAG tenant: TEST @@ -93,12 +93,12 @@ vlans: tenant: TEST vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 192.168.253.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -124,7 +124,7 @@ vlan_interfaces: tenant: TEST type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TEST' + description: MLAG_L3_VRF_TEST vrf: TEST mtu: 9214 ip_address: 192.168.253.5/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml index dc8181c8575..a34c46ff4c1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: OVERRIDE_VTEP_L3LEAF1B - description: OVERRIDE_VTEP_L3LEAF1B + description: OVERRIDE_VTEP_L3LEAF1B_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,22 +84,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml index c74360c8f25..15f9d31249e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERRIDE_VTEP_L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.10.224.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: OVERRIDE_VTEP_L3LEAF1A - description: OVERRIDE_VTEP_L3LEAF1A + description: OVERRIDE_VTEP_L3LEAF1A_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -84,22 +84,22 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.10.224.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml index f2a72fd3bc4..7f124b6615b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/P2P-UPLINKS-IPV4-PREFIX-LENGTH.yml @@ -75,7 +75,7 @@ ethernet_interfaces: peer: MLAG_ODD_ID_L3LEAF1A peer_interface: Ethernet10 peer_type: l3leaf - description: P2P_LINK_TO_MLAG_ODD_ID_L3LEAF1A_Ethernet10 + description: P2P_MLAG_ODD_ID_L3LEAF1A_Ethernet10 shutdown: false mtu: 9214 switchport: @@ -85,7 +85,7 @@ ethernet_interfaces: peer: MLAG_ODD_ID_L3LEAF1B peer_interface: Ethernet10 peer_type: l3leaf - description: P2P_LINK_TO_MLAG_ODD_ID_L3LEAF1B_Ethernet10 + description: P2P_MLAG_ODD_ID_L3LEAF1B_Ethernet10 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0A.yml index 983b6c1b501..c079e2dd9c5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0A.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0B.yml index 0f26f9c9599..d92884c6555 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF0B.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1A.yml index 2a7dfd09c48..136def8d72f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1A.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1B.yml index 3f5ad30a34f..a3f9cf258cc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF1B.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2A.yml index 9c9766929d1..b444f8e733e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2A.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2B.yml index b29768411df..032600c75fb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SL-LEAF2B.yml @@ -24,12 +24,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml index 336b9a9ffbc..7d273d08b6f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UNDERLAY-MULTICAST-L3LEAF1B - description: UNDERLAY-MULTICAST-L3LEAF1B + description: UNDERLAY-MULTICAST-L3LEAF1B_Vlan4093 - ip_address: 172.31.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -57,12 +57,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE1 - description: UNDERLAY-MULTICAST-SPINE1 + description: UNDERLAY-MULTICAST-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE2 - description: UNDERLAY-MULTICAST-SPINE2 + description: UNDERLAY-MULTICAST-SPINE2_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -111,17 +111,17 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.0/31 @@ -129,7 +129,7 @@ vlan_interfaces: ipv4: sparse_mode: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -175,7 +175,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -188,7 +188,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml index 84193a46e7e..0172d0d5007 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UNDERLAY-MULTICAST-L3LEAF1A - description: UNDERLAY-MULTICAST-L3LEAF1A + description: UNDERLAY-MULTICAST-L3LEAF1A_Vlan4093 - ip_address: 172.31.255.4 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -57,12 +57,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE1 - description: UNDERLAY-MULTICAST-SPINE1 + description: UNDERLAY-MULTICAST-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE2 - description: UNDERLAY-MULTICAST-SPINE2 + description: UNDERLAY-MULTICAST-SPINE2_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -111,17 +111,17 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.1/31 @@ -129,7 +129,7 @@ vlan_interfaces: ipv4: sparse_mode: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -167,7 +167,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -180,7 +180,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml index 41d06b773f4..df84dc5f835 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.252.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UNDERLAY-MULTICAST-L3LEAF2B - description: UNDERLAY-MULTICAST-L3LEAF2B + description: UNDERLAY-MULTICAST-L3LEAF2B_Vlan4094 - ip_address: 172.31.255.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -57,12 +57,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE1 - description: UNDERLAY-MULTICAST-SPINE1 + description: UNDERLAY-MULTICAST-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE2 - description: UNDERLAY-MULTICAST-SPINE2 + description: UNDERLAY-MULTICAST-SPINE2_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -111,12 +111,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -157,7 +157,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet3 + description: P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -170,7 +170,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet3 + description: P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet3 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml index 3108ecd707e..ac7965e60dc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-L3LEAF2B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.252.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UNDERLAY-MULTICAST-L3LEAF2A - description: UNDERLAY-MULTICAST-L3LEAF2A + description: UNDERLAY-MULTICAST-L3LEAF2A_Vlan4094 - ip_address: 172.31.255.12 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -57,12 +57,12 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE1 - description: UNDERLAY-MULTICAST-SPINE1 + description: UNDERLAY-MULTICAST-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-SPINE2 - description: UNDERLAY-MULTICAST-SPINE2 + description: UNDERLAY-MULTICAST-SPINE2_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -111,12 +111,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -157,7 +157,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE1_Ethernet4 + description: P2P_UNDERLAY-MULTICAST-SPINE1_Ethernet4 shutdown: false mtu: 9214 switchport: @@ -170,7 +170,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_UNDERLAY-MULTICAST-SPINE2_Ethernet4 + description: P2P_UNDERLAY-MULTICAST-SPINE2_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml index 3db62f9d0fe..6745107c832 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE1.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF1A - description: UNDERLAY-MULTICAST-L3LEAF1A + description: UNDERLAY-MULTICAST-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF1B - description: UNDERLAY-MULTICAST-L3LEAF1B + description: UNDERLAY-MULTICAST-L3LEAF1B_Loopback0 remote_as: '65101' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF2A - description: UNDERLAY-MULTICAST-L3LEAF2A + description: UNDERLAY-MULTICAST-L3LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF2B - description: UNDERLAY-MULTICAST-L3LEAF2B + description: UNDERLAY-MULTICAST-L3LEAF2B_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -120,7 +120,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -133,7 +133,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -159,7 +159,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet1 + description: P2P_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml index 08c07e1e752..a2475e8c71a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY-MULTICAST-SPINE2.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF1A - description: UNDERLAY-MULTICAST-L3LEAF1A + description: UNDERLAY-MULTICAST-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF1B - description: UNDERLAY-MULTICAST-L3LEAF1B + description: UNDERLAY-MULTICAST-L3LEAF1B_Loopback0 remote_as: '65101' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF2A - description: UNDERLAY-MULTICAST-L3LEAF2A + description: UNDERLAY-MULTICAST-L3LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: UNDERLAY-MULTICAST-L3LEAF2B - description: UNDERLAY-MULTICAST-L3LEAF2B + description: UNDERLAY-MULTICAST-L3LEAF2B_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -117,7 +117,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-L3LEAF1A_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -127,7 +127,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF1B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-L3LEAF1B_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -137,7 +137,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-L3LEAF2A_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: UNDERLAY-MULTICAST-L3LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet2 + description: P2P_UNDERLAY-MULTICAST-L3LEAF2B_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml index fe637a49c37..348b89d6e49 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_L3LEAF1.yml @@ -60,7 +60,7 @@ ethernet_interfaces: peer: UNDERLAY_FILTER_PEER_AS_SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_SPINE1_Ethernet1 + description: P2P_UNDERLAY_FILTER_PEER_AS_SPINE1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -70,7 +70,7 @@ ethernet_interfaces: peer: UNDERLAY_FILTER_PEER_AS_SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_SPINE2_Ethernet1 + description: P2P_UNDERLAY_FILTER_PEER_AS_SPINE2_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml index e68a0a28d7c..87af39fef97 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE1.yml @@ -57,7 +57,7 @@ ethernet_interfaces: peer: UNDERLAY_FILTER_PEER_AS_L3LEAF1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet1 + description: P2P_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml index ce3d91a4fa1..ba62c0c6bf2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UNDERLAY_FILTER_PEER_AS_SPINE2.yml @@ -57,7 +57,7 @@ ethernet_interfaces: peer: UNDERLAY_FILTER_PEER_AS_L3LEAF1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet2 + description: P2P_UNDERLAY_FILTER_PEER_AS_L3LEAF1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml index f79bf7cae02..07f9679eb5b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1A.yml @@ -40,12 +40,12 @@ management_api_http: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.yml index 4dd4fd8a86a..7948754b2c2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L2LEAF1B.yml @@ -40,12 +40,12 @@ management_api_http: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml index 19d11910e18..449cf31512b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B - description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B + description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Vlan4093 - ip_address: 172.31.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 - description: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 + description: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -102,17 +102,17 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.0/31 @@ -173,7 +173,7 @@ ethernet_interfaces: peer: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet1 + description: P2P_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml index 57b580f8e2e..78a32f99354 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.251.0 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A - description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A + description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Vlan4093 - ip_address: 172.31.255.2 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65001' @@ -52,7 +52,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 - description: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 + description: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -102,17 +102,17 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.251.1/31 @@ -173,7 +173,7 @@ ethernet_interfaces: peer: UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet2 + description: P2P_UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml index 883b3cf81a1..e13997ca118 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK-MLAG-STRUCTURED-CONFIG-SPINE1.yml @@ -47,12 +47,12 @@ router_bgp: - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A - description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A + description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B - description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B + description: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Loopback0 remote_as: '65101' address_family_evpn: peer_groups: @@ -97,7 +97,7 @@ ethernet_interfaces: peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Ethernet1 + description: P2P_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -110,7 +110,7 @@ ethernet_interfaces: peer: UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Ethernet1 + description: P2P_UPLINK-MLAG-STRUCTURED-CONFIG-L3LEAF1B_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml index 5071b0860e0..92dd054c761 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_LEAF1.yml @@ -99,7 +99,7 @@ ethernet_interfaces: peer: UPLINK_P2P_VRFS_TESTS_SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1 + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1 shutdown: false mtu: 9214 mac_security: @@ -112,7 +112,7 @@ ethernet_interfaces: peer_interface: Ethernet1.42 peer_type: spine vrf: PROD - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.42_vrf_PROD + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.42_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 42 @@ -123,7 +123,7 @@ ethernet_interfaces: peer_interface: Ethernet1.66 peer_type: spine vrf: ONLY-ON-L2LEAF - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.66_vrf_ONLY-ON-L2LEAF + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE1_Ethernet1.66_VRF_ONLY-ON-L2LEAF shutdown: false encapsulation_dot1q: vlan: 66 @@ -133,7 +133,7 @@ ethernet_interfaces: peer: UPLINK_P2P_VRFS_TESTS_SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2 + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2 shutdown: false mtu: 9214 mac_security: @@ -146,7 +146,7 @@ ethernet_interfaces: peer_interface: Ethernet2.100 peer_type: spine vrf: IT - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.100_vrf_IT + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.100_VRF_IT shutdown: false encapsulation_dot1q: vlan: 100 @@ -157,7 +157,7 @@ ethernet_interfaces: peer_interface: Ethernet2.42 peer_type: spine vrf: PROD - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.42_vrf_PROD + description: P2P_UPLINK_P2P_VRFS_TESTS_SPINE2_Ethernet2.42_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 42 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml index 9747045541d..d9b51cec29a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE1.yml @@ -76,7 +76,7 @@ ethernet_interfaces: peer: UPLINK_P2P_VRFS_TESTS_LEAF1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1 + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1 shutdown: false mtu: 9214 mac_security: @@ -89,7 +89,7 @@ ethernet_interfaces: peer_interface: Ethernet1.42 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.42_vrf_PROD + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.42_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 42 @@ -100,7 +100,7 @@ ethernet_interfaces: peer_interface: Ethernet1.66 peer_type: l3leaf vrf: ONLY-ON-L2LEAF - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.66_vrf_ONLY-ON-L2LEAF + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet1.66_VRF_ONLY-ON-L2LEAF shutdown: false encapsulation_dot1q: vlan: 66 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml index d6159c83962..a6592cafa87 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/UPLINK_P2P_VRFS_TESTS_SPINE2.yml @@ -76,7 +76,7 @@ ethernet_interfaces: peer: UPLINK_P2P_VRFS_TESTS_LEAF1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2 + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2 shutdown: false mtu: 9214 mac_security: @@ -89,7 +89,7 @@ ethernet_interfaces: peer_interface: Ethernet2.100 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.100_vrf_IT + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.100_VRF_IT shutdown: false encapsulation_dot1q: vlan: 100 @@ -100,7 +100,7 @@ ethernet_interfaces: peer_interface: Ethernet2.42 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.42_vrf_PROD + description: P2P_UPLINK_P2P_VRFS_TESTS_LEAF1_Ethernet2.42_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 42 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml index 336b8cc9294..b6b48088f1c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml @@ -24,10 +24,12 @@ router_bgp: maximum_routes: 12000 send_community: all route_map_in: RM-MLAG-PEER-IN + redistribute_routes: + - source_protocol: connected neighbors: - ip_address: 10.10.20.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: bgp-from-network-services-2 + description: bgp-from-network-services-2_Vlan3099 - ip_address: 10.10.1.2 peer_group: MYPEERGROUP address_family_ipv4: @@ -71,17 +73,17 @@ management_api_http: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 3099 - name: MLAG_iBGP_default + name: MLAG_L3_VRF_default trunk_groups: - MLAG tenant: TEST vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -90,7 +92,7 @@ vlan_interfaces: tenant: TEST type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf default' + description: MLAG_L3_VRF_default vrf: default mtu: 9214 ip_address: 10.10.20.0/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-2.yml index 80140bab7d1..bcce2a31979 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-2.yml @@ -34,12 +34,12 @@ management_api_http: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml index d036571d273..5eab72811ad 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-1.yml @@ -47,11 +47,11 @@ router_bgp: - ip_address: 192.168.253.205 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: bgp-peer-groups-2 - description: bgp-peer-groups-2 + description: bgp-peer-groups-2_Vlan4094 - ip_address: 192.168.255.112 peer_group: EVPN-OVERLAY-PEERS peer: bgp-peer-groups-2 - description: bgp-peer-groups-2 + description: bgp-peer-groups-2_Loopback0 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -91,12 +91,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml index 4613f4c56f1..fbef1e3a76c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/bgp-peer-groups-2.yml @@ -58,11 +58,11 @@ router_bgp: - ip_address: 192.168.253.204 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: bgp-peer-groups-1 - description: bgp-peer-groups-1 + description: bgp-peer-groups-1_Vlan4094 - ip_address: 192.168.255.111 peer_group: EVPN-OVERLAY-PEERS peer: bgp-peer-groups-1 - description: bgp-peer-groups-1 + description: bgp-peer-groups-1_Loopback0 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -104,12 +104,12 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml index 997bb300ff1..4fe06f03eb9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml @@ -79,7 +79,6 @@ ethernet_interfaces: peer: core-2-ospf-ldp peer_interface: Ethernet1 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet1 switchport: enabled: false shutdown: false @@ -98,12 +97,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet1 speed: forced 1000full - name: Ethernet2 peer: core-2-ospf-ldp peer_interface: Ethernet2 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet2 switchport: enabled: false shutdown: false @@ -120,12 +119,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet2 speed: 100full - name: Ethernet3 peer: core-2-ospf-ldp peer_interface: Ethernet3 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet3 switchport: enabled: false shutdown: false @@ -144,12 +143,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet3 speed: forced 1000full - name: Ethernet4 peer: core-2-ospf-ldp peer_interface: Ethernet4 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet4 switchport: enabled: false shutdown: false @@ -163,12 +162,12 @@ ethernet_interfaces: isis_circuit_type: level-2 isis_authentication_mode: md5 isis_authentication_key: $1c$sTNAlR6rKSw= + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet4 speed: forced 1000full - name: Ethernet5 peer: core-2-ospf-ldp peer_interface: Ethernet5 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet5 switchport: enabled: false shutdown: false @@ -184,12 +183,12 @@ ethernet_interfaces: isis_authentication_key: $1c$sTNAlR6rKSw= mpls: ip: true + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet5 speed: forced 1000full - name: Ethernet6 peer: core-2-ospf-ldp peer_interface: Ethernet6 peer_type: core_router - description: Custom description on core-1-isis-sr-ldp eth6 switchport: enabled: false shutdown: false @@ -209,12 +208,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: Custom description on core-1-isis-sr-ldp eth6 speed: 100full - name: Ethernet10 peer: core-2-ospf-ldp peer_interface: Ethernet10 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet10 switchport: enabled: false shutdown: false @@ -230,32 +229,72 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet10 speed: forced 1000full - name: Ethernet12 peer: core-2-ospf-ldp peer_interface: Ethernet12 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet12 shutdown: false channel_group: id: 12 mode: active + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet12 speed: forced 1000full - name: Ethernet13 peer: core-2-ospf-ldp peer_interface: Ethernet13 peer_type: core_router - description: P2P_LINK_TO_core-2-ospf-ldp_Ethernet13 shutdown: false channel_group: id: 12 mode: active + description: P2P_LINK_TO_CORE-2-OSPF-LDP_Ethernet13 + speed: forced 1000full +- name: Ethernet14 + peer: core-2-ospf-ldp + peer_interface: Ethernet14 + peer_type: core_router + shutdown: false + channel_group: + id: 14 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_A + speed: forced 1000full +- name: Ethernet15 + peer: core-2-ospf-ldp + peer_interface: Ethernet15 + peer_type: core_router + shutdown: false + channel_group: + id: 14 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_A + speed: forced 1000full +- name: Ethernet16 + peer: core-2-ospf-ldp + peer_interface: Ethernet16 + peer_type: core_router + shutdown: false + channel_group: + id: 16 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_A + speed: forced 1000full +- name: Ethernet17 + peer: core-2-ospf-ldp + peer_interface: Ethernet17 + peer_type: core_router + shutdown: false + channel_group: + id: 16 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_A speed: forced 1000full - name: ethernet21 peer: peer2 peer_interface: ethernet21 peer_type: other - description: P2P_LINK_TO_peer2_ethernet21 switchport: enabled: false shutdown: false @@ -266,11 +305,11 @@ ethernet_interfaces: isis_network_point_to_point: true isis_hello_padding: true isis_circuit_type: level-2 + description: P2P_LINK_TO_PEER2_ethernet21 - name: ethernet22 peer: peer3 peer_interface: ethernet22 peer_type: other - description: P2P_LINK_TO_peer3_ethernet22 switchport: enabled: false shutdown: false @@ -278,11 +317,11 @@ ethernet_interfaces: ip_address: 172.16.0.0/31 mpls: ip: true + description: P2P_LINK_TO_PEER3_ethernet22 - name: ethernet23 peer: peer4 peer_interface: ethernet23 peer_type: other - description: P2P_LINK_TO_peer4_ethernet23 switchport: enabled: false shutdown: false @@ -290,11 +329,11 @@ ethernet_interfaces: ip_address: 172.16.0.2/31 mpls: ip: true + description: P2P_LINK_TO_PEER4_ethernet23 - name: ethernet24 peer: peer5 peer_interface: ethernet22 peer_type: other - description: P2P_LINK_TO_peer5_ethernet22 switchport: enabled: false shutdown: false @@ -302,11 +341,11 @@ ethernet_interfaces: ip_address: 172.16.1.1/29 mpls: ip: true + description: P2P_LINK_TO_PEER5_ethernet22 - name: ethernet25 peer: peer6 peer_interface: ethernet23 peer_type: other - description: P2P_LINK_TO_peer6_ethernet23 switchport: enabled: false shutdown: false @@ -314,12 +353,58 @@ ethernet_interfaces: ip_address: 172.16.1.9/29 mpls: ip: true + description: P2P_LINK_TO_PEER6_ethernet23 port_channel_interfaces: - name: Port-Channel12 peer: core-2-ospf-ldp peer_interface: Port-Channel12 peer_type: core_router + switchport: + enabled: false + shutdown: false + mtu: 1500 + ip_address: 100.64.48.16/31 + ipv6_enable: true + isis_enable: CORE + isis_metric: 60 + isis_network_point_to_point: true + isis_hello_padding: false + isis_circuit_type: level-2 + isis_authentication_mode: md5 + isis_authentication_key: $1c$sTNAlR6rKSw= + mpls: + ip: true + ldp: + interface: true + igp_sync: true description: P2P_LINK_TO_core-2-ospf-ldp_Port-Channel12 +- name: Port-Channel14 + peer: core-2-ospf-ldp + peer_interface: Port-Channel14 + peer_type: core_router + switchport: + enabled: false + shutdown: false + mtu: 1500 + ip_address: 100.64.48.16/31 + ipv6_enable: true + isis_enable: CORE + isis_metric: 60 + isis_network_point_to_point: true + isis_hello_padding: false + isis_circuit_type: level-2 + isis_authentication_mode: md5 + isis_authentication_key: $1c$sTNAlR6rKSw= + mpls: + ip: true + ldp: + interface: true + igp_sync: true + description: CUSTOM_DESCRIPTION_ON_P2P_PORT_CHANNEL_14 +- name: Port-Channel16 + peer: core-2-ospf-ldp + peer_interface: Port-Channel16 + peer_type: core_router switchport: enabled: false shutdown: false @@ -338,3 +423,4 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_A diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml index d707da041bf..74b528f7788 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml @@ -52,6 +52,8 @@ router_ospf: - Ethernet6 - Ethernet10 - Port-Channel12 + - Port-Channel14 + - Port-Channel16 bfd_enable: true mpls: ip: true @@ -65,7 +67,6 @@ ethernet_interfaces: peer: core-1-isis-sr-ldp peer_interface: Ethernet1 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet1 switchport: enabled: false shutdown: false @@ -79,12 +80,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet1 speed: forced 1000full - name: Ethernet2 peer: core-1-isis-sr-ldp peer_interface: Ethernet2 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet2 switchport: enabled: false shutdown: false @@ -98,12 +99,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet2 speed: 100full - name: Ethernet3 peer: core-1-isis-sr-ldp peer_interface: Ethernet3 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet3 switchport: enabled: false shutdown: false @@ -117,12 +118,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet3 speed: forced 1000full - name: Ethernet4 peer: core-1-isis-sr-ldp peer_interface: Ethernet4 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet4 switchport: enabled: false shutdown: false @@ -131,12 +132,12 @@ ethernet_interfaces: ipv6_enable: true ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet4 speed: forced 1000full - name: Ethernet5 peer: core-1-isis-sr-ldp peer_interface: Ethernet5 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet5 switchport: enabled: false shutdown: false @@ -147,12 +148,12 @@ ethernet_interfaces: ospf_area: 0.0.0.0 mpls: ip: true + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet5 speed: forced 1000full - name: Ethernet6 peer: core-1-isis-sr-ldp peer_interface: Ethernet6 peer_type: core_router - description: Custom description on core-2-ospf-ldp eth6 switchport: enabled: false shutdown: false @@ -167,12 +168,12 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: Custom description on core-2-ospf-ldp eth6 speed: 100full - name: Ethernet10 peer: core-1-isis-sr-ldp peer_interface: Ethernet10 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet10 switchport: enabled: false shutdown: false @@ -185,33 +186,109 @@ ethernet_interfaces: ldp: interface: true igp_sync: true + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet10 speed: forced 1000full - name: Ethernet12 peer: core-1-isis-sr-ldp peer_interface: Ethernet12 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet12 shutdown: false channel_group: id: 12 mode: active + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet12 speed: forced 1000full - name: Ethernet13 peer: core-1-isis-sr-ldp peer_interface: Ethernet13 peer_type: core_router - description: P2P_LINK_TO_core-1-isis-sr-ldp_Ethernet13 shutdown: false channel_group: id: 12 mode: active + description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet13 + speed: forced 1000full +- name: Ethernet14 + peer: core-1-isis-sr-ldp + peer_interface: Ethernet14 + peer_type: core_router + shutdown: false + channel_group: + id: 14 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_B + speed: forced 1000full +- name: Ethernet15 + peer: core-1-isis-sr-ldp + peer_interface: Ethernet15 + peer_type: core_router + shutdown: false + channel_group: + id: 14 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_B + speed: forced 1000full +- name: Ethernet16 + peer: core-1-isis-sr-ldp + peer_interface: Ethernet16 + peer_type: core_router + shutdown: false + channel_group: + id: 16 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_B + speed: forced 1000full +- name: Ethernet17 + peer: core-1-isis-sr-ldp + peer_interface: Ethernet17 + peer_type: core_router + shutdown: false + channel_group: + id: 16 + mode: active + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_B speed: forced 1000full port_channel_interfaces: - name: Port-Channel12 peer: core-1-isis-sr-ldp peer_interface: Port-Channel12 peer_type: core_router + switchport: + enabled: false + shutdown: false + mtu: 1500 + ip_address: 100.64.48.17/31 + ipv6_enable: true + ospf_network_point_to_point: true + ospf_area: 0.0.0.0 + mpls: + ip: true + ldp: + interface: true + igp_sync: true description: P2P_LINK_TO_core-1-isis-sr-ldp_Port-Channel12 +- name: Port-Channel14 + peer: core-1-isis-sr-ldp + peer_interface: Port-Channel14 + peer_type: core_router + switchport: + enabled: false + shutdown: false + mtu: 1500 + ip_address: 100.64.48.17/31 + ipv6_enable: true + ospf_network_point_to_point: true + ospf_area: 0.0.0.0 + mpls: + ip: true + ldp: + interface: true + igp_sync: true + description: CUSTOM_DESCRIPTION_ON_P2P_PORT_CHANNEL_14 +- name: Port-Channel16 + peer: core-1-isis-sr-ldp + peer_interface: Port-Channel16 + peer_type: core_router switchport: enabled: false shutdown: false @@ -225,3 +302,4 @@ port_channel_interfaces: ldp: interface: true igp_sync: true + description: CUSTOM_DESCRIPTION_ON_P2P_LINK_B diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml index e317c11aae2..e0d20e74b92 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-4-multicast.yml @@ -108,7 +108,6 @@ ethernet_interfaces: peer: peer1 peer_interface: Ethernet1 peer_type: other - description: P2P_LINK_TO_peer1_Ethernet1 switchport: enabled: false shutdown: false @@ -119,11 +118,11 @@ ethernet_interfaces: sparse_mode: true mpls: ip: true + description: P2P_LINK_TO_PEER1_Ethernet1 - name: Ethernet2 peer: peer2 peer_interface: Ethernet2 peer_type: other - description: P2P_LINK_TO_peer2_Ethernet2 switchport: enabled: false shutdown: false @@ -131,11 +130,11 @@ ethernet_interfaces: ip_address: 100.64.48.20/31 mpls: ip: true + description: P2P_LINK_TO_PEER2_Ethernet2 - name: Ethernet3 peer: peer3 peer_interface: Ethernet3 peer_type: other - description: P2P_LINK_TO_peer3_Ethernet3 switchport: enabled: false shutdown: false @@ -143,3 +142,4 @@ ethernet_interfaces: ip_address: 100.64.48.22/31 mpls: ip: true + description: P2P_LINK_TO_PEER3_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml index 73a1d06ce4a..7bf293b2886 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-1.yml @@ -42,6 +42,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4_sr_te: @@ -68,7 +69,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.42.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml index 85d17c75b7e..f0a6288c502 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-2.yml @@ -42,6 +42,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4_sr_te: @@ -68,7 +69,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.42.2:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml index 651461e5c10..8c4f0bc90bf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-edge-3.yml @@ -42,6 +42,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4_sr_te: @@ -68,7 +69,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.42.3:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml index fc999a46b0f..e4d91367d88 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.yml @@ -64,10 +64,12 @@ router_bgp: remote_as: '65000' address_family_evpn: peer_groups: - - name: WAN-OVERLAY-PEERS - activate: true - name: WAN-RR-OVERLAY-PEERS activate: true + encapsulation: path-selection + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4_sr_te: @@ -103,7 +105,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-RR-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.44.1:1 @@ -504,7 +506,11 @@ metadata: - name: Site404 id: 404 location: - address: Not Found + address: Atlantis + - name: Site405 + id: 405 + location: + address: El Dorado - name: Site422 id: 422 location: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml index 3df196073f0..8bda9503849 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml @@ -31,6 +31,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: @@ -61,7 +62,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.42.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml index 11cf2e49df9..570ed8038e1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml @@ -31,6 +31,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: @@ -61,7 +62,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: default rd: 192.168.42.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml index 97e15858b1d..0b436fd28f8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml @@ -60,7 +60,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 vrfs: - name: IT router_id: 192.168.42.1 @@ -135,6 +135,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4_sr_te: @@ -188,7 +189,7 @@ ethernet_interfaces: peer: site-ha-disabled-leaf peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1 + description: P2P_site-ha-disabled-leaf_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -199,7 +200,7 @@ ethernet_interfaces: peer_interface: Ethernet1.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.1000_vrf_IT + description: P2P_site-ha-disabled-leaf_Ethernet1.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -210,7 +211,7 @@ ethernet_interfaces: peer_interface: Ethernet1.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.142_vrf_PROD + description: P2P_site-ha-disabled-leaf_Ethernet1.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -221,7 +222,7 @@ ethernet_interfaces: peer_interface: Ethernet1.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-disabled-leaf_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml index d8f20cdd722..1b9a91f009e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml @@ -54,11 +54,11 @@ router_bgp: - ip_address: 192.168.144.2 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder1 - description: cv-pathfinder-pathfinder1 + description: cv-pathfinder-pathfinder1_Dps1 - ip_address: 192.168.144.3 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder2 - description: cv-pathfinder-pathfinder2 + description: cv-pathfinder-pathfinder2_Dps1 vrfs: - name: IT router_id: 192.168.42.2 @@ -133,6 +133,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4_sr_te: @@ -186,7 +187,7 @@ ethernet_interfaces: peer: site-ha-disabled-leaf peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2 + description: P2P_site-ha-disabled-leaf_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -197,7 +198,7 @@ ethernet_interfaces: peer_interface: Ethernet2.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.1000_vrf_IT + description: P2P_site-ha-disabled-leaf_Ethernet2.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -208,7 +209,7 @@ ethernet_interfaces: peer_interface: Ethernet2.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.142_vrf_PROD + description: P2P_site-ha-disabled-leaf_Ethernet2.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -219,7 +220,7 @@ ethernet_interfaces: peer_interface: Ethernet2.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-disabled-leaf_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml index c0da75ef988..5a8245b71bb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml @@ -56,7 +56,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.142.3 peer: cv-pathfinder-edge2B description: cv-pathfinder-edge2B @@ -152,6 +152,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -160,6 +161,7 @@ router_bgp: neighbors: - ip_address: 192.168.142.3 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -211,7 +213,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1 + description: P2P_site-ha-enabled-leaf2A_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -222,7 +224,7 @@ ethernet_interfaces: peer_interface: Ethernet1.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.1000_vrf_IT + description: P2P_site-ha-enabled-leaf2A_Ethernet1.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -233,7 +235,7 @@ ethernet_interfaces: peer_interface: Ethernet1.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.142_vrf_PROD + description: P2P_site-ha-enabled-leaf2A_Ethernet1.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -244,7 +246,7 @@ ethernet_interfaces: peer_interface: Ethernet1.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf2A_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -254,7 +256,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1 + description: P2P_site-ha-enabled-leaf2B_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -265,7 +267,7 @@ ethernet_interfaces: peer_interface: Ethernet1.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.1000_vrf_IT + description: P2P_site-ha-enabled-leaf2B_Ethernet1.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -276,7 +278,7 @@ ethernet_interfaces: peer_interface: Ethernet1.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.142_vrf_PROD + description: P2P_site-ha-enabled-leaf2B_Ethernet1.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -287,7 +289,7 @@ ethernet_interfaces: peer_interface: Ethernet1.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf2B_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml index 2dd6ee6be39..5ad9d84e947 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml @@ -56,7 +56,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.142.2 peer: cv-pathfinder-edge2A description: cv-pathfinder-edge2A @@ -152,6 +152,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: vxlan route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -160,6 +161,7 @@ router_bgp: neighbors: - ip_address: 192.168.142.2 activate: true + encapsulation: vxlan address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -211,7 +213,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2 + description: P2P_site-ha-enabled-leaf2A_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -222,7 +224,7 @@ ethernet_interfaces: peer_interface: Ethernet2.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.1000_vrf_IT + description: P2P_site-ha-enabled-leaf2A_Ethernet2.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -233,7 +235,7 @@ ethernet_interfaces: peer_interface: Ethernet2.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.142_vrf_PROD + description: P2P_site-ha-enabled-leaf2A_Ethernet2.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -244,7 +246,7 @@ ethernet_interfaces: peer_interface: Ethernet2.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2A_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf2A_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -254,7 +256,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2 + description: P2P_site-ha-enabled-leaf2B_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -265,7 +267,7 @@ ethernet_interfaces: peer_interface: Ethernet2.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.1000_vrf_IT + description: P2P_site-ha-enabled-leaf2B_Ethernet2.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -276,7 +278,7 @@ ethernet_interfaces: peer_interface: Ethernet2.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.142_vrf_PROD + description: P2P_site-ha-enabled-leaf2B_Ethernet2.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -287,7 +289,7 @@ ethernet_interfaces: peer_interface: Ethernet2.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF2B_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf2B_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml index dcefc576cc4..a3e1f4889d0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3A.yml @@ -43,6 +43,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -51,6 +52,7 @@ router_bgp: neighbors: - ip_address: 192.168.142.7 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -75,7 +77,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.142.7 peer: cv-pathfinder-edge3B description: cv-pathfinder-edge3B @@ -164,9 +166,10 @@ ethernet_interfaces: peer_type: l3_interface peer: cv-pathfinder-edge3B shutdown: false - description: DIRECT LAN HA LINK - ip_address: 10.10.10.0/31 - flow_tracker: null + description: WAN_HA_cv-pathfinder-edge3B_Ethernet52 + ip_address: 10.10.10.1/24 + flow_tracker: + hardware: FLOW-TRACKER mtu: 9100 loopback_interfaces: - name: Loopback0 @@ -419,7 +422,7 @@ router_path_selection: - router_ip: 192.168.142.7 name: cv-pathfinder-edge3B ipv4_addresses: - - 10.10.10.1 + - 10.10.10.2 ipsec_profile: DP-PROFILE load_balance_policies: - name: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml index f88a6eb1503..9fe0511421d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge3B.yml @@ -43,6 +43,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -51,6 +52,7 @@ router_bgp: neighbors: - ip_address: 192.168.142.6 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -75,7 +77,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.142.6 peer: cv-pathfinder-edge3A description: cv-pathfinder-edge3A @@ -163,9 +165,10 @@ ethernet_interfaces: peer_type: l3_interface peer: cv-pathfinder-edge3A shutdown: false - description: DIRECT LAN HA LINK - ip_address: 10.10.10.1/31 - flow_tracker: null + description: WAN_HA_cv-pathfinder-edge3A_Ethernet52 + ip_address: 10.10.10.2/24 + flow_tracker: + hardware: FLOW-TRACKER mtu: 9100 loopback_interfaces: - name: Loopback0 @@ -419,7 +422,7 @@ router_path_selection: - router_ip: 192.168.142.6 name: cv-pathfinder-edge3A ipv4_addresses: - - 10.10.10.0 + - 10.10.10.1 ipsec_profile: DP-PROFILE load_balance_policies: - name: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml new file mode 100644 index 00000000000..75d63d4996f --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4A.yml @@ -0,0 +1,632 @@ +hostname: cv-pathfinder-edge4A +is_deployed: true +router_bgp: + as: '65000' + router_id: 192.168.42.8 + bgp: + default: + ipv4_unicast: false + maximum_paths: + paths: 16 + updates: + wait_install: true + peer_groups: + - name: IPv4-UNDERLAY-PEERS + type: ipv4 + maximum_routes: 12000 + send_community: all + route_map_in: RM-BGP-UNDERLAY-PEERS-IN + route_map_out: RM-BGP-UNDERLAY-PEERS-OUT + - name: WAN-OVERLAY-PEERS + type: wan + update_source: Dps1 + bfd: true + password: htm4AZe9mIQOO1uiMuGgYQ== + send_community: all + maximum_routes: 0 + remote_as: '65000' + ttl_maximum_hops: 1 + bfd_timers: + interval: 1000 + min_rx: 1000 + multiplier: 10 + address_family_ipv4: + peer_groups: + - name: IPv4-UNDERLAY-PEERS + activate: true + - name: WAN-OVERLAY-PEERS + activate: false + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP + address_family_evpn: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection + route_map_in: RM-EVPN-SOO-IN + route_map_out: RM-EVPN-SOO-OUT + neighbor_default: + next_hop_self_received_evpn_routes: + enable: true + neighbors: + - ip_address: 192.168.142.9 + activate: true + encapsulation: path-selection + address_family_ipv4_sr_te: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + address_family_link_state: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + path_selection: + roles: + producer: true + address_family_path_selection: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + bgp: + additional_paths: + receive: true + send: + any: true + neighbors: + - ip_address: 192.168.144.1 + peer_group: WAN-OVERLAY-PEERS + peer: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 + - ip_address: 192.168.142.9 + peer: cv-pathfinder-edge4B + description: cv-pathfinder-edge4B + remote_as: '65000' + update_source: Dps1 + route_reflector_client: true + send_community: all + route_map_in: RM-WAN-HA-PEER-IN + route_map_out: RM-WAN-HA-PEER-OUT + vrfs: + - name: default + rd: 192.168.42.8:1 + route_targets: + import: + - address_family: evpn + route_targets: + - '1:1' + export: + - address_family: evpn + route_targets: + - '1:1' + - route-map RM-EVPN-EXPORT-VRF-DEFAULT + - name: IT + rd: 192.168.42.8:1000 + route_targets: + import: + - address_family: evpn + route_targets: + - 1000:1000 + export: + - address_family: evpn + route_targets: + - 1000:1000 + router_id: 192.168.42.8 + redistribute_routes: + - source_protocol: connected + - name: PROD + rd: 192.168.42.8:142 + route_targets: + import: + - address_family: evpn + route_targets: + - 142:142 + export: + - address_family: evpn + route_targets: + - 142:142 + router_id: 192.168.42.8 + redistribute_routes: + - source_protocol: connected +service_routing_protocols_model: multi-agent +ip_routing: true +aaa_root: + disabled: true +config_end: true +enable_password: + disabled: true +transceiver_qsfp_default_mode_4x10: false +spanning_tree: + mode: none +vrfs: +- name: MGMT + ip_routing: false +- name: IT + tenant: TenantA + ip_routing: true +- name: PROD + tenant: TenantA + ip_routing: true +management_api_http: + enable_vrfs: + - name: MGMT + enable_https: true +ethernet_interfaces: +- name: Ethernet1.42 + peer_type: l3_interface + ip_address: dhcp + shutdown: false + description: Comcast + encapsulation_dot1q: + vlan: 42 + dhcp_client_accept_default_route: true +- name: Ethernet1 + switchport: + enabled: false + peer_type: l3_interface + shutdown: false +- name: Ethernet42 + peer_type: wan_ha_peer + peer_interface: Ethernet42 + peer: cv-pathfinder-edge4B + description: WAN_HA_cv-pathfinder-edge4B_Ethernet42 + shutdown: false + channel_group: + id: 666 + mode: active + mtu: 9194 +- name: Ethernet43 + peer_type: wan_ha_peer + peer_interface: Ethernet43 + peer: cv-pathfinder-edge4B + description: WAN_HA_cv-pathfinder-edge4B_Ethernet43 + shutdown: false + channel_group: + id: 666 + mode: active + mtu: 9194 +port_channel_interfaces: +- name: Port-Channel666 + switchport: + enabled: false + peer_type: l3_interface + peer_interface: Port-Channel666 + peer: cv-pathfinder-edge4B + shutdown: false + description: WAN_HA_cv-pathfinder-edge4B_Port-Channel666 + ip_address: 10.10.10.1/24 + flow_tracker: + hardware: FLOW-TRACKER + mtu: 9194 +loopback_interfaces: +- name: Loopback0 + description: ROUTER_ID + shutdown: false + ip_address: 192.168.42.8/32 +prefix_lists: +- name: PL-LOOPBACKS-EVPN-OVERLAY + sequence_numbers: + - sequence: 10 + action: permit 192.168.42.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 + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-BGP-UNDERLAY-PEERS-IN + sequence_numbers: + - sequence: 40 + type: permit + description: Mark prefixes originated from the LAN + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-BGP-UNDERLAY-PEERS-OUT + sequence_numbers: + - sequence: 10 + type: permit + description: Make routes learned from WAN HA peer less preferred on LAN routers + match: + - tag 50 + - route-type internal + set: + - metric 50 + - sequence: 20 + type: permit +- name: RM-EVPN-SOO-IN + sequence_numbers: + - sequence: 10 + type: deny + match: + - extcommunity ECL-EVPN-SOO + - sequence: 20 + type: permit +- name: RM-EVPN-SOO-OUT + sequence_numbers: + - sequence: 10 + type: permit + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-WAN-HA-PEER-IN + sequence_numbers: + - sequence: 10 + type: permit + description: Set tag 50 on routes received from HA peer over EVPN + set: + - tag 50 +- name: RM-WAN-HA-PEER-OUT + sequence_numbers: + - sequence: 10 + type: permit + description: Make EVPN routes learned from WAN less preferred on HA peer + match: + - route-type internal + set: + - local-preference 50 + - sequence: 20 + type: permit + description: Make locally injected routes less preferred on HA peer + set: + - local-preference 75 +- name: RM-EVPN-EXPORT-VRF-DEFAULT + sequence_numbers: + - sequence: 10 + type: permit + match: + - extcommunity ECL-EVPN-SOO +agents: +- name: KernelFib + environment_variables: + - name: KERNELFIB_PROGRAM_ALL_ECMP + value: '1' +ip_extcommunity_lists: +- name: ECL-EVPN-SOO + entries: + - type: permit + extcommunities: soo 192.168.42.8:405 +ip_security: + ike_policies: + - name: CP-IKE-POLICY + local_id: 192.168.142.8 + sa_policies: + - name: DP-SA-POLICY + esp: + encryption: aes256gcm128 + pfs_dh_group: 14 + - name: CP-SA-POLICY + esp: + encryption: aes256gcm128 + pfs_dh_group: 14 + profiles: + - name: DP-PROFILE + sa_policy: DP-SA-POLICY + connection: start + shared_key: ABCDEF1234567890666 + dpd: + interval: 10 + time: 50 + action: clear + mode: transport + - name: CP-PROFILE + ike_policy: CP-IKE-POLICY + sa_policy: CP-SA-POLICY + connection: start + shared_key: ABCDEF1234567890 + dpd: + interval: 10 + time: 50 + action: clear + mode: transport + key_controller: + profile: DP-PROFILE +management_security: + ssl_profiles: + - name: profileA + certificate: + file: profileA.crt + key: profileA.key + trust_certificate: + certificates: + - aristaDeviceCertProvisionerDefaultRootCA.crt + tls_versions: '1.2' +router_adaptive_virtual_topology: + topology_role: transit region + region: + name: AVD_Land_West + id: 42 + zone: + name: AVD_Land_West-ZONE + id: 1 + site: + name: Site405 + id: 405 + profiles: + - name: DEFAULT-AVT-POLICY-CONTROL-PLANE + load_balance_policy: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + - name: DEFAULT-AVT-POLICY-VIDEO + load_balance_policy: LB-DEFAULT-AVT-POLICY-VIDEO + - name: DEFAULT-AVT-POLICY-DEFAULT + load_balance_policy: LB-DEFAULT-AVT-POLICY-DEFAULT + - name: PROD-AVT-POLICY-VOICE + load_balance_policy: LB-PROD-AVT-POLICY-VOICE + - name: PROD-AVT-POLICY-VIDEO + load_balance_policy: LB-PROD-AVT-POLICY-VIDEO + - name: PROD-AVT-POLICY-MPLS-ONLY + load_balance_policy: LB-PROD-AVT-POLICY-MPLS-ONLY + - name: PROD-AVT-POLICY-DEFAULT + load_balance_policy: LB-PROD-AVT-POLICY-DEFAULT + vrfs: + - name: default + policy: DEFAULT-AVT-POLICY-WITH-CP + profiles: + - name: DEFAULT-AVT-POLICY-CONTROL-PLANE + id: 254 + - name: DEFAULT-AVT-POLICY-VIDEO + id: 3 + - name: DEFAULT-AVT-POLICY-DEFAULT + id: 1 + - name: PROD + policy: PROD-AVT-POLICY + profiles: + - name: PROD-AVT-POLICY-VOICE + id: 2 + - name: PROD-AVT-POLICY-VIDEO + id: 4 + - name: PROD-AVT-POLICY-MPLS-ONLY + id: 5 + - name: PROD-AVT-POLICY-DEFAULT + id: 1 + - name: IT + policy: DEFAULT-AVT-POLICY + profiles: + - name: DEFAULT-AVT-POLICY-VIDEO + id: 3 + - name: DEFAULT-AVT-POLICY-DEFAULT + id: 1 + policies: + - name: DEFAULT-AVT-POLICY-WITH-CP + matches: + - application_profile: APP-PROFILE-CONTROL-PLANE + avt_profile: DEFAULT-AVT-POLICY-CONTROL-PLANE + - application_profile: VIDEO + avt_profile: DEFAULT-AVT-POLICY-VIDEO + - application_profile: default + avt_profile: DEFAULT-AVT-POLICY-DEFAULT + - name: PROD-AVT-POLICY + matches: + - application_profile: VOICE + avt_profile: PROD-AVT-POLICY-VOICE + - application_profile: VIDEO + avt_profile: PROD-AVT-POLICY-VIDEO + - application_profile: MPLS-ONLY + avt_profile: PROD-AVT-POLICY-MPLS-ONLY + - application_profile: default + avt_profile: PROD-AVT-POLICY-DEFAULT + - name: DEFAULT-AVT-POLICY + matches: + - application_profile: VIDEO + avt_profile: DEFAULT-AVT-POLICY-VIDEO + - application_profile: default + avt_profile: DEFAULT-AVT-POLICY-DEFAULT +router_bfd: + multihop: + interval: 300 + min_rx: 300 + multiplier: 3 +router_path_selection: + tcp_mss_ceiling: + ipv4_segment_size: auto + path_groups: + - name: INET + id: 101 + local_interfaces: + - name: Ethernet1.42 + stun: + server_profiles: + - INET-cv-pathfinder-pathfinder-Ethernet1 + - INET-cv-pathfinder-pathfinder-Ethernet3 + dynamic_peers: + enabled: true + static_peers: + - router_ip: 192.168.144.1 + name: cv-pathfinder-pathfinder + ipv4_addresses: + - 172.17.7.7 + - 10.9.9.9 + ipsec_profile: CP-PROFILE + - name: LAN_HA + id: 65535 + flow_assignment: lan + local_interfaces: + - name: Port-Channel666 + static_peers: + - router_ip: 192.168.142.9 + name: cv-pathfinder-edge4B + ipv4_addresses: + - 10.10.10.2 + load_balance_policies: + - name: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + path_groups: + - name: INET + - name: LAN_HA + - name: LB-DEFAULT-AVT-POLICY-VIDEO + path_groups: + - name: INET + - name: LAN_HA + - name: LB-DEFAULT-AVT-POLICY-DEFAULT + path_groups: + - name: INET + - name: LAN_HA + - name: LB-PROD-AVT-POLICY-VOICE + path_groups: + - name: INET + priority: 2 + - name: LAN_HA + jitter: 42 + lowest_hop_count: true + - name: LB-PROD-AVT-POLICY-VIDEO + path_groups: + - name: INET + priority: 2 + - name: LAN_HA + loss_rate: '42.0' + - name: LB-PROD-AVT-POLICY-MPLS-ONLY + path_groups: + - name: LAN_HA + - name: LB-PROD-AVT-POLICY-DEFAULT + path_groups: + - name: INET + - name: LAN_HA +router_traffic_engineering: + enabled: true +stun: + client: + server_profiles: + - name: INET-cv-pathfinder-pathfinder-Ethernet1 + ip_address: 172.17.7.7 + ssl_profile: profileA + - name: INET-cv-pathfinder-pathfinder-Ethernet3 + ip_address: 10.9.9.9 + ssl_profile: profileA +application_traffic_recognition: + application_profiles: + - name: VIDEO + categories: + - name: VIDEO1 + applications: + - name: CUSTOM-APPLICATION-1 + - name: skype + application_transports: + - rtp + - name: VOICE + applications: + - name: CUSTOM-VOICE-APPLICATION + - name: MPLS-ONLY + - name: APP-PROFILE-CONTROL-PLANE + applications: + - name: APP-CONTROL-PLANE + categories: + - name: VIDEO1 + applications: + - name: CUSTOM-APPLICATION-2 + - name: CUSTOM-DSCP-APPLICATION + - name: microsoft-teams + applications: + ipv4_applications: + - name: CUSTOM-APPLICATION-1 + protocols: + - tcp + src_prefix_set_name: CUSTOM-SRC-PREFIX-1 + dest_prefix_set_name: CUSTOM-DEST-PREFIX-1 + - name: CUSTOM-APPLICATION-2 + protocols: + - tcp + tcp_src_port_set_name: TCP-SRC-2 + tcp_dest_port_set_name: TCP-DEST-2 + - name: CUSTOM-DSCP-APPLICATION + dscp_ranges: + - ef + - 12-14 + - cs6 + - '42' + - name: APP-CONTROL-PLANE + dest_prefix_set_name: PFX-PATHFINDERS + field_sets: + l4_ports: + - name: TCP-SRC-2 + port_values: + - '42' + - name: TCP-DEST-2 + port_values: + - '666' + - '777' + ipv4_prefixes: + - name: CUSTOM-SRC-PREFIX-1 + prefix_values: + - 42.42.42.0/24 + - name: CUSTOM-DEST-PREFIX-1 + prefix_values: + - 6.6.6.0/24 + - name: PFX-PATHFINDERS + prefix_values: + - 192.168.144.1/32 +dps_interfaces: +- name: Dps1 + description: DPS Interface + mtu: 9194 + ip_address: 192.168.142.8/32 + flow_tracker: + hardware: FLOW-TRACKER +vxlan_interface: + vxlan1: + description: cv-pathfinder-edge4A_VTEP + vxlan: + udp_port: 4789 + source_interface: Dps1 + vrfs: + - name: default + vni: 1 + - name: IT + vni: 100 + - name: PROD + vni: 42 +flow_tracking: + hardware: + trackers: + - name: FLOW-TRACKER + record_export: + on_inactive_timeout: 70000 + on_interval: 300000 + exporters: + - name: CV-TELEMETRY + collector: + host: 127.0.0.1 + local_interface: Loopback0 + template_interval: 3600000 + shutdown: false +metadata: + cv_tags: + device_tags: + - name: Role + value: transit region + - name: Region + value: AVD_Land_West + - name: Zone + value: AVD_Land_West-ZONE + - name: Site + value: Site405 + interface_tags: + - interface: Ethernet1.42 + tags: + - name: Type + value: wan + - name: Carrier + value: Comcast + - interface: Ethernet1 + tags: + - name: Type + value: lan + - interface: Ethernet42 + tags: + - name: Type + value: lan + - interface: Ethernet43 + tags: + - name: Type + value: lan + cv_pathfinder: + role: transit region + ssl_profile: profileA + vtep_ip: 192.168.142.8 + region: AVD_Land_West + zone: AVD_Land_West-ZONE + site: Site405 + interfaces: + - name: Ethernet1.42 + carrier: Comcast + pathgroup: INET + pathfinders: + - vtep_ip: 192.168.144.1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml new file mode 100644 index 00000000000..4cd19e54f94 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge4B.yml @@ -0,0 +1,632 @@ +hostname: cv-pathfinder-edge4B +is_deployed: true +router_bgp: + as: '65000' + router_id: 192.168.42.9 + bgp: + default: + ipv4_unicast: false + maximum_paths: + paths: 16 + updates: + wait_install: true + peer_groups: + - name: IPv4-UNDERLAY-PEERS + type: ipv4 + maximum_routes: 12000 + send_community: all + route_map_in: RM-BGP-UNDERLAY-PEERS-IN + route_map_out: RM-BGP-UNDERLAY-PEERS-OUT + - name: WAN-OVERLAY-PEERS + type: wan + update_source: Dps1 + bfd: true + password: htm4AZe9mIQOO1uiMuGgYQ== + send_community: all + maximum_routes: 0 + remote_as: '65000' + ttl_maximum_hops: 1 + bfd_timers: + interval: 1000 + min_rx: 1000 + multiplier: 10 + address_family_ipv4: + peer_groups: + - name: IPv4-UNDERLAY-PEERS + activate: true + - name: WAN-OVERLAY-PEERS + activate: false + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP + address_family_evpn: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection + route_map_in: RM-EVPN-SOO-IN + route_map_out: RM-EVPN-SOO-OUT + neighbor_default: + next_hop_self_received_evpn_routes: + enable: true + neighbors: + - ip_address: 192.168.142.8 + activate: true + encapsulation: path-selection + address_family_ipv4_sr_te: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + address_family_link_state: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + path_selection: + roles: + producer: true + address_family_path_selection: + peer_groups: + - name: WAN-OVERLAY-PEERS + activate: true + bgp: + additional_paths: + receive: true + send: + any: true + neighbors: + - ip_address: 192.168.144.1 + peer_group: WAN-OVERLAY-PEERS + peer: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 + - ip_address: 192.168.142.8 + peer: cv-pathfinder-edge4A + description: cv-pathfinder-edge4A + remote_as: '65000' + update_source: Dps1 + route_reflector_client: true + send_community: all + route_map_in: RM-WAN-HA-PEER-IN + route_map_out: RM-WAN-HA-PEER-OUT + vrfs: + - name: default + rd: 192.168.42.9:1 + route_targets: + import: + - address_family: evpn + route_targets: + - '1:1' + export: + - address_family: evpn + route_targets: + - '1:1' + - route-map RM-EVPN-EXPORT-VRF-DEFAULT + - name: IT + rd: 192.168.42.9:1000 + route_targets: + import: + - address_family: evpn + route_targets: + - 1000:1000 + export: + - address_family: evpn + route_targets: + - 1000:1000 + router_id: 192.168.42.9 + redistribute_routes: + - source_protocol: connected + - name: PROD + rd: 192.168.42.9:142 + route_targets: + import: + - address_family: evpn + route_targets: + - 142:142 + export: + - address_family: evpn + route_targets: + - 142:142 + router_id: 192.168.42.9 + redistribute_routes: + - source_protocol: connected +service_routing_protocols_model: multi-agent +ip_routing: true +aaa_root: + disabled: true +config_end: true +enable_password: + disabled: true +transceiver_qsfp_default_mode_4x10: false +spanning_tree: + mode: none +vrfs: +- name: MGMT + ip_routing: false +- name: IT + tenant: TenantA + ip_routing: true +- name: PROD + tenant: TenantA + ip_routing: true +management_api_http: + enable_vrfs: + - name: MGMT + enable_https: true +ethernet_interfaces: +- name: Ethernet1.42 + peer_type: l3_interface + ip_address: dhcp + shutdown: false + description: Comcast + encapsulation_dot1q: + vlan: 42 + dhcp_client_accept_default_route: true +- name: Ethernet1 + switchport: + enabled: false + peer_type: l3_interface + shutdown: false +- name: Ethernet42 + peer_type: wan_ha_peer + peer_interface: Ethernet42 + peer: cv-pathfinder-edge4A + description: WAN_HA_cv-pathfinder-edge4A_Ethernet42 + shutdown: false + channel_group: + id: 666 + mode: active + mtu: 9194 +- name: Ethernet43 + peer_type: wan_ha_peer + peer_interface: Ethernet43 + peer: cv-pathfinder-edge4A + description: WAN_HA_cv-pathfinder-edge4A_Ethernet43 + shutdown: false + channel_group: + id: 666 + mode: active + mtu: 9194 +port_channel_interfaces: +- name: Port-Channel666 + switchport: + enabled: false + peer_type: l3_interface + peer_interface: Port-Channel666 + peer: cv-pathfinder-edge4A + shutdown: false + description: WAN_HA_cv-pathfinder-edge4A_Port-Channel666 + ip_address: 10.10.10.2/24 + flow_tracker: + hardware: FLOW-TRACKER + mtu: 9194 +loopback_interfaces: +- name: Loopback0 + description: ROUTER_ID + shutdown: false + ip_address: 192.168.42.9/32 +prefix_lists: +- name: PL-LOOPBACKS-EVPN-OVERLAY + sequence_numbers: + - sequence: 10 + action: permit 192.168.42.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 + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-BGP-UNDERLAY-PEERS-IN + sequence_numbers: + - sequence: 40 + type: permit + description: Mark prefixes originated from the LAN + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-BGP-UNDERLAY-PEERS-OUT + sequence_numbers: + - sequence: 10 + type: permit + description: Make routes learned from WAN HA peer less preferred on LAN routers + match: + - tag 50 + - route-type internal + set: + - metric 50 + - sequence: 20 + type: permit +- name: RM-EVPN-SOO-IN + sequence_numbers: + - sequence: 10 + type: deny + match: + - extcommunity ECL-EVPN-SOO + - sequence: 20 + type: permit +- name: RM-EVPN-SOO-OUT + sequence_numbers: + - sequence: 10 + type: permit + set: + - extcommunity soo 192.168.42.8:405 additive +- name: RM-WAN-HA-PEER-IN + sequence_numbers: + - sequence: 10 + type: permit + description: Set tag 50 on routes received from HA peer over EVPN + set: + - tag 50 +- name: RM-WAN-HA-PEER-OUT + sequence_numbers: + - sequence: 10 + type: permit + description: Make EVPN routes learned from WAN less preferred on HA peer + match: + - route-type internal + set: + - local-preference 50 + - sequence: 20 + type: permit + description: Make locally injected routes less preferred on HA peer + set: + - local-preference 75 +- name: RM-EVPN-EXPORT-VRF-DEFAULT + sequence_numbers: + - sequence: 10 + type: permit + match: + - extcommunity ECL-EVPN-SOO +agents: +- name: KernelFib + environment_variables: + - name: KERNELFIB_PROGRAM_ALL_ECMP + value: '1' +ip_extcommunity_lists: +- name: ECL-EVPN-SOO + entries: + - type: permit + extcommunities: soo 192.168.42.8:405 +ip_security: + ike_policies: + - name: CP-IKE-POLICY + local_id: 192.168.142.9 + sa_policies: + - name: DP-SA-POLICY + esp: + encryption: aes256gcm128 + pfs_dh_group: 14 + - name: CP-SA-POLICY + esp: + encryption: aes256gcm128 + pfs_dh_group: 14 + profiles: + - name: DP-PROFILE + sa_policy: DP-SA-POLICY + connection: start + shared_key: ABCDEF1234567890666 + dpd: + interval: 10 + time: 50 + action: clear + mode: transport + - name: CP-PROFILE + ike_policy: CP-IKE-POLICY + sa_policy: CP-SA-POLICY + connection: start + shared_key: ABCDEF1234567890 + dpd: + interval: 10 + time: 50 + action: clear + mode: transport + key_controller: + profile: DP-PROFILE +management_security: + ssl_profiles: + - name: profileA + certificate: + file: profileA.crt + key: profileA.key + trust_certificate: + certificates: + - aristaDeviceCertProvisionerDefaultRootCA.crt + tls_versions: '1.2' +router_adaptive_virtual_topology: + topology_role: transit region + region: + name: AVD_Land_West + id: 42 + zone: + name: AVD_Land_West-ZONE + id: 1 + site: + name: Site405 + id: 405 + profiles: + - name: DEFAULT-AVT-POLICY-CONTROL-PLANE + load_balance_policy: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + - name: DEFAULT-AVT-POLICY-VIDEO + load_balance_policy: LB-DEFAULT-AVT-POLICY-VIDEO + - name: DEFAULT-AVT-POLICY-DEFAULT + load_balance_policy: LB-DEFAULT-AVT-POLICY-DEFAULT + - name: PROD-AVT-POLICY-VOICE + load_balance_policy: LB-PROD-AVT-POLICY-VOICE + - name: PROD-AVT-POLICY-VIDEO + load_balance_policy: LB-PROD-AVT-POLICY-VIDEO + - name: PROD-AVT-POLICY-MPLS-ONLY + load_balance_policy: LB-PROD-AVT-POLICY-MPLS-ONLY + - name: PROD-AVT-POLICY-DEFAULT + load_balance_policy: LB-PROD-AVT-POLICY-DEFAULT + vrfs: + - name: default + policy: DEFAULT-AVT-POLICY-WITH-CP + profiles: + - name: DEFAULT-AVT-POLICY-CONTROL-PLANE + id: 254 + - name: DEFAULT-AVT-POLICY-VIDEO + id: 3 + - name: DEFAULT-AVT-POLICY-DEFAULT + id: 1 + - name: PROD + policy: PROD-AVT-POLICY + profiles: + - name: PROD-AVT-POLICY-VOICE + id: 2 + - name: PROD-AVT-POLICY-VIDEO + id: 4 + - name: PROD-AVT-POLICY-MPLS-ONLY + id: 5 + - name: PROD-AVT-POLICY-DEFAULT + id: 1 + - name: IT + policy: DEFAULT-AVT-POLICY + profiles: + - name: DEFAULT-AVT-POLICY-VIDEO + id: 3 + - name: DEFAULT-AVT-POLICY-DEFAULT + id: 1 + policies: + - name: DEFAULT-AVT-POLICY-WITH-CP + matches: + - application_profile: APP-PROFILE-CONTROL-PLANE + avt_profile: DEFAULT-AVT-POLICY-CONTROL-PLANE + - application_profile: VIDEO + avt_profile: DEFAULT-AVT-POLICY-VIDEO + - application_profile: default + avt_profile: DEFAULT-AVT-POLICY-DEFAULT + - name: PROD-AVT-POLICY + matches: + - application_profile: VOICE + avt_profile: PROD-AVT-POLICY-VOICE + - application_profile: VIDEO + avt_profile: PROD-AVT-POLICY-VIDEO + - application_profile: MPLS-ONLY + avt_profile: PROD-AVT-POLICY-MPLS-ONLY + - application_profile: default + avt_profile: PROD-AVT-POLICY-DEFAULT + - name: DEFAULT-AVT-POLICY + matches: + - application_profile: VIDEO + avt_profile: DEFAULT-AVT-POLICY-VIDEO + - application_profile: default + avt_profile: DEFAULT-AVT-POLICY-DEFAULT +router_bfd: + multihop: + interval: 300 + min_rx: 300 + multiplier: 3 +router_path_selection: + tcp_mss_ceiling: + ipv4_segment_size: auto + path_groups: + - name: INET + id: 101 + local_interfaces: + - name: Ethernet1.42 + stun: + server_profiles: + - INET-cv-pathfinder-pathfinder-Ethernet1 + - INET-cv-pathfinder-pathfinder-Ethernet3 + dynamic_peers: + enabled: true + static_peers: + - router_ip: 192.168.144.1 + name: cv-pathfinder-pathfinder + ipv4_addresses: + - 172.17.7.7 + - 10.9.9.9 + ipsec_profile: CP-PROFILE + - name: LAN_HA + id: 65535 + flow_assignment: lan + local_interfaces: + - name: Port-Channel666 + static_peers: + - router_ip: 192.168.142.8 + name: cv-pathfinder-edge4A + ipv4_addresses: + - 10.10.10.1 + load_balance_policies: + - name: LB-DEFAULT-AVT-POLICY-CONTROL-PLANE + path_groups: + - name: INET + - name: LAN_HA + - name: LB-DEFAULT-AVT-POLICY-VIDEO + path_groups: + - name: INET + - name: LAN_HA + - name: LB-DEFAULT-AVT-POLICY-DEFAULT + path_groups: + - name: INET + - name: LAN_HA + - name: LB-PROD-AVT-POLICY-VOICE + path_groups: + - name: INET + priority: 2 + - name: LAN_HA + jitter: 42 + lowest_hop_count: true + - name: LB-PROD-AVT-POLICY-VIDEO + path_groups: + - name: INET + priority: 2 + - name: LAN_HA + loss_rate: '42.0' + - name: LB-PROD-AVT-POLICY-MPLS-ONLY + path_groups: + - name: LAN_HA + - name: LB-PROD-AVT-POLICY-DEFAULT + path_groups: + - name: INET + - name: LAN_HA +router_traffic_engineering: + enabled: true +stun: + client: + server_profiles: + - name: INET-cv-pathfinder-pathfinder-Ethernet1 + ip_address: 172.17.7.7 + ssl_profile: profileA + - name: INET-cv-pathfinder-pathfinder-Ethernet3 + ip_address: 10.9.9.9 + ssl_profile: profileA +application_traffic_recognition: + application_profiles: + - name: VIDEO + categories: + - name: VIDEO1 + applications: + - name: CUSTOM-APPLICATION-1 + - name: skype + application_transports: + - rtp + - name: VOICE + applications: + - name: CUSTOM-VOICE-APPLICATION + - name: MPLS-ONLY + - name: APP-PROFILE-CONTROL-PLANE + applications: + - name: APP-CONTROL-PLANE + categories: + - name: VIDEO1 + applications: + - name: CUSTOM-APPLICATION-2 + - name: CUSTOM-DSCP-APPLICATION + - name: microsoft-teams + applications: + ipv4_applications: + - name: CUSTOM-APPLICATION-1 + protocols: + - tcp + src_prefix_set_name: CUSTOM-SRC-PREFIX-1 + dest_prefix_set_name: CUSTOM-DEST-PREFIX-1 + - name: CUSTOM-APPLICATION-2 + protocols: + - tcp + tcp_src_port_set_name: TCP-SRC-2 + tcp_dest_port_set_name: TCP-DEST-2 + - name: CUSTOM-DSCP-APPLICATION + dscp_ranges: + - ef + - 12-14 + - cs6 + - '42' + - name: APP-CONTROL-PLANE + dest_prefix_set_name: PFX-PATHFINDERS + field_sets: + l4_ports: + - name: TCP-SRC-2 + port_values: + - '42' + - name: TCP-DEST-2 + port_values: + - '666' + - '777' + ipv4_prefixes: + - name: CUSTOM-SRC-PREFIX-1 + prefix_values: + - 42.42.42.0/24 + - name: CUSTOM-DEST-PREFIX-1 + prefix_values: + - 6.6.6.0/24 + - name: PFX-PATHFINDERS + prefix_values: + - 192.168.144.1/32 +dps_interfaces: +- name: Dps1 + description: DPS Interface + mtu: 9194 + ip_address: 192.168.142.9/32 + flow_tracker: + hardware: FLOW-TRACKER +vxlan_interface: + vxlan1: + description: cv-pathfinder-edge4B_VTEP + vxlan: + udp_port: 4789 + source_interface: Dps1 + vrfs: + - name: default + vni: 1 + - name: IT + vni: 100 + - name: PROD + vni: 42 +flow_tracking: + hardware: + trackers: + - name: FLOW-TRACKER + record_export: + on_inactive_timeout: 70000 + on_interval: 300000 + exporters: + - name: CV-TELEMETRY + collector: + host: 127.0.0.1 + local_interface: Loopback0 + template_interval: 3600000 + shutdown: false +metadata: + cv_tags: + device_tags: + - name: Role + value: transit region + - name: Region + value: AVD_Land_West + - name: Zone + value: AVD_Land_West-ZONE + - name: Site + value: Site405 + interface_tags: + - interface: Ethernet1.42 + tags: + - name: Type + value: wan + - name: Carrier + value: Comcast + - interface: Ethernet1 + tags: + - name: Type + value: lan + - interface: Ethernet42 + tags: + - name: Type + value: lan + - interface: Ethernet43 + tags: + - name: Type + value: lan + cv_pathfinder: + role: transit region + ssl_profile: profileA + vtep_ip: 192.168.142.9 + region: AVD_Land_West + zone: AVD_Land_West-ZONE + site: Site405 + interfaces: + - name: Ethernet1.42 + carrier: Comcast + pathgroup: INET + pathfinders: + - vtep_ip: 192.168.144.1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml index 984e5a4bb62..b901cf77a1a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml @@ -51,6 +51,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4_sr_te: @@ -582,7 +583,11 @@ metadata: - name: Site404 id: 404 location: - address: Not Found + address: Atlantis + - name: Site405 + id: 405 + location: + address: El Dorado - name: Site422 id: 422 location: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml index 63068aabf2a..e1a7ea9fbd9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml @@ -64,10 +64,12 @@ router_bgp: remote_as: '65000' address_family_evpn: peer_groups: - - name: WAN-OVERLAY-PEERS - activate: true - name: WAN-RR-OVERLAY-PEERS activate: true + encapsulation: path-selection + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4_sr_te: @@ -103,11 +105,11 @@ router_bgp: - ip_address: 192.168.144.3 peer_group: WAN-RR-OVERLAY-PEERS peer: cv-pathfinder-pathfinder2 - description: cv-pathfinder-pathfinder2 + description: cv-pathfinder-pathfinder2_Dps1 - ip_address: 6.6.6.6 peer_group: WAN-RR-OVERLAY-PEERS peer: cv-pathfinder-pathfinder3 - description: cv-pathfinder-pathfinder3 + description: cv-pathfinder-pathfinder3_Dps1 vrfs: - name: default rd: 192.168.44.2:1 @@ -589,7 +591,11 @@ metadata: - name: Site404 id: 404 location: - address: Not Found + address: Atlantis + - name: Site405 + id: 405 + location: + address: El Dorado - name: Site422 id: 422 location: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml index ecbe1884a5d..ccec3bd5e3a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml @@ -64,10 +64,12 @@ router_bgp: remote_as: '65000' address_family_evpn: peer_groups: - - name: WAN-OVERLAY-PEERS - activate: true - name: WAN-RR-OVERLAY-PEERS activate: true + encapsulation: path-selection + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4_sr_te: @@ -103,11 +105,11 @@ router_bgp: - ip_address: 192.168.144.2 peer_group: WAN-RR-OVERLAY-PEERS peer: cv-pathfinder-pathfinder1 - description: cv-pathfinder-pathfinder1 + description: cv-pathfinder-pathfinder1_Dps1 - ip_address: 6.6.6.6 peer_group: WAN-RR-OVERLAY-PEERS peer: cv-pathfinder-pathfinder3 - description: cv-pathfinder-pathfinder3 + description: cv-pathfinder-pathfinder3_Dps1 vrfs: - name: default rd: 192.168.44.3:1 @@ -610,7 +612,11 @@ metadata: - name: Site404 id: 404 location: - address: Not Found + address: Atlantis + - name: Site405 + id: 405 + location: + address: El Dorado - name: Site422 id: 422 location: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml index e49c60005dc..dea32cf46f5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml @@ -51,7 +51,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.143.2 peer: cv-pathfinder-transit1B description: cv-pathfinder-transit1B @@ -153,6 +153,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -161,6 +162,7 @@ router_bgp: neighbors: - ip_address: 192.168.143.2 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -218,7 +220,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1 + description: P2P_site-ha-enabled-leaf1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -229,7 +231,7 @@ ethernet_interfaces: peer_interface: Ethernet1.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.1000_vrf_IT + description: P2P_site-ha-enabled-leaf1_Ethernet1.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -240,7 +242,7 @@ ethernet_interfaces: peer_interface: Ethernet1.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.142_vrf_PROD + description: P2P_site-ha-enabled-leaf1_Ethernet1.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -251,7 +253,7 @@ ethernet_interfaces: peer_interface: Ethernet1.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf1_Ethernet1.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml index 438501e74c3..78413253c4a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml @@ -51,7 +51,7 @@ router_bgp: - ip_address: 192.168.144.1 peer_group: WAN-OVERLAY-PEERS peer: cv-pathfinder-pathfinder - description: cv-pathfinder-pathfinder + description: cv-pathfinder-pathfinder_Dps1 - ip_address: 192.168.143.1 peer: cv-pathfinder-transit1A description: cv-pathfinder-transit1A @@ -153,6 +153,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -161,6 +162,7 @@ router_bgp: neighbors: - ip_address: 192.168.143.1 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -218,7 +220,7 @@ ethernet_interfaces: peer: site-ha-enabled-leaf1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2 + description: P2P_site-ha-enabled-leaf1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -229,7 +231,7 @@ ethernet_interfaces: peer_interface: Ethernet2.1000 peer_type: l3leaf vrf: IT - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.1000_vrf_IT + description: P2P_site-ha-enabled-leaf1_Ethernet2.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -240,7 +242,7 @@ ethernet_interfaces: peer_interface: Ethernet2.142 peer_type: l3leaf vrf: PROD - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.142_vrf_PROD + description: P2P_site-ha-enabled-leaf1_Ethernet2.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -251,7 +253,7 @@ ethernet_interfaces: peer_interface: Ethernet2.666 peer_type: l3leaf vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_SITE-HA-ENABLED-LEAF1_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_site-ha-enabled-leaf1_Ethernet2.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml index 27fa0bb9cd8..bc0e0b80768 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf1.yml @@ -46,7 +46,7 @@ router_bgp: - ip_address: 192.168.0.10 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine1 - description: downlink-pools-spine1 + description: downlink-pools-spine1_Loopback0 remote_as: '65000' address_family_evpn: peer_groups: @@ -77,7 +77,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet3 + description: P2P_downlink-pools-spine1_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -87,7 +87,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet4 + description: P2P_downlink-pools-spine1_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml index cb55425f864..2ce02e9a9ee 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf2.yml @@ -46,7 +46,7 @@ router_bgp: - ip_address: 192.168.0.20 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine2 - description: downlink-pools-spine2 + description: downlink-pools-spine2_Loopback0 remote_as: '65000' address_family_evpn: peer_groups: @@ -77,7 +77,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet3 + description: P2P_downlink-pools-spine2_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -87,7 +87,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet4 + description: P2P_downlink-pools-spine2_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml index 39234b15dcb..463bcc117fa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf3.yml @@ -56,12 +56,12 @@ router_bgp: - ip_address: 192.168.0.10 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine1 - description: downlink-pools-spine1 + description: downlink-pools-spine1_Loopback0 remote_as: '65000' - ip_address: 192.168.0.20 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine2 - description: downlink-pools-spine2 + description: downlink-pools-spine2_Loopback0 remote_as: '65000' address_family_evpn: peer_groups: @@ -92,7 +92,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet5 + description: P2P_downlink-pools-spine1_Ethernet5 shutdown: false mtu: 9214 switchport: @@ -102,7 +102,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet5 + description: P2P_downlink-pools-spine2_Ethernet5 shutdown: false mtu: 9214 switchport: @@ -112,7 +112,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet15 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet15 + description: P2P_downlink-pools-spine1_Ethernet15 shutdown: false mtu: 9214 switchport: @@ -122,7 +122,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet15 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet15 + description: P2P_downlink-pools-spine2_Ethernet15 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml index 8850650e2db..ff1ea6b4a2d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-l3leaf4.yml @@ -56,12 +56,12 @@ router_bgp: - ip_address: 192.168.0.10 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine1 - description: downlink-pools-spine1 + description: downlink-pools-spine1_Loopback0 remote_as: '65000' - ip_address: 192.168.0.20 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-spine2 - description: downlink-pools-spine2 + description: downlink-pools-spine2_Loopback0 remote_as: '65000' address_family_evpn: peer_groups: @@ -92,7 +92,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet6 + description: P2P_downlink-pools-spine1_Ethernet6 shutdown: false mtu: 9214 switchport: @@ -102,7 +102,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet6 + description: P2P_downlink-pools-spine2_Ethernet6 shutdown: false mtu: 9214 switchport: @@ -112,7 +112,7 @@ ethernet_interfaces: peer: downlink-pools-spine1 peer_interface: Ethernet16 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE1_Ethernet16 + description: P2P_downlink-pools-spine1_Ethernet16 shutdown: false mtu: 9214 switchport: @@ -122,7 +122,7 @@ ethernet_interfaces: peer: downlink-pools-spine2 peer_interface: Ethernet16 peer_type: spine - description: P2P_LINK_TO_DOWNLINK-POOLS-SPINE2_Ethernet16 + description: P2P_downlink-pools-spine2_Ethernet16 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml index 04d7a3c5a17..4b693661c67 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine1.yml @@ -67,17 +67,17 @@ router_bgp: - ip_address: 192.168.1.10 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf1 - description: downlink-pools-l3leaf1 + description: downlink-pools-l3leaf1_Loopback0 remote_as: '65009' - ip_address: 192.168.1.30 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf3 - description: downlink-pools-l3leaf3 + description: downlink-pools-l3leaf3_Loopback0 remote_as: '65029' - ip_address: 192.168.1.40 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf4 - description: downlink-pools-l3leaf4 + description: downlink-pools-l3leaf4_Loopback0 remote_as: '65039' address_family_evpn: peer_groups: @@ -110,7 +110,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF1_Ethernet1 + description: P2P_downlink-pools-l3leaf1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -120,7 +120,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF1_Ethernet2 + description: P2P_downlink-pools-l3leaf1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -130,7 +130,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf3 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet1 + description: P2P_downlink-pools-l3leaf3_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -140,7 +140,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf4 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet1 + description: P2P_downlink-pools-l3leaf4_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -150,7 +150,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf3 peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet3 + description: P2P_downlink-pools-l3leaf3_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -160,7 +160,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf4 peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet3 + description: P2P_downlink-pools-l3leaf4_Ethernet3 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml index 4263fd8c77e..97b4f2f658e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/downlink-pools-spine2.yml @@ -67,17 +67,17 @@ router_bgp: - ip_address: 192.168.1.20 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf2 - description: downlink-pools-l3leaf2 + description: downlink-pools-l3leaf2_Loopback0 remote_as: '65019' - ip_address: 192.168.1.30 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf3 - description: downlink-pools-l3leaf3 + description: downlink-pools-l3leaf3_Loopback0 remote_as: '65029' - ip_address: 192.168.1.40 peer_group: EVPN-OVERLAY-PEERS peer: downlink-pools-l3leaf4 - description: downlink-pools-l3leaf4 + description: downlink-pools-l3leaf4_Loopback0 remote_as: '65039' address_family_evpn: peer_groups: @@ -110,7 +110,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf2 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF2_Ethernet1 + description: P2P_downlink-pools-l3leaf2_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -120,7 +120,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf2 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF2_Ethernet2 + description: P2P_downlink-pools-l3leaf2_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -130,7 +130,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf3 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet2 + description: P2P_downlink-pools-l3leaf3_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -140,7 +140,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf4 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet2 + description: P2P_downlink-pools-l3leaf4_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -150,7 +150,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf3 peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF3_Ethernet4 + description: P2P_downlink-pools-l3leaf3_Ethernet4 shutdown: false mtu: 9214 switchport: @@ -160,7 +160,7 @@ ethernet_interfaces: peer: downlink-pools-l3leaf4 peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DOWNLINK-POOLS-L3LEAF4_Ethernet4 + description: P2P_downlink-pools-l3leaf4_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml index 9fe6cc4328d..9e81bf1783f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf1.yml @@ -54,7 +54,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: FLOW-TRACKING-TESTS-LEAF-MLAG_Po31 + description: flow-tracking-tests-leaf-mlag_Po31 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml index 49c8082c8a8..da5b5f031dd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-l2-leaf2.yml @@ -54,7 +54,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: FLOW-TRACKING-TESTS-LEAF-MLAG_Po32 + description: flow-tracking-tests-leaf-mlag_Po32 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml index 9a38fbc55cb..09fd5cf6427 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf1.yml @@ -44,12 +44,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine1 - description: flow-tracking-tests-spine1 + description: flow-tracking-tests-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine2 - description: flow-tracking-tests-spine2 + description: flow-tracking-tests-spine2_Loopback0 remote_as: '65200' address_family_evpn: peer_groups: @@ -124,7 +124,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet1 + description: P2P_flow-tracking-tests-spine1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -136,7 +136,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet2 + description: P2P_flow-tracking-tests-spine2_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml index baf8253c798..63dc75bef22 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf2.yml @@ -44,12 +44,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine1 - description: flow-tracking-tests-spine1 + description: flow-tracking-tests-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine2 - description: flow-tracking-tests-spine2 + description: flow-tracking-tests-spine2_Loopback0 remote_as: '65200' address_family_evpn: peer_groups: @@ -124,7 +124,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet3 + description: P2P_flow-tracking-tests-spine1_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -134,7 +134,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet4 + description: P2P_flow-tracking-tests-spine2_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml index 263dbbd8edd..e2655327494 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf3.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.105 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: flow-tracking-tests-leaf4 - description: flow-tracking-tests-leaf4 + description: flow-tracking-tests-leaf4_Vlan4093 - ip_address: 10.254.2.16 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,12 +55,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine1 - description: flow-tracking-tests-spine1 + description: flow-tracking-tests-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine2 - description: flow-tracking-tests-spine2 + description: flow-tracking-tests-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -88,7 +88,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.105 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: flow-tracking-tests-leaf4 + description: flow-tracking-tests-leaf4_Vlan3000 vlans: - id: 11 tenant: FLOW_TRACKING @@ -142,19 +142,19 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: FLOW_TRACKING - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: FLOW_TRACKING @@ -163,12 +163,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.104/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -182,7 +182,7 @@ vlan_interfaces: tenant: FLOW_TRACKING type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.104/31 @@ -280,7 +280,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet5 + description: P2P_flow-tracking-tests-spine1_Ethernet5 shutdown: false mtu: 9214 switchport: @@ -292,7 +292,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet6 + description: P2P_flow-tracking-tests-spine2_Ethernet6 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml index e51a9338043..9fd10684a97 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-leaf4.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.104 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: flow-tracking-tests-leaf3 - description: flow-tracking-tests-leaf3 + description: flow-tracking-tests-leaf3_Vlan4093 - ip_address: 10.254.2.20 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,12 +55,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine1 - description: flow-tracking-tests-spine1 + description: flow-tracking-tests-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-spine2 - description: flow-tracking-tests-spine2 + description: flow-tracking-tests-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -88,7 +88,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.104 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: flow-tracking-tests-leaf3 + description: flow-tracking-tests-leaf3_Vlan3000 vlans: - id: 11 tenant: FLOW_TRACKING @@ -142,19 +142,19 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: FLOW_TRACKING - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: FLOW_TRACKING @@ -163,12 +163,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.105/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -182,7 +182,7 @@ vlan_interfaces: tenant: FLOW_TRACKING type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.105/31 @@ -280,7 +280,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE1_Ethernet7 + description: P2P_flow-tracking-tests-spine1_Ethernet7 shutdown: false mtu: 9214 switchport: @@ -292,7 +292,7 @@ ethernet_interfaces: peer: flow-tracking-tests-spine2 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-SPINE2_Ethernet8 + description: P2P_flow-tracking-tests-spine2_Ethernet8 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml index c7ccd5a3772..4be4bbe7da3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine1.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.254.1.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf1 - description: flow-tracking-tests-leaf1 + description: flow-tracking-tests-leaf1_Loopback0 remote_as: '65101' - ip_address: 10.254.1.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf2 - description: flow-tracking-tests-leaf2 + description: flow-tracking-tests-leaf2_Loopback0 remote_as: '65102' - ip_address: 10.254.1.5 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf3 - description: flow-tracking-tests-leaf3 + description: flow-tracking-tests-leaf3_Loopback0 remote_as: '65105' - ip_address: 10.254.1.6 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf4 - description: flow-tracking-tests-leaf4 + description: flow-tracking-tests-leaf4_Loopback0 remote_as: '65105' address_family_evpn: peer_groups: @@ -117,7 +117,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF1_Ethernet1 + description: P2P_flow-tracking-tests-leaf1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -129,7 +129,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf2 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF2_Ethernet1 + description: P2P_flow-tracking-tests-leaf2_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -141,7 +141,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf3 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF3_Ethernet1 + description: P2P_flow-tracking-tests-leaf3_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -153,7 +153,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf4 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF4_Ethernet1 + description: P2P_flow-tracking-tests-leaf4_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -165,86 +165,86 @@ ethernet_interfaces: peer: flow-tracking-tests-spine2 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER + description: P2P_flow-tracking-tests-spine2_Ethernet9 - name: Ethernet10 peer: flow-tracking-tests-spine2 peer_interface: Ethernet10 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet10 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER-1 + description: P2P_flow-tracking-tests-spine2_Ethernet10 - name: Ethernet11 peer: flow-tracking-tests-spine2 peer_interface: Ethernet11 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet11 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine2_Ethernet11 - name: Ethernet12 peer: flow-tracking-tests-spine2 peer_interface: Ethernet12 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet12 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER + description: P2P_flow-tracking-tests-spine2_Ethernet12 - name: Ethernet13 peer: flow-tracking-tests-spine2 peer_interface: Ethernet13 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet13 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER + description: P2P_flow-tracking-tests-spine2_Ethernet13 - name: Ethernet14 peer: flow-tracking-tests-spine2 peer_interface: Ethernet14 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet14 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER-1 + description: P2P_flow-tracking-tests-spine2_Ethernet14 - name: Ethernet15 peer: flow-tracking-tests-spine2 peer_interface: Ethernet15 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet15 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine2_Ethernet15 - name: Ethernet16 peer: flow-tracking-tests-spine2 peer_interface: Ethernet16 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine2_Ethernet16 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: sampled: FLOW-TRACKER + description: P2P_flow-tracking-tests-spine2_Ethernet16 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml index bf1e6f252bc..e4d8fcb453c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/flow-tracking-tests-spine2.yml @@ -57,22 +57,22 @@ router_bgp: - ip_address: 10.254.1.1 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf1 - description: flow-tracking-tests-leaf1 + description: flow-tracking-tests-leaf1_Loopback0 remote_as: '65101' - ip_address: 10.254.1.2 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf2 - description: flow-tracking-tests-leaf2 + description: flow-tracking-tests-leaf2_Loopback0 remote_as: '65102' - ip_address: 10.254.1.5 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf3 - description: flow-tracking-tests-leaf3 + description: flow-tracking-tests-leaf3_Loopback0 remote_as: '65105' - ip_address: 10.254.1.6 peer_group: EVPN-OVERLAY-PEERS peer: flow-tracking-tests-leaf4 - description: flow-tracking-tests-leaf4 + description: flow-tracking-tests-leaf4_Loopback0 remote_as: '65105' address_family_evpn: peer_groups: @@ -117,7 +117,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF1_Ethernet2 + description: P2P_flow-tracking-tests-leaf1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -129,7 +129,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf2 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF2_Ethernet2 + description: P2P_flow-tracking-tests-leaf2_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -141,7 +141,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf3 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF3_Ethernet2 + description: P2P_flow-tracking-tests-leaf3_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -153,7 +153,7 @@ ethernet_interfaces: peer: flow-tracking-tests-leaf4 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_FLOW-TRACKING-TESTS-LEAF4_Ethernet2 + description: P2P_flow-tracking-tests-leaf4_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -165,82 +165,82 @@ ethernet_interfaces: peer: flow-tracking-tests-spine1 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: hardware: FLOW-TRACKER-2 + description: P2P_flow-tracking-tests-spine1_Ethernet9 - name: Ethernet10 peer: flow-tracking-tests-spine1 peer_interface: Ethernet10 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet10 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: hardware: FLOW-TRACKER-1 + description: P2P_flow-tracking-tests-spine1_Ethernet10 - name: Ethernet11 peer: flow-tracking-tests-spine1 peer_interface: Ethernet11 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet11 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine1_Ethernet11 - name: Ethernet12 peer: flow-tracking-tests-spine1 peer_interface: Ethernet12 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet12 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine1_Ethernet12 - name: Ethernet13 peer: flow-tracking-tests-spine1 peer_interface: Ethernet13 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet13 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: hardware: FLOW-TRACKER-2 + description: P2P_flow-tracking-tests-spine1_Ethernet13 - name: Ethernet14 peer: flow-tracking-tests-spine1 peer_interface: Ethernet14 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet14 switchport: enabled: false shutdown: false mtu: 9214 flow_tracker: hardware: FLOW-TRACKER-1 + description: P2P_flow-tracking-tests-spine1_Ethernet14 - name: Ethernet15 peer: flow-tracking-tests-spine1 peer_interface: Ethernet15 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet15 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine1_Ethernet15 - name: Ethernet16 peer: flow-tracking-tests-spine1 peer_interface: Ethernet16 peer_type: spine - description: P2P_LINK_TO_flow-tracking-tests-spine1_Ethernet16 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_flow-tracking-tests-spine1_Ethernet16 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml index 5c10af26ec0..5d0178f6d28 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-ips.yml @@ -40,7 +40,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: INBAND-MGMT-PARENTS-DUALSTACK_Po25 + description: inband-mgmt-parents-dualstack_Po25 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml index b31fc666a48..992cd549819 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-dualstack-subnets.yml @@ -40,7 +40,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: INBAND-MGMT-PARENTS-DUALSTACK_Po24 + description: inband-mgmt-parents-dualstack_Po24 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml index 34e6ccf9ed0..cb7196eff7b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only-vrf.yml @@ -40,7 +40,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: INBAND-MGMT-PARENTS-IPV6_Po27 + description: inband-mgmt-parents-ipv6_Po27 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml index 5333cbcd97a..a2cef057b02 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-ipv6-only.yml @@ -40,7 +40,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: INBAND-MGMT-PARENTS-IPV6_Po26 + description: inband-mgmt-parents-ipv6_Po26 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml index 013cbd2a822..cf3c9722b50 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-a.yml @@ -24,7 +24,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 101 @@ -32,7 +32,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml index 59097ca8a76..5fa1e33a8e9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-mlag-b.yml @@ -24,7 +24,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 101 @@ -32,7 +32,7 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml index 72e40d0860a..185018ab6cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack1.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 100.64.1.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: inband-mgmt-parent-dualstack2 - description: inband-mgmt-parent-dualstack2 + description: inband-mgmt-parent-dualstack2_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -70,7 +70,7 @@ router_bgp: neighbors: - ip_address: 100.64.1.5 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: inband-mgmt-parent-dualstack2 + description: inband-mgmt-parent-dualstack2_Vlan3000 updates: wait_install: true service_routing_protocols_model: multi-agent @@ -102,19 +102,19 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 105 name: Inband_management_vlan_ipv6 tenant: INBAND_MGMT_TESTS - id: 3000 - name: MLAG_iBGP_INBANDMGMT + name: MLAG_L3_VRF_INBANDMGMT trunk_groups: - MLAG tenant: INBAND_MGMT_TESTS @@ -123,12 +123,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 100.64.1.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -149,7 +149,7 @@ vlan_interfaces: tenant: INBAND_MGMT_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf INBANDMGMT' + description: MLAG_L3_VRF_INBANDMGMT vrf: INBANDMGMT mtu: 9214 ip_address: 100.64.1.4/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml index 3a83af82479..91b872c68d2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-dualstack2.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 100.64.1.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: inband-mgmt-parent-dualstack1 - description: inband-mgmt-parent-dualstack1 + description: inband-mgmt-parent-dualstack1_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -70,7 +70,7 @@ router_bgp: neighbors: - ip_address: 100.64.1.4 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: inband-mgmt-parent-dualstack1 + description: inband-mgmt-parent-dualstack1_Vlan3000 updates: wait_install: true service_routing_protocols_model: multi-agent @@ -102,19 +102,19 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 105 name: Inband_management_vlan_ipv6 tenant: INBAND_MGMT_TESTS - id: 3000 - name: MLAG_iBGP_INBANDMGMT + name: MLAG_L3_VRF_INBANDMGMT trunk_groups: - MLAG tenant: INBAND_MGMT_TESTS @@ -123,12 +123,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 100.64.1.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -149,7 +149,7 @@ vlan_interfaces: tenant: INBAND_MGMT_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf INBANDMGMT' + description: MLAG_L3_VRF_INBANDMGMT vrf: INBANDMGMT mtu: 9214 ip_address: 100.64.1.5/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml index fff21f2eec4..06f65858355 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-1.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 100.64.1.9 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: inband-mgmt-parent-ipv6-2 - description: inband-mgmt-parent-ipv6-2 + description: inband-mgmt-parent-ipv6-2_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -77,12 +77,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 106 @@ -93,12 +93,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 100.64.1.8/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml index 637d420b3a2..e4a70a93e7b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-ipv6-2.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 100.64.1.8 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: inband-mgmt-parent-ipv6-1 - description: inband-mgmt-parent-ipv6-1 + description: inband-mgmt-parent-ipv6-1_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -77,12 +77,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 106 @@ -93,12 +93,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 100.64.1.9/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml index a20386f333c..65f76b28344 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent-vrf.yml @@ -166,7 +166,7 @@ port_channel_interfaces: allowed_vlan: '103' shutdown: false - name: Port-Channel101 - description: INBAND-MGMT-MLAG-TEST_Po1 + description: inband-mgmt-mlag-test_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml index 2931f49972b..4d6d3e7b54e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/inband-mgmt-parent.yml @@ -167,7 +167,7 @@ port_channel_interfaces: allowed_vlan: '103' shutdown: false - name: Port-Channel101 - description: INBAND-MGMT-MLAG-TEST_Po1 + description: inband-mgmt-mlag-test_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml index c10d427eccc..d2a037bad00 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml @@ -93,7 +93,6 @@ ethernet_interfaces: peer: peer1 peer_interface: ethernet1 peer_type: other - description: P2P_LINK_TO_peer1_ethernet1 switchport: enabled: false shutdown: false @@ -105,6 +104,7 @@ ethernet_interfaces: ip_address: 192.168.0.0/31 mac_security: profile: TEST-MACSEC-PROFILE + description: P2P_peer1_ethernet1 speed: forced 10000full ptp: enable: true @@ -115,87 +115,87 @@ ethernet_interfaces: peer: peer2 peer_interface: ethernet2 peer_type: other - description: P2P_LINK_TO_peer2_ethernet2 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.0.2/31 ipv6_enable: true + description: P2P_peer2_ethernet2 - name: ethernet3 peer: peer3 peer_interface: ethernet3 peer_type: other - description: P2P_LINK_TO_peer3_ethernet3 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.0.4/31 + description: P2P_peer3_ethernet3 - name: ethernet4 peer: peer4 peer_interface: ethernet4 peer_type: other - description: Custom description on l3_edge_bgp eth4 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.0.6/31 + description: Custom description on l3_edge_bgp eth4 - name: Ethernet5 peer: peer5 peer_interface: Ethernet5 peer_type: other - description: P2P_LINK_TO_peer5_Ethernet5 shutdown: false channel_group: id: 5 mode: active + description: P2P_peer5_Ethernet5 - name: Ethernet6 peer: peer5 peer_interface: Ethernet6 peer_type: other - description: P2P_LINK_TO_peer5_Ethernet6 shutdown: false channel_group: id: 5 mode: active + description: P2P_peer5_Ethernet6 - name: Ethernet7 peer: peer6 peer_interface: Ethernet7 peer_type: other - description: P2P_LINK_TO_peer6_Ethernet7 shutdown: false channel_group: id: 7 mode: active + description: P2P_peer6_Ethernet7 - name: Ethernet8 peer: peer6 peer_interface: Ethernet8 peer_type: other - description: P2P_LINK_TO_peer6_Ethernet8 shutdown: false channel_group: id: 7 mode: active + description: P2P_peer6_Ethernet8 port_channel_interfaces: - name: Port-Channel5 peer: peer5 peer_interface: Port-Channel5 peer_type: other - description: P2P_LINK_TO_peer5_Port-Channel5 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.0.8/31 + description: P2P_peer5_Port-Channel5 - name: Port-Channel7 peer: peer6 peer_interface: Port-Channel7 peer_type: other - description: P2P_LINK_TO_peer6_Port-Channel7 switchport: enabled: false shutdown: false mtu: 9214 ip_address: 192.168.0.10/31 + description: P2P_peer6_Port-Channel7 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml index 5c49a9f9bdd..252dff77f71 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml @@ -43,7 +43,6 @@ ethernet_interfaces: peer: peer1 peer_interface: ethernet1 peer_type: other - description: P2P_LINK_TO_peer1_ethernet1 switchport: enabled: false shutdown: false @@ -52,6 +51,7 @@ ethernet_interfaces: ip_address: 192.168.0.0/31 mac_security: profile: TEST-MACSEC-PROFILE + description: P2P_peer1_ethernet1 speed: forced 10000full ptp: enable: true @@ -59,7 +59,6 @@ ethernet_interfaces: peer: peer2 peer_interface: ethernet2 peer_type: other - description: P2P_LINK_TO_peer2_ethernet2 switchport: enabled: false shutdown: false @@ -73,11 +72,11 @@ ethernet_interfaces: isis_circuit_type: level-2 isis_authentication_mode: md5 isis_authentication_key: $1c$sTNAlR6rKSw= + description: P2P_peer2_ethernet2 - name: ethernet3 peer: peer3 peer_interface: ethernet3 peer_type: other - description: P2P_LINK_TO_peer3_ethernet3 switchport: enabled: false shutdown: false @@ -89,11 +88,11 @@ ethernet_interfaces: isis_network_point_to_point: true isis_hello_padding: true isis_circuit_type: level-2 + description: P2P_peer3_ethernet3 - name: ethernet4 peer: peer4 peer_interface: ethernet4 peer_type: other - description: P2P_LINK_TO_peer4_ethernet4 switchport: enabled: false shutdown: false @@ -105,3 +104,4 @@ ethernet_interfaces: isis_network_point_to_point: true isis_hello_padding: true isis_circuit_type: level-2 + description: P2P_peer4_ethernet4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml index a846c38036b..ee76f68ba48 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_multicast.yml @@ -46,7 +46,6 @@ ethernet_interfaces: peer: peer1 peer_interface: ethernet1 peer_type: other - description: P2P_LINK_TO_peer1_ethernet1 switchport: enabled: false shutdown: false @@ -54,11 +53,11 @@ ethernet_interfaces: ip_address: 192.168.0.4/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_peer1_ethernet1 - name: ethernet2 peer: peer2 peer_interface: ethernet2 peer_type: other - description: P2P_LINK_TO_peer2_ethernet2 switchport: enabled: false shutdown: false @@ -69,3 +68,4 @@ ethernet_interfaces: sparse_mode: true ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_peer2_ethernet2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml index 919ab86efce..703e8a7d313 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml @@ -44,7 +44,6 @@ ethernet_interfaces: peer: peer1 peer_interface: ethernet1 peer_type: other - description: P2P_LINK_TO_peer1_ethernet1 switchport: enabled: false shutdown: false @@ -53,6 +52,7 @@ ethernet_interfaces: ip_address: 192.168.0.0/31 mac_security: profile: TEST-MACSEC-PROFILE + description: P2P_peer1_ethernet1 speed: forced 10000full ptp: enable: true @@ -60,7 +60,6 @@ ethernet_interfaces: peer: peer2 peer_interface: ethernet2 peer_type: other - description: P2P_LINK_TO_peer2_ethernet2 switchport: enabled: false shutdown: false @@ -68,11 +67,11 @@ ethernet_interfaces: ip_address: 192.168.0.2/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_peer2_ethernet2 - name: ethernet3 peer: peer3 peer_interface: ethernet3 peer_type: other - description: P2P_LINK_TO_peer3_ethernet3 switchport: enabled: false shutdown: false @@ -80,11 +79,11 @@ ethernet_interfaces: ip_address: 192.168.0.4/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_peer3_ethernet3 - name: ethernet4 peer: peer4 peer_interface: ethernet4 peer_type: other - description: P2P_LINK_TO_peer4_ethernet4 switchport: enabled: false shutdown: false @@ -92,3 +91,4 @@ ethernet_interfaces: ip_address: 192.168.0.6/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 + description: P2P_peer4_ethernet4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge-no-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge-no-default-policy.yml index d589cbea3c9..e3f7b8dcf38 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge-no-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge-no-default-policy.yml @@ -31,6 +31,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: @@ -50,7 +51,7 @@ router_bgp: - ip_address: 2.2.2.2 peer_group: WAN-OVERLAY-PEERS peer: legacy-autovpn-rr3 - description: legacy-autovpn-rr3 + description: legacy-autovpn-rr3_Dps1 vrfs: - name: default rd: 192.168.30.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge.yml index a4aa7108157..de36a1c6a9b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-edge.yml @@ -31,6 +31,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: @@ -50,11 +51,11 @@ router_bgp: - ip_address: 192.168.131.1 peer_group: WAN-OVERLAY-PEERS peer: legacy-autovpn-rr1 - description: legacy-autovpn-rr1 + description: legacy-autovpn-rr1_Dps1 - ip_address: 192.168.131.2 peer_group: WAN-OVERLAY-PEERS peer: legacy-autovpn-rr2 - description: legacy-autovpn-rr2 + description: legacy-autovpn-rr2_Dps1 vrfs: - name: default rd: 192.168.30.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr1.yml index 2146a18ca1c..12bcfadc05a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr1.yml @@ -48,10 +48,12 @@ router_bgp: route_reflector_client: true address_family_evpn: peer_groups: - - name: WAN-OVERLAY-PEERS - activate: true - name: WAN-RR-OVERLAY-PEERS activate: true + encapsulation: path-selection + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4: @@ -75,7 +77,7 @@ router_bgp: - ip_address: 192.168.131.2 peer_group: WAN-RR-OVERLAY-PEERS peer: legacy-autovpn-rr2 - description: legacy-autovpn-rr2 + description: legacy-autovpn-rr2_Dps1 vrfs: - name: default rd: 192.168.31.1:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr2.yml index 93cad349869..de2248280f2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/legacy-autovpn-rr2.yml @@ -48,10 +48,12 @@ router_bgp: route_reflector_client: true address_family_evpn: peer_groups: - - name: WAN-OVERLAY-PEERS - activate: true - name: WAN-RR-OVERLAY-PEERS activate: true + encapsulation: path-selection + - name: WAN-OVERLAY-PEERS + activate: true + encapsulation: path-selection next_hop: resolution_disabled: true address_family_ipv4: @@ -75,7 +77,7 @@ router_bgp: - ip_address: 192.168.131.1 peer_group: WAN-RR-OVERLAY-PEERS peer: legacy-autovpn-rr1 - description: legacy-autovpn-rr1 + description: legacy-autovpn-rr1_Dps1 vrfs: - name: default rd: 192.168.31.2:1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests-2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests-2.yml index 13fc75bdfb6..ed8d045069c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests-2.yml @@ -28,7 +28,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -39,7 +39,7 @@ vlans: tenant: TEST vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests.1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests.1.yml index efc1fe0cf53..ef92ecdd31a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests.1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests.1.yml @@ -28,7 +28,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -42,7 +42,7 @@ vlans: tenant: TEST vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/only-connected-endpoints.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/only-connected-endpoints.yml new file mode 100644 index 00000000000..9cbdee25b34 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/only-connected-endpoints.yml @@ -0,0 +1,175 @@ +hostname: only-connected-endpoints +is_deployed: null +service_routing_protocols_model: null +vlan_internal_order: null +aaa_root: null +config_end: null +enable_password: null +transceiver_qsfp_default_mode_4x10: null +spanning_tree: null +vrfs: null +management_api_http: null +ethernet_interfaces: +- name: Ethernet20 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet21 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet22 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet23 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet24 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet25 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet26 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet27 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet28 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet29 + peer: Network Port + peer_type: network_port + port_profile: MY_PROFILE + description: Network Port + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet12 + peer: TEST_SERVER_01 + peer_interface: Nic1 + peer_type: server + port_profile: MY_PROFILE + description: SERVER_TEST_SERVER_01_Nic1 + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 +- name: Ethernet1 + peer: TEST_SERVER_01 + peer_interface: Nic1 + peer_type: server + port_profile: MY_PROFILE + description: SERVER_TEST_SERVER_01_Nic1 + shutdown: false + channel_group: + id: 1 + mode: active +- name: Ethernet2 + peer: TEST_SERVER_01 + peer_interface: Nic2 + peer_type: server + port_profile: MY_PROFILE + description: SERVER_TEST_SERVER_01_Nic2 + shutdown: false + channel_group: + id: 1 + mode: active +port_channel_interfaces: +- name: Port-Channel1 + description: SERVER_TEST_SERVER_01 + shutdown: false + switchport: + enabled: true + mode: trunk + trunk: + allowed_vlan: 1-100 + native_vlan: 1000 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf1-ptp-disabled.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf1-ptp-disabled.yml index dcaf56c6e56..3dc4bc9aabe 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf1-ptp-disabled.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf1-ptp-disabled.yml @@ -49,7 +49,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: PTP-TEST-LEAF_Po11 + description: ptp-test-leaf_Po11 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.yml index 3c73a437c76..f2e6f1691cc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled-uplink-disabled.yml @@ -67,7 +67,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: PTP-TEST-LEAF_Po14 + description: ptp-test-leaf_Po14 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled.yml index 0cafb8d25c1..f62df91f0e0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf2-ptp-enabled.yml @@ -67,7 +67,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: PTP-TEST-LEAF_Po12 + description: ptp-test-leaf_Po12 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml index 3a53a59be70..4670b43537c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: ptp-tests-leaf2 - description: ptp-tests-leaf2 + description: ptp-tests-leaf2_Vlan4093 - ip_address: 10.254.2.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,7 +55,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: ptp-tests-spine1 - description: ptp-tests-spine1 + description: ptp-tests-spine1_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -82,7 +82,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: ptp-tests-leaf2 + description: ptp-tests-leaf2_Vlan3000 vlans: - id: 11 tenant: PTP @@ -155,30 +155,30 @@ ptp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: PTP - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: PTP vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.96/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -193,7 +193,7 @@ vlan_interfaces: tenant: PTP type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.96/31 @@ -294,7 +294,7 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet1 + description: P2P_ptp-tests-spine1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -313,7 +313,7 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet2 + description: P2P_ptp-tests-spine1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml index 3f0190a3b5c..6545bd33143 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: ptp-tests-leaf1 - description: ptp-tests-leaf1 + description: ptp-tests-leaf1_Vlan4093 - ip_address: 10.254.2.4 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,7 +55,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: ptp-tests-spine1 - description: ptp-tests-spine1 + description: ptp-tests-spine1_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -82,7 +82,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: ptp-tests-leaf1 + description: ptp-tests-leaf1_Vlan3000 vlans: - id: 11 tenant: PTP @@ -166,30 +166,30 @@ ptp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: PTP - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: PTP vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.97/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -204,7 +204,7 @@ vlan_interfaces: tenant: PTP type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.97/31 @@ -305,7 +305,7 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet3 + description: P2P_ptp-tests-spine1_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -324,7 +324,7 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet4 + description: P2P_ptp-tests-spine1_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml index b309a1596a8..d6fc62a90f6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml @@ -57,12 +57,12 @@ router_bgp: - ip_address: 10.254.1.1 peer_group: EVPN-OVERLAY-PEERS peer: ptp-tests-leaf1 - description: ptp-tests-leaf1 + description: ptp-tests-leaf1_Loopback0 remote_as: '65101' - ip_address: 10.254.1.2 peer_group: EVPN-OVERLAY-PEERS peer: ptp-tests-leaf2 - description: ptp-tests-leaf2 + description: ptp-tests-leaf2_Loopback0 remote_as: '65102' address_family_evpn: peer_groups: @@ -126,7 +126,7 @@ ethernet_interfaces: peer: ptp-tests-leaf1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_PTP-TESTS-LEAF1_Ethernet1 + description: P2P_ptp-tests-leaf1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -145,7 +145,7 @@ ethernet_interfaces: peer: ptp-tests-leaf1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_PTP-TESTS-LEAF1_Ethernet2 + description: P2P_ptp-tests-leaf1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -164,7 +164,7 @@ ethernet_interfaces: peer: ptp-tests-leaf2 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_PTP-TESTS-LEAF2_Ethernet1 + description: P2P_ptp-tests-leaf2_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -183,7 +183,7 @@ ethernet_interfaces: peer: ptp-tests-leaf2 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_PTP-TESTS-LEAF2_Ethernet2 + description: P2P_ptp-tests-leaf2_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -202,11 +202,11 @@ ethernet_interfaces: peer: ptp-tests-spine2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine2_Ethernet6 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine2_Ethernet6 ptp: announce: interval: 0 @@ -220,11 +220,11 @@ ethernet_interfaces: peer: ptp-tests-spine2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine2_Ethernet7 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine2_Ethernet7 ptp: announce: interval: 0 @@ -238,11 +238,11 @@ ethernet_interfaces: peer: ptp-tests-spine2 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine2_Ethernet8 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine2_Ethernet8 ptp: announce: interval: 0 @@ -256,11 +256,11 @@ ethernet_interfaces: peer: ptp-tests-spine2 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine2_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine2_Ethernet9 ptp: announce: interval: 0 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml index ac2bbb79895..824463c86c5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml @@ -130,11 +130,11 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine1_Ethernet6 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine1_Ethernet6 ptp: announce: interval: 0 @@ -148,11 +148,11 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine1_Ethernet7 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine1_Ethernet7 ptp: announce: interval: 0 @@ -166,11 +166,11 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine1_Ethernet8 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine1_Ethernet8 ptp: announce: interval: 0 @@ -184,11 +184,11 @@ ethernet_interfaces: peer: ptp-tests-spine1 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_ptp-tests-spine1_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 + description: P2P_ptp-tests-spine1_Ethernet9 ptp: announce: interval: 0 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf1.yml index 7b27771daec..a4ecad6a0ed 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf1.yml @@ -54,7 +54,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: SFLOW-TESTS-LEAF-MLAG_Po16 + description: sflow-tests-leaf-mlag_Po16 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf2.yml index 9785228e392..44df6706277 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-l2-leaf2.yml @@ -54,7 +54,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: SFLOW-TESTS-LEAF-MLAG_Po17 + description: sflow-tests-leaf-mlag_Po17 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml index fb66b53850e..fdc390321d1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-spine1 - description: sflow-tests-spine1 + description: sflow-tests-spine1_Loopback0 remote_as: '65200' address_family_evpn: peer_groups: @@ -119,7 +119,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet1 + description: P2P_sflow-tests-spine1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -131,7 +131,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet2 + description: P2P_sflow-tests-spine1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml index 101cf234541..c27ef639c50 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf2.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-spine1 - description: sflow-tests-spine1 + description: sflow-tests-spine1_Loopback0 remote_as: '65200' address_family_evpn: peer_groups: @@ -119,7 +119,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet3 + description: P2P_sflow-tests-spine1_Ethernet3 shutdown: false mtu: 9214 switchport: @@ -131,7 +131,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet4 + description: P2P_sflow-tests-spine1_Ethernet4 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml index ebf663e2069..9c4bc1fe8bd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf3.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.105 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: sflow-tests-leaf4 - description: sflow-tests-leaf4 + description: sflow-tests-leaf4_Vlan4093 - ip_address: 10.254.2.16 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,7 +55,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-spine1 - description: sflow-tests-spine1 + description: sflow-tests-spine1_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -83,7 +83,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.105 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: sflow-tests-leaf4 + description: sflow-tests-leaf4_Vlan3000 vlans: - id: 11 tenant: SFLOW @@ -137,19 +137,19 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: SFLOW - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: SFLOW @@ -158,12 +158,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.104/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -177,7 +177,7 @@ vlan_interfaces: tenant: SFLOW type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.104/31 @@ -273,7 +273,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet5 + description: P2P_sflow-tests-spine1_Ethernet5 shutdown: false mtu: 9214 switchport: @@ -285,7 +285,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet6 + description: P2P_sflow-tests-spine1_Ethernet6 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml index 6b1fa1c7c2f..a6843574b64 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf4.yml @@ -41,7 +41,7 @@ router_bgp: - ip_address: 10.254.1.104 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: sflow-tests-leaf3 - description: sflow-tests-leaf3 + description: sflow-tests-leaf3_Vlan4093 - ip_address: 10.254.2.20 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -55,7 +55,7 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-spine1 - description: sflow-tests-spine1 + description: sflow-tests-spine1_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -83,7 +83,7 @@ router_bgp: neighbors: - ip_address: 10.254.1.104 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: sflow-tests-leaf3 + description: sflow-tests-leaf3_Vlan3000 vlans: - id: 11 tenant: SFLOW @@ -137,19 +137,19 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 name: VLAN11 tenant: SFLOW - id: 3000 - name: MLAG_iBGP_VRF1 + name: MLAG_L3_VRF_VRF1 trunk_groups: - MLAG tenant: SFLOW @@ -158,12 +158,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.254.1.105/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -177,7 +177,7 @@ vlan_interfaces: tenant: SFLOW type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF1' + description: MLAG_L3_VRF_VRF1 vrf: VRF1 mtu: 9214 ip_address: 10.254.1.105/31 @@ -273,7 +273,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet7 + description: P2P_sflow-tests-spine1_Ethernet7 shutdown: false mtu: 9214 switchport: @@ -285,7 +285,7 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet8 peer_type: spine - description: P2P_LINK_TO_SFLOW-TESTS-SPINE1_Ethernet8 + description: P2P_sflow-tests-spine1_Ethernet8 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml index 53ae17c4843..9392e265122 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine1.yml @@ -77,22 +77,22 @@ router_bgp: - ip_address: 10.254.1.1 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-leaf1 - description: sflow-tests-leaf1 + description: sflow-tests-leaf1_Loopback0 remote_as: '65101' - ip_address: 10.254.1.2 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-leaf2 - description: sflow-tests-leaf2 + description: sflow-tests-leaf2_Loopback0 remote_as: '65102' - ip_address: 10.254.1.5 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-leaf3 - description: sflow-tests-leaf3 + description: sflow-tests-leaf3_Loopback0 remote_as: '65105' - ip_address: 10.254.1.6 peer_group: EVPN-OVERLAY-PEERS peer: sflow-tests-leaf4 - description: sflow-tests-leaf4 + description: sflow-tests-leaf4_Loopback0 remote_as: '65105' address_family_evpn: peer_groups: @@ -137,7 +137,7 @@ ethernet_interfaces: peer: sflow-tests-leaf1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF1_Ethernet1 + description: P2P_sflow-tests-leaf1_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -149,7 +149,7 @@ ethernet_interfaces: peer: sflow-tests-leaf1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF1_Ethernet2 + description: P2P_sflow-tests-leaf1_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -161,7 +161,7 @@ ethernet_interfaces: peer: sflow-tests-leaf2 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF2_Ethernet1 + description: P2P_sflow-tests-leaf2_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -173,7 +173,7 @@ ethernet_interfaces: peer: sflow-tests-leaf2 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF2_Ethernet2 + description: P2P_sflow-tests-leaf2_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -185,7 +185,7 @@ ethernet_interfaces: peer: sflow-tests-leaf3 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF3_Ethernet1 + description: P2P_sflow-tests-leaf3_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: sflow-tests-leaf3 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF3_Ethernet2 + description: P2P_sflow-tests-leaf3_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -209,7 +209,7 @@ ethernet_interfaces: peer: sflow-tests-leaf4 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF4_Ethernet1 + description: P2P_sflow-tests-leaf4_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -221,7 +221,7 @@ ethernet_interfaces: peer: sflow-tests-leaf4 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_SFLOW-TESTS-LEAF4_Ethernet2 + description: P2P_sflow-tests-leaf4_Ethernet2 shutdown: false mtu: 9214 switchport: @@ -233,68 +233,68 @@ ethernet_interfaces: peer: sflow-tests-spine2 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine2_Ethernet9 - name: Ethernet10 peer: sflow-tests-spine2 peer_interface: Ethernet10 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet10 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: false + description: P2P_sflow-tests-spine2_Ethernet10 - name: Ethernet11 peer: sflow-tests-spine2 peer_interface: Ethernet11 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet11 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine2_Ethernet11 - name: Ethernet12 peer: sflow-tests-spine2 peer_interface: Ethernet12 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet12 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine2_Ethernet12 - name: Ethernet13 peer: sflow-tests-spine2 peer_interface: Ethernet13 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet13 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: false + description: P2P_sflow-tests-spine2_Ethernet13 - name: Ethernet14 peer: sflow-tests-spine2 peer_interface: Ethernet14 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine2_Ethernet14 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine2_Ethernet14 loopback_interfaces: - name: Loopback0 description: ROUTER_ID diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml index 4331daba5d1..ad7966d0360 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-spine2.yml @@ -98,68 +98,68 @@ ethernet_interfaces: peer: sflow-tests-spine1 peer_interface: Ethernet9 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet9 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine1_Ethernet9 - name: Ethernet10 peer: sflow-tests-spine1 peer_interface: Ethernet10 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet10 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: false + description: P2P_sflow-tests-spine1_Ethernet10 - name: Ethernet11 peer: sflow-tests-spine1 peer_interface: Ethernet11 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet11 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine1_Ethernet11 - name: Ethernet12 peer: sflow-tests-spine1 peer_interface: Ethernet12 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet12 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine1_Ethernet12 - name: Ethernet13 peer: sflow-tests-spine1 peer_interface: Ethernet13 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet13 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: false + description: P2P_sflow-tests-spine1_Ethernet13 - name: Ethernet14 peer: sflow-tests-spine1 peer_interface: Ethernet14 peer_type: spine - description: P2P_LINK_TO_sflow-tests-spine1_Ethernet14 switchport: enabled: false shutdown: false mtu: 9214 sflow: enable: true + description: P2P_sflow-tests-spine1_Ethernet14 sflow: run: true vrfs: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml index 40adb4e435d..7dd31c42329 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-disabled-leaf.yml @@ -187,7 +187,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52 + description: P2P_cv-pathfinder-edge_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -198,7 +198,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-edge_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -209,7 +209,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-edge_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -220,7 +220,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -230,7 +230,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge1 peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52 + description: P2P_cv-pathfinder-edge1_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -241,7 +241,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-edge1_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -252,7 +252,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-edge1_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -263,7 +263,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE1_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge1_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml index 15d14ee447e..4ddbae88f6b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf1.yml @@ -187,7 +187,7 @@ ethernet_interfaces: peer: cv-pathfinder-transit1A peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52 + description: P2P_cv-pathfinder-transit1A_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -198,7 +198,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-transit1A_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -209,7 +209,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-transit1A_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -220,7 +220,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1A_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-transit1A_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -230,7 +230,7 @@ ethernet_interfaces: peer: cv-pathfinder-transit1B peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52 + description: P2P_cv-pathfinder-transit1B_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -241,7 +241,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-transit1B_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -252,7 +252,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-transit1B_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -263,7 +263,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-TRANSIT1B_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-transit1B_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml index 813fe87b71c..d78940e5a81 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2A.yml @@ -187,7 +187,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge2A peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52 + description: P2P_cv-pathfinder-edge2A_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -198,7 +198,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-edge2A_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -209,7 +209,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-edge2A_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -220,7 +220,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge2A_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -230,7 +230,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge2B peer_interface: Ethernet52 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52 + description: P2P_cv-pathfinder-edge2B_Ethernet52 shutdown: false mtu: 9214 switchport: @@ -241,7 +241,7 @@ ethernet_interfaces: peer_interface: Ethernet52.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.1000_vrf_IT + description: P2P_cv-pathfinder-edge2B_Ethernet52.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -252,7 +252,7 @@ ethernet_interfaces: peer_interface: Ethernet52.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.142_vrf_PROD + description: P2P_cv-pathfinder-edge2B_Ethernet52.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -263,7 +263,7 @@ ethernet_interfaces: peer_interface: Ethernet52.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet52.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge2B_Ethernet52.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml index 1a8abde0d26..46ca82ca6e0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/site-ha-enabled-leaf2B.yml @@ -187,7 +187,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge2A peer_interface: Ethernet53 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53 + description: P2P_cv-pathfinder-edge2A_Ethernet53 shutdown: false mtu: 9214 switchport: @@ -198,7 +198,7 @@ ethernet_interfaces: peer_interface: Ethernet53.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.1000_vrf_IT + description: P2P_cv-pathfinder-edge2A_Ethernet53.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -209,7 +209,7 @@ ethernet_interfaces: peer_interface: Ethernet53.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.142_vrf_PROD + description: P2P_cv-pathfinder-edge2A_Ethernet53.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -220,7 +220,7 @@ ethernet_interfaces: peer_interface: Ethernet53.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2A_Ethernet53.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge2A_Ethernet53.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 @@ -230,7 +230,7 @@ ethernet_interfaces: peer: cv-pathfinder-edge2B peer_interface: Ethernet53 peer_type: wan_router - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53 + description: P2P_cv-pathfinder-edge2B_Ethernet53 shutdown: false mtu: 9214 switchport: @@ -241,7 +241,7 @@ ethernet_interfaces: peer_interface: Ethernet53.1000 peer_type: wan_router vrf: IT - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.1000_vrf_IT + description: P2P_cv-pathfinder-edge2B_Ethernet53.1000_VRF_IT shutdown: false encapsulation_dot1q: vlan: 1000 @@ -252,7 +252,7 @@ ethernet_interfaces: peer_interface: Ethernet53.142 peer_type: wan_router vrf: PROD - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.142_vrf_PROD + description: P2P_cv-pathfinder-edge2B_Ethernet53.142_VRF_PROD shutdown: false encapsulation_dot1q: vlan: 142 @@ -263,7 +263,7 @@ ethernet_interfaces: peer_interface: Ethernet53.666 peer_type: wan_router vrf: ATTRACTED-VRF-FROM-UPLINK - description: P2P_LINK_TO_CV-PATHFINDER-EDGE2B_Ethernet53.666_vrf_ATTRACTED-VRF-FROM-UPLINK + description: P2P_cv-pathfinder-edge2B_Ethernet53.666_VRF_ATTRACTED-VRF-FROM-UPLINK shutdown: false encapsulation_dot1q: vlan: 666 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1a.yml index a366e85f749..55455339646 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1a.yml @@ -28,7 +28,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -93,7 +93,7 @@ vlans: - UPLINK vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml index 879e515c0f5..08b355d8ca3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml @@ -28,7 +28,7 @@ spanning_tree: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - CUSTOM_MLAG_TG_NAME - id: 100 @@ -85,7 +85,7 @@ vlans: - CUSTOM_UPLINK_TG_NAME vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml index 6eb091e2c6f..5a43d23fa61 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.247.1 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: trunk-group-tests-l3leaf1b - description: trunk-group-tests-l3leaf1b + description: trunk-group-tests-l3leaf1b_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1b + description: trunk-group-tests-l3leaf1b_Vlan3099 updates: wait_install: true - name: TG_200 @@ -89,7 +89,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1b + description: trunk-group-tests-l3leaf1b_Vlan3199 updates: wait_install: true - name: TG_300 @@ -109,7 +109,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.1 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1b + description: trunk-group-tests-l3leaf1b_Vlan3299 updates: wait_install: true vlans: @@ -231,12 +231,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 100 @@ -302,12 +302,12 @@ vlans: name: l2vlan399_without_trunk_groups tenant: TRUNK_GROUP_TESTS - id: 3099 - name: MLAG_iBGP_TG_100 + name: MLAG_L3_VRF_TG_100 trunk_groups: - MLAG tenant: TRUNK_GROUP_TESTS - id: 3199 - name: MLAG_iBGP_TG_200 + name: MLAG_L3_VRF_TG_200 trunk_groups: - MLAG tenant: TRUNK_GROUP_TESTS @@ -319,7 +319,7 @@ vlans: - TG_300 - TG_NOT_MATCHING_ANY_SERVERS - id: 3299 - name: MLAG_iBGP_TG_300 + name: MLAG_L3_VRF_TG_300 trunk_groups: - MLAG tenant: TRUNK_GROUP_TESTS @@ -332,12 +332,12 @@ vlans: - TG_NOT_MATCHING_ANY_SERVERS vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.247.0/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -355,7 +355,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_100' + description: MLAG_L3_VRF_TG_100 vrf: TG_100 mtu: 9214 ip_address: 10.255.247.0/31 @@ -372,7 +372,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_200' + description: MLAG_L3_VRF_TG_200 vrf: TG_200 mtu: 9214 ip_address: 10.255.247.0/31 @@ -406,7 +406,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_300' + description: MLAG_L3_VRF_TG_300 vrf: TG_300 mtu: 9214 ip_address: 10.255.247.0/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml index bcdad61d62d..753b4217837 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.247.0 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: trunk-group-tests-l3leaf1a - description: trunk-group-tests-l3leaf1a + description: trunk-group-tests-l3leaf1a_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1a + description: trunk-group-tests-l3leaf1a_Vlan3099 updates: wait_install: true - name: TG_200 @@ -89,7 +89,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1a + description: trunk-group-tests-l3leaf1a_Vlan3199 updates: wait_install: true - name: TG_300 @@ -109,7 +109,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.0 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf1a + description: trunk-group-tests-l3leaf1a_Vlan3299 updates: wait_install: true vlans: @@ -231,12 +231,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - CUSTOM_LEAF_PEER_L3_TG_NAME - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - CUSTOM_MLAG_TG_NAME - id: 100 @@ -292,12 +292,12 @@ vlans: name: l2vlan399_without_trunk_groups tenant: TRUNK_GROUP_TESTS - id: 3099 - name: MLAG_iBGP_TG_100 + name: MLAG_L3_VRF_TG_100 trunk_groups: - CUSTOM_LEAF_PEER_L3_TG_NAME tenant: TRUNK_GROUP_TESTS - id: 3199 - name: MLAG_iBGP_TG_200 + name: MLAG_L3_VRF_TG_200 trunk_groups: - CUSTOM_LEAF_PEER_L3_TG_NAME tenant: TRUNK_GROUP_TESTS @@ -308,7 +308,7 @@ vlans: - CUSTOM_MLAG_TG_NAME - TG_300 - id: 3299 - name: MLAG_iBGP_TG_300 + name: MLAG_L3_VRF_TG_300 trunk_groups: - CUSTOM_LEAF_PEER_L3_TG_NAME tenant: TRUNK_GROUP_TESTS @@ -320,12 +320,12 @@ vlans: - TG_300 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.247.1/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -343,7 +343,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_100' + description: MLAG_L3_VRF_TG_100 vrf: TG_100 mtu: 9214 ip_address: 10.255.247.1/31 @@ -360,7 +360,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_200' + description: MLAG_L3_VRF_TG_200 vrf: TG_200 mtu: 9214 ip_address: 10.255.247.1/31 @@ -394,7 +394,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_300' + description: MLAG_L3_VRF_TG_300 vrf: TG_300 mtu: 9214 ip_address: 10.255.247.1/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml index 94af9ae4907..0e6250b1c37 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.247.5 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: trunk-group-tests-l3leaf2b - description: trunk-group-tests-l3leaf2b + description: trunk-group-tests-l3leaf2b_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.5 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf2b + description: trunk-group-tests-l3leaf2b_Vlan3199 updates: wait_install: true vlans: @@ -121,12 +121,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 200 @@ -146,18 +146,18 @@ vlans: name: l2vlan210_with_trunk_groups tenant: TRUNK_GROUP_TESTS - id: 3199 - name: MLAG_iBGP_TG_200 + name: MLAG_L3_VRF_TG_200 trunk_groups: - MLAG tenant: TRUNK_GROUP_TESTS vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.247.4/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -175,7 +175,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_200' + description: MLAG_L3_VRF_TG_200 vrf: TG_200 mtu: 9214 ip_address: 10.255.247.4/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml index d348e785f2d..9e80c8b6c73 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 10.255.247.4 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: trunk-group-tests-l3leaf2a - description: trunk-group-tests-l3leaf2a + description: trunk-group-tests-l3leaf2a_Vlan4093 redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP @@ -69,7 +69,7 @@ router_bgp: neighbors: - ip_address: 10.255.247.4 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: trunk-group-tests-l3leaf2a + description: trunk-group-tests-l3leaf2a_Vlan3199 updates: wait_install: true vlans: @@ -121,12 +121,12 @@ spanning_tree: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - CUSTOM_MLAG_TG_NAME - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - CUSTOM_MLAG_TG_NAME - id: 200 @@ -142,18 +142,18 @@ vlans: name: l2vlan210_with_trunk_groups tenant: TRUNK_GROUP_TESTS - id: 3199 - name: MLAG_iBGP_TG_200 + name: MLAG_L3_VRF_TG_200 trunk_groups: - CUSTOM_MLAG_TG_NAME tenant: TRUNK_GROUP_TESTS vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 9214 ip_address: 10.255.247.5/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 9214 @@ -171,7 +171,7 @@ vlan_interfaces: tenant: TRUNK_GROUP_TESTS type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf TG_200' + description: MLAG_L3_VRF_TG_200 vrf: TG_200 mtu: 9214 ip_address: 10.255.247.5/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml index f5008d1de63..dbe9cb75b72 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_1.yml @@ -48,12 +48,12 @@ router_bgp: - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: underlay_filter_peer_as_evpn_2 - description: underlay_filter_peer_as_evpn_2 + description: underlay_filter_peer_as_evpn_2_Loopback0 remote_as: '64513' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: underlay_filter_peer_as_evpn_3 - description: underlay_filter_peer_as_evpn_3 + description: underlay_filter_peer_as_evpn_3_Loopback0 remote_as: '64513' address_family_evpn: peer_groups: @@ -84,7 +84,7 @@ ethernet_interfaces: peer: underlay_filter_peer_as_evpn_2 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_2_Ethernet1 + description: P2P_underlay_filter_peer_as_evpn_2_Ethernet1 shutdown: false mtu: 9214 switchport: @@ -94,7 +94,7 @@ ethernet_interfaces: peer: underlay_filter_peer_as_evpn_3 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_3_Ethernet1 + description: P2P_underlay_filter_peer_as_evpn_3_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml index 5bd5d92535a..52685575d7c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_2.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: underlay_filter_peer_as_evpn_1 - description: underlay_filter_peer_as_evpn_1 + description: underlay_filter_peer_as_evpn_1_Loopback0 remote_as: '64512' address_family_evpn: peer_groups: @@ -74,7 +74,7 @@ ethernet_interfaces: peer: underlay_filter_peer_as_evpn_1 peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_1_Ethernet1 + description: P2P_underlay_filter_peer_as_evpn_1_Ethernet1 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml index abc8c5b5275..80910316cca 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/underlay_filter_peer_as_evpn_3.yml @@ -43,7 +43,7 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: underlay_filter_peer_as_evpn_1 - description: underlay_filter_peer_as_evpn_1 + description: underlay_filter_peer_as_evpn_1_Loopback0 remote_as: '64512' address_family_evpn: peer_groups: @@ -74,7 +74,7 @@ ethernet_interfaces: peer: underlay_filter_peer_as_evpn_1 peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_UNDERLAY_FILTER_PEER_AS_EVPN_1_Ethernet2 + description: P2P_underlay_filter_peer_as_evpn_1_Ethernet2 shutdown: false mtu: 9214 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml index b50d2f978df..cfe7d1d0ea0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml @@ -30,6 +30,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml index 407586a01ab..b265926fb00 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml @@ -30,6 +30,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT address_family_ipv4: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml index 17683cfbf83..8658c81b756 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml @@ -12,6 +12,19 @@ default_connected_endpoints_description: "{endpoint}{endpoint_port?<_}" default_connected_endpoints_port_channel_description: "{adapter_description_or_endpoint}{endpoint_port_channel?<_}" mlag_member_description: "MLAG_PEER_{mlag_peer}_{interface}" mlag_port_channel_description: "MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}" +mlag_peer_svi_description: "MLAG_PEER" +mlag_peer_l3_svi_description: "MLAG_PEER_L3_PEERING" +mlag_peer_vlan_name: "MLAG_PEER" +mlag_peer_l3_vlan_name: "LEAF_PEER_L3" +mlag_peer_l3_vrf_svi_description: "MLAG_PEER_L3_iBGP: vrf {vrf}" +mlag_peer_l3_vrf_vlan_name: "MLAG_iBGP_{vrf}" +mlag_bgp_peer_description: "{mlag_peer}" +overlay_bgp_peer_description: "{peer}" +default_underlay_p2p_ethernet_description: "P2P_LINK_TO_{peer!u}_{peer_interface}{vrf?<_vrf_}" +default_underlay_p2p_port_channel_description: "P2P_LINK_TO_{peer}_{peer_interface}" # This is not actively used in this scenario. Included for completeness. + +# Test for custom description templates +mlag_bgp_peer_group_description: "MLAG_PEER_{mlag_peer}" # local users local_users: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CORE_UNIT_TESTS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CORE_UNIT_TESTS.yml index 9411d54e74d..b0cd778e84f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CORE_UNIT_TESTS.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CORE_UNIT_TESTS.yml @@ -1,3 +1,7 @@ +# Overwriting the default description templates for core_interfaces to match the <5.0 description styling +default_underlay_p2p_ethernet_description: "P2P_LINK_TO_{peer!u}_{peer_interface}{vrf?<_vrf_}" +default_underlay_p2p_port_channel_description: "P2P_LINK_TO_{peer}_{peer_interface}" + # Fabric node type keys node_type_keys: - key: core_router @@ -146,6 +150,33 @@ core_interfaces: interfaces: [ Ethernet12, Ethernet13 ] profile: isis_bb_profile + # core Port-Channel with custom description + - nodes: [ core-1-isis-sr-ldp, core-2-ospf-ldp ] + id: 9 + descriptions: [CUSTOM_DESCRIPTION_ON_P2P_LINK_A, CUSTOM_DESCRIPTION_ON_P2P_LINK_B] + port_channel: + description: "CUSTOM_DESCRIPTION_ON_P2P_PORT_CHANNEL_{port_channel_id}" + mode: active + nodes_child_interfaces: + - node: core-1-isis-sr-ldp + interfaces: [ Ethernet14, Ethernet15 ] + - node: core-2-ospf-ldp + interfaces: [ Ethernet14, Ethernet15 ] + profile: isis_bb_profile + + # core Port-Channel with custom description on p2p reusing the same on port-channel + - nodes: [ core-1-isis-sr-ldp, core-2-ospf-ldp ] + id: 9 + descriptions: [CUSTOM_DESCRIPTION_ON_P2P_LINK_A, CUSTOM_DESCRIPTION_ON_P2P_LINK_B] + port_channel: + mode: active + nodes_child_interfaces: + - node: core-1-isis-sr-ldp + interfaces: [ Ethernet16, Ethernet17 ] + - node: core-2-ospf-ldp + interfaces: [ Ethernet16, Ethernet17 ] + profile: isis_bb_profile + # P2P core links with underlay_multicast(pim-sparse) enabled. - nodes: [ core-4-multicast, peer1 ] id: 10 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CV_PATHFINDER_TESTS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CV_PATHFINDER_TESTS.yml index f38cb9daa7a..69a762c9b73 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CV_PATHFINDER_TESTS.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CV_PATHFINDER_TESTS.yml @@ -24,7 +24,10 @@ cv_pathfinder_regions: sites: - name: Site404 id: 404 - location: Not Found + location: Atlantis + - name: Site405 + id: 405 + location: El Dorado - name: Site422 id: 422 location: Somewhere @@ -59,6 +62,10 @@ bgp_peer_groups: - 192.168.142.0/24 - 192.168.143.0/24 +fabric_ip_addressing: + wan_ha: + ipv4_prefix_length: 24 + wan_stun_dtls_profile_name: profileA wan_route_servers: @@ -288,6 +295,8 @@ wan_router: ip_address: 172.16.6.6/31 # SITE_HA_ENABLED_DIRECT_HA + # One interface disable usage of port-channel + # test flow-tracking on ethernet interface for direct HA - group: Site404 cv_pathfinder_region: AVD_Land_West cv_pathfinder_site: Site404 @@ -297,6 +306,10 @@ wan_router: # Test wan_ha mtu mtu: 9100 ha_ipv4_pool: 10.10.10.0/24 + # Check flow tracking on ethernet interface + flow_tracking: + enabled: true + use_port_channel_for_direct_ha: false nodes: - name: cv-pathfinder-edge3A id: 6 @@ -314,6 +327,41 @@ wan_router: wan_circuit_id: 10423 ip_address: 172.15.6.6/31 + # SITE_HA_ENABLED_DIRECT_HA + # Multiple interfaces in port-channel for direct HA + # test changing port-channel ID + - group: SITE_DIRECT_HA_PORT_CHANNEL + cv_pathfinder_transit_mode: region + cv_pathfinder_region: AVD_Land_West + cv_pathfinder_site: Site405 + # Disable HA IPsec + wan_ha: + enabled: true # TODO AVD4.8.0: Remove once WAN HA is GA. + ipsec: false + ha_interfaces: [Ethernet42, Ethernet43] + ha_ipv4_pool: 10.10.10.0/24 + # Check flow tracking on port-channel + flow_tracking: + enabled: true + # Testing overwriting port-channel ID + port_channel_id: 666 + nodes: + - name: cv-pathfinder-edge4A + id: 8 + l3_interfaces: + - name: Ethernet1.42 + wan_carrier: Comcast + dhcp_accept_default_route: true + ip_address: dhcp + - name: cv-pathfinder-edge4B + cv_pathfinder_region: AVD_Land_West + id: 9 + l3_interfaces: + - name: Ethernet1.42 + wan_carrier: Comcast + dhcp_accept_default_route: true + ip_address: dhcp + # Fake DC1 l3leaf: defaults: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml index 3f0d068ff74..2a36471d9d5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml @@ -179,7 +179,11 @@ l3leaf: uplink_switch_interfaces: [ Ethernet22, Ethernet22, Ethernet22, Ethernet22 ] evpn_gateway: remote_peers: - - hostname: "DC1-BL2A" + - hostname: DC1-BL2A + # Testing below that the override is working + - hostname: DC1-BL2B + ip_address: 192.168.42.42 # Should be 192.168.255.17 + bgp_as: 65042 # Should be 65107 evpn_l2: enabled: true evpn_l3: @@ -193,10 +197,10 @@ l3leaf: uplink_switch_interfaces: [ Ethernet23, Ethernet23, Ethernet23, Ethernet23 ] evpn_gateway: remote_peers: - - hostname: "MY_EVPN_GW1_USER_DEFINED" + - hostname: MY_EVPN_GW1_USER_DEFINED ip_address: 1.1.1.1 bgp_as: 65555 - - hostname: "MY_EVPN_GW2_USER_DEFINED" + - hostname: MY_EVPN_GW2_USER_DEFINED ip_address: 2.2.2.2 bgp_as: 65555 evpn_l2: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_SERVERS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_SERVERS.yml index a8036fab114..1f972cd291c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_SERVERS.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_SERVERS.yml @@ -25,7 +25,6 @@ port_profiles: phone_trunk_mode: untagged - profile: ALL_WITH_SECURITY - parent_profile: NON_EXISTING_PROFILE # Test that pointing to a nonexisting profile won't break templates. mode: trunk vlans: "1-4094" spanning_tree_bpdufilter: disabled diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge2B.yml index 42d87a1f67c..308853126e9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge2B.yml @@ -12,3 +12,6 @@ wan_ipsec_profiles: control_plane: profile_name: ONE-PROFILE-TO-CONTROL-THEM-ALL shared_key: ABCDEF1234567890 + +# Testing vxlan encapsulation +wan_encapsulation: vxlan diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/only-connected-endpoints.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/only-connected-endpoints.yml new file mode 100644 index 00000000000..4cedccbc4bd --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/only-connected-endpoints.yml @@ -0,0 +1,52 @@ +--- +# Minimum config to only generate connected endpoints +node_type_keys: + - key: device + type: device + connected_endpoints: true + underlay_router: false + uplink_type: port-channel + +type: device +device: + defaults: + structured_config: + # hostname: null # Hostname is kept to avoid pyavd tests from failing. Uncomment this if you are trying to build connected-endpoints only configs. + is_deployed: null + service_routing_protocols_model: null + vlan_internal_order: null + aaa_root: null + config_end: null + enable_password: null + transceiver_qsfp_default_mode_4x10: null + spanning_tree: null + vrfs: null + management_api_http: null + +port_profiles: + - profile: MY_PROFILE + vlans: 1-100 + mode: trunk + native_vlan: 1000 + enabled: true + +servers: # dynamic_key: connected_endpoints + - name: TEST_SERVER_01 + adapters: + - switches: [only-connected-endpoints] + switch_ports: [Ethernet12] + endpoint_ports: [Nic1] + profile: MY_PROFILE + + - switches: [only-connected-endpoints, only-connected-endpoints] + switch_ports: [Ethernet1, Ethernet2] + endpoint_ports: [Nic1, Nic2] + profile: MY_PROFILE + port_channel: + mode: active + +network_ports: + - switches: ["only-connected-endpoints(-something-showing-this-supports-regex)?"] + switch_ports: [Ethernet20-29] + endpoint: Network Port + profile: MY_PROFILE diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml index 9fd45310fdf..f06a89ef7f6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml @@ -40,6 +40,7 @@ all: spanning-tree-mode-rapid-pvst: node-type-l3-interfaces: ipv4-acls: + only-connected-endpoints: platform_settings: varpv6: OVERRIDE_UPLINK_TYPE: @@ -372,6 +373,10 @@ all: hosts: cv-pathfinder-edge3A: cv-pathfinder-edge3B: + SITE_DIRECT_HA_PORT_CHANNEL: + hosts: + cv-pathfinder-edge4A: + cv-pathfinder-edge4B: SITE_HA_DISABLED: hosts: cv-pathfinder-edge: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1a.yml index e111533f39c..1962ff640d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Vlan4093 - ip_address: 10.255.255.0 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -68,12 +68,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' - ip_address: 10.1.1.1 description: External peer @@ -104,7 +104,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3009 - name: VRF11 rd: 10.255.0.3:11 route_targets: @@ -122,7 +122,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.97 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1b + description: dc1-leaf1b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -229,12 +229,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -244,7 +244,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -255,7 +255,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -270,12 +270,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.96/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -296,7 +296,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.96/31 @@ -316,7 +316,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.96/31 @@ -383,7 +383,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_dc1-spine1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -393,7 +393,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_dc1-spine2_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -403,7 +403,7 @@ ethernet_interfaces: peer: dc1-wan1 peer_interface: Ethernet1 peer_type: wan_router - description: P2P_LINK_TO_DC1-WAN1_Ethernet1 + description: P2P_dc1-wan1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -413,7 +413,7 @@ ethernet_interfaces: peer: dc1-wan2 peer_interface: Ethernet1 peer_type: wan_router - description: P2P_LINK_TO_DC1-WAN2_Ethernet1 + description: P2P_dc1-wan2_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1b.yml index d5c139a5210..d4f89f14d30 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Vlan4093 - ip_address: 10.255.255.4 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -68,12 +68,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -101,7 +101,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3009 - name: VRF11 rd: 10.255.0.4:11 route_targets: @@ -119,7 +119,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.96 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf1a + description: dc1-leaf1a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -226,12 +226,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -241,7 +241,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -252,7 +252,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -267,12 +267,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.97/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -293,7 +293,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.97/31 @@ -313,7 +313,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.97/31 @@ -380,7 +380,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_dc1-spine1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -390,7 +390,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_dc1-spine2_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -400,7 +400,7 @@ ethernet_interfaces: peer: dc1-wan1 peer_interface: Ethernet2 peer_type: wan_router - description: P2P_LINK_TO_DC1-WAN1_Ethernet2 + description: P2P_dc1-wan1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -410,7 +410,7 @@ ethernet_interfaces: peer: dc1-wan2 peer_interface: Ethernet2 peer_type: wan_router - description: P2P_LINK_TO_DC1-WAN2_Ethernet2 + description: P2P_dc1-wan2_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2a.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2a.yml index cac85ef65ee..e0363ba79cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2a.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2a.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Vlan4093 - ip_address: 10.255.255.8 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-CORE peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 192.168.100.1 remote_as: '65202' @@ -94,11 +94,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.0.5:10 @@ -117,7 +117,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3009 - name: VRF11 rd: 10.255.0.5:11 route_targets: @@ -135,7 +135,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.101 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2b + description: dc1-leaf2b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -278,12 +278,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -293,7 +293,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -304,7 +304,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -319,12 +319,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.100/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -345,7 +345,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.100/31 @@ -365,7 +365,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.100/31 @@ -432,7 +432,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_dc1-spine1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -442,7 +442,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_dc1-spine2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -461,12 +461,12 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc2-leaf2a_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 192.168.100.0/31 + description: P2P_dc2-leaf2a_Ethernet6 - name: Ethernet5 peer: dc1-leaf2-server1 peer_interface: PCI1 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2b.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2b.yml index f1d519ef621..ecc88dfd13b 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2b.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-leaf2b.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Vlan4093 - ip_address: 10.255.255.12 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-CORE peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' - ip_address: 192.168.100.3 remote_as: '65202' @@ -94,11 +94,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.0.6:10 @@ -117,7 +117,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3009 - name: VRF11 rd: 10.255.0.6:11 route_targets: @@ -135,7 +135,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.100 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc1-leaf2a + description: dc1-leaf2a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -278,12 +278,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -293,7 +293,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -304,7 +304,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -319,12 +319,12 @@ vlans: name: INBAND_MGMT vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.1.101/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -345,7 +345,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.1.101/31 @@ -365,7 +365,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.1.101/31 @@ -432,7 +432,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_dc1-spine1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -442,7 +442,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_dc1-spine2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -461,12 +461,12 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc2-leaf2b_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 192.168.100.2/31 + description: P2P_dc2-leaf2b_Ethernet6 - name: Ethernet5 peer: dc1-leaf2-server1 peer_interface: PCI2 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml index e413502d00c..286725e16a6 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml @@ -73,33 +73,33 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' shutdown: true - ip_address: 10.33.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-svc-leaf1a - description: dc1-svc-leaf1a + description: dc1-svc-leaf1a_Loopback0 remote_as: '65133' - ip_address: 10.33.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-svc-leaf1b - description: dc1-svc-leaf1b + description: dc1-svc-leaf1b_Loopback0 remote_as: '65133' - ip_address: 123.1.1.10 remote_as: '1234' @@ -193,7 +193,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_dc1-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -203,7 +203,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet1 + description: P2P_dc1-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -213,7 +213,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_dc1-leaf2a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -223,7 +223,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_dc1-leaf2b_Ethernet1 shutdown: true mtu: 1500 switchport: @@ -233,7 +233,7 @@ ethernet_interfaces: peer: dc1-svc-leaf1a peer_interface: Ethernet1 peer_type: service_leaf - description: P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet1 + description: P2P_dc1-svc-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -243,7 +243,7 @@ ethernet_interfaces: peer: dc1-svc-leaf1b peer_interface: Ethernet1 peer_type: service_leaf - description: P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet1 + description: P2P_dc1-svc-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml index 5239a2ddf4d..41a81a2865e 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml @@ -79,33 +79,33 @@ router_bgp: - ip_address: 10.255.0.3 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Loopback0 remote_as: '65101' - ip_address: 10.255.0.4 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Loopback0 remote_as: '65101' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' shutdown: true - ip_address: 10.33.0.5 peer_group: EVPN-OVERLAY-PEERS peer: dc1-svc-leaf1a - description: dc1-svc-leaf1a + description: dc1-svc-leaf1a_Loopback0 remote_as: '65133' - ip_address: 10.33.0.6 peer_group: EVPN-OVERLAY-PEERS peer: dc1-svc-leaf1b - description: dc1-svc-leaf1b + description: dc1-svc-leaf1b_Loopback0 remote_as: '65133' - ip_address: 142.112.39.2 peer_group: IPv4-EXTERNAL-PEERS @@ -175,7 +175,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_dc1-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -185,7 +185,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet2 + description: P2P_dc1-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -195,7 +195,7 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_dc1-leaf2a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -205,7 +205,7 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_dc1-leaf2b_Ethernet2 shutdown: true mtu: 1500 switchport: @@ -215,7 +215,7 @@ ethernet_interfaces: peer: dc1-svc-leaf1a peer_interface: Ethernet2 peer_type: service_leaf - description: P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet2 + description: P2P_dc1-svc-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -225,7 +225,7 @@ ethernet_interfaces: peer: dc1-svc-leaf1b peer_interface: Ethernet2 peer_type: service_leaf - description: P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet2 + description: P2P_dc1-svc-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1a.yml index ed31a0b8fd6..e93a2333252 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.33.1.105 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-svc-leaf1b - description: dc1-svc-leaf1b + description: dc1-svc-leaf1b_Vlan4093 - ip_address: 10.33.255.16 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -123,22 +123,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.33.1.104/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -176,7 +176,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description: P2P_dc1-spine1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -186,7 +186,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description: P2P_dc1-spine2_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1b.yml index c05ee098a3f..7ce026529a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-svc-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.33.1.104 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc1-svc-leaf1a - description: dc1-svc-leaf1a + description: dc1-svc-leaf1a_Vlan4093 - ip_address: 10.33.255.20 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65100' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.0.1 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine1 - description: dc1-spine1 + description: dc1-spine1_Loopback0 remote_as: '65100' - ip_address: 10.255.0.2 peer_group: EVPN-OVERLAY-PEERS peer: dc1-spine2 - description: dc1-spine2 + description: dc1-spine2_Loopback0 remote_as: '65100' redistribute_routes: - source_protocol: connected @@ -123,22 +123,22 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.33.1.105/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -176,7 +176,7 @@ ethernet_interfaces: peer: dc1-spine1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description: P2P_dc1-spine1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -186,7 +186,7 @@ ethernet_interfaces: peer: dc1-spine2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description: P2P_dc1-spine2_Ethernet6 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml index c62b9abfcf6..a5b98b7de6e 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml @@ -57,11 +57,11 @@ router_bgp: - ip_address: 10.255.255.10 peer_group: WAN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Dps1 - ip_address: 10.255.255.20 peer_group: WAN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Dps1 - ip_address: 10.255.1.2 peer: dc1-wan2 description: dc1-wan2 @@ -75,6 +75,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -83,6 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.2 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -164,7 +166,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet6 + description: P2P_dc1-leaf1a_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -174,7 +176,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet6 + description: P2P_dc1-leaf1b_Ethernet6 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml index 3a094e7fd40..832467a8d2c 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml @@ -57,11 +57,11 @@ router_bgp: - ip_address: 10.255.255.10 peer_group: WAN-OVERLAY-PEERS peer: dc1-leaf1a - description: dc1-leaf1a + description: dc1-leaf1a_Dps1 - ip_address: 10.255.255.20 peer_group: WAN-OVERLAY-PEERS peer: dc1-leaf1b - description: dc1-leaf1b + description: dc1-leaf1b_Dps1 - ip_address: 10.255.1.1 peer: dc1-wan1 description: dc1-wan1 @@ -75,6 +75,7 @@ router_bgp: peer_groups: - name: WAN-OVERLAY-PEERS activate: true + encapsulation: path-selection route_map_in: RM-EVPN-SOO-IN route_map_out: RM-EVPN-SOO-OUT neighbor_default: @@ -83,6 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.1.1 activate: true + encapsulation: path-selection address_family_ipv4_sr_te: peer_groups: - name: WAN-OVERLAY-PEERS @@ -164,7 +166,7 @@ ethernet_interfaces: peer: dc1-leaf1a peer_interface: Ethernet7 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet7 + description: P2P_dc1-leaf1a_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -174,7 +176,7 @@ ethernet_interfaces: peer: dc1-leaf1b peer_interface: Ethernet7 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1B_Ethernet7 + description: P2P_dc1-leaf1b_Ethernet7 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1a.yml index f7dae81a61f..4c1759e5442 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1a.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Vlan4093 - ip_address: 10.255.255.104 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1b + description: dc2-leaf1b_Vlan3009 - name: VRF11 rd: 10.255.128.13:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.117 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1b + description: dc2-leaf1b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -215,12 +215,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -230,7 +230,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -241,7 +241,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -253,12 +253,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.116/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -279,7 +279,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.116/31 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.116/31 @@ -356,7 +356,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet1 + description: P2P_dc2-spine1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -366,7 +366,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet1 + description: P2P_dc2-spine2_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1b.yml index ccb6b4216bd..977966a0e7c 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf1b.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Vlan4093 - ip_address: 10.255.255.108 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1a + description: dc2-leaf1a_Vlan3009 - name: VRF11 rd: 10.255.128.14:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.116 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf1a + description: dc2-leaf1a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -215,12 +215,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -230,7 +230,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -241,7 +241,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -253,12 +253,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.117/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -279,7 +279,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.117/31 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.117/31 @@ -356,7 +356,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet2 + description: P2P_dc2-spine1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -366,7 +366,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet2 + description: P2P_dc2-spine2_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2a.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2a.yml index a57b552cebd..2e6dfa24e8b 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2a.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2a.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Vlan4093 - ip_address: 10.255.255.112 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' - ip_address: 10.255.0.5 peer_group: EVPN-OVERLAY-CORE peer: dc1-leaf2a - description: dc1-leaf2a + description: dc1-leaf2a_Loopback0 remote_as: '65102' - ip_address: 192.168.100.0 remote_as: '65102' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.128.15:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2b + description: dc2-leaf2b_Vlan3009 - name: VRF11 rd: 10.255.128.15:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.121 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2b + description: dc2-leaf2b_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -277,12 +277,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -292,7 +292,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -303,7 +303,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -315,12 +315,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.120/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -341,7 +341,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.120/31 @@ -361,7 +361,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.120/31 @@ -418,7 +418,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet3 + description: P2P_dc2-spine1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -428,7 +428,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet3 + description: P2P_dc2-spine2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -447,12 +447,12 @@ ethernet_interfaces: peer: dc1-leaf2a peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc1-leaf2a_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 192.168.100.1/31 + description: P2P_dc1-leaf2a_Ethernet6 - name: Ethernet5 peer: dc2-leaf2-server1 peer_interface: PCI1 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2b.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2b.yml index f35bfff8d6d..24795548ab5 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2b.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf2b.yml @@ -53,7 +53,7 @@ router_bgp: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Vlan4093 - ip_address: 10.255.255.116 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -67,17 +67,17 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' - ip_address: 10.255.0.6 peer_group: EVPN-OVERLAY-CORE peer: dc1-leaf2b - description: dc1-leaf2b + description: dc1-leaf2b_Loopback0 remote_as: '65102' - ip_address: 192.168.100.2 remote_as: '65102' @@ -93,11 +93,11 @@ router_bgp: enable: true inter_domain: true peer_groups: - - name: EVPN-OVERLAY-PEERS - activate: true - name: EVPN-OVERLAY-CORE domain_remote: true activate: true + - name: EVPN-OVERLAY-PEERS + activate: true vrfs: - name: VRF10 rd: 10.255.128.16:10 @@ -116,7 +116,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2a + description: dc2-leaf2a_Vlan3009 - name: VRF11 rd: 10.255.128.16:11 route_targets: @@ -134,7 +134,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.120 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf2a + description: dc2-leaf2a_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -277,12 +277,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -292,7 +292,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -303,7 +303,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -315,12 +315,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.121/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -341,7 +341,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.121/31 @@ -361,7 +361,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.121/31 @@ -418,7 +418,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet4 + description: P2P_dc2-spine1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -428,7 +428,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet4 + description: P2P_dc2-spine2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -447,12 +447,12 @@ ethernet_interfaces: peer: dc1-leaf2b peer_interface: Ethernet6 peer_type: l3leaf - description: P2P_LINK_TO_dc1-leaf2b_Ethernet6 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 192.168.100.3/31 + description: P2P_dc1-leaf2b_Ethernet6 - name: Ethernet5 peer: dc2-leaf2-server1 peer_interface: PCI2 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml index a3bfba23671..de4105a8d29 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.125 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf3b.arista.com - description: dc2-leaf3b.arista.com + description: dc2-leaf3b.arista.com_Vlan4093 - ip_address: 10.255.255.120 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.125 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf3b.arista.com + description: dc2-leaf3b.arista.com_Vlan3009 - name: VRF11 rd: 10.255.128.17:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.125 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf3b.arista.com + description: dc2-leaf3b.arista.com_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -215,12 +215,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -230,7 +230,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -241,7 +241,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -253,12 +253,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.124/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -279,7 +279,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.124/31 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.124/31 @@ -370,7 +370,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet5 + description: P2P_dc2-spine1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -380,7 +380,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet5 + description: P2P_dc2-spine2_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3b.arista.com.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3b.arista.com.yml index 0e296766d81..e943ff33425 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3b.arista.com.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3b.arista.com.yml @@ -44,7 +44,7 @@ router_bgp: - ip_address: 10.255.129.124 peer_group: MLAG-IPv4-UNDERLAY-PEER peer: dc2-leaf3a.arista.com - description: dc2-leaf3a.arista.com + description: dc2-leaf3a.arista.com_Vlan4093 - ip_address: 10.255.255.124 peer_group: IPv4-UNDERLAY-PEERS remote_as: '65200' @@ -58,12 +58,12 @@ router_bgp: - ip_address: 10.255.128.11 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine1 - description: dc2-spine1 + description: dc2-spine1_Loopback0 remote_as: '65200' - ip_address: 10.255.128.12 peer_group: EVPN-OVERLAY-PEERS peer: dc2-spine2 - description: dc2-spine2 + description: dc2-spine2_Loopback0 remote_as: '65200' redistribute_routes: - source_protocol: connected @@ -90,7 +90,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.124 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf3a.arista.com + description: dc2-leaf3a.arista.com_Vlan3009 - name: VRF11 rd: 10.255.128.18:11 route_targets: @@ -108,7 +108,7 @@ router_bgp: neighbors: - ip_address: 10.255.129.124 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: dc2-leaf3a.arista.com + description: dc2-leaf3a.arista.com_Vlan3010 vlans: - id: 11 tenant: TENANT1 @@ -215,12 +215,12 @@ management_api_http: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 11 @@ -230,7 +230,7 @@ vlans: name: VRF10_VLAN12 tenant: TENANT1 - id: 3009 - name: MLAG_iBGP_VRF10 + name: MLAG_L3_VRF_VRF10 trunk_groups: - MLAG tenant: TENANT1 @@ -241,7 +241,7 @@ vlans: name: VRF11_VLAN22 tenant: TENANT1 - id: 3010 - name: MLAG_iBGP_VRF11 + name: MLAG_L3_VRF_VRF11 trunk_groups: - MLAG tenant: TENANT1 @@ -253,12 +253,12 @@ vlans: tenant: TENANT1 vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.129.125/31 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -279,7 +279,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF10' + description: MLAG_L3_VRF_VRF10 vrf: VRF10 mtu: 1500 ip_address: 10.255.129.125/31 @@ -299,7 +299,7 @@ vlan_interfaces: tenant: TENANT1 type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf VRF11' + description: MLAG_L3_VRF_VRF11 vrf: VRF11 mtu: 1500 ip_address: 10.255.129.125/31 @@ -344,7 +344,7 @@ ethernet_interfaces: peer: dc2-spine1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE1_Ethernet6 + description: P2P_dc2-spine1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -354,7 +354,7 @@ ethernet_interfaces: peer: dc2-spine2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC2-SPINE2_Ethernet6 + description: P2P_dc2-spine2_Ethernet6 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine1.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine1.yml index eef23e8b2b4..bf2c8163c1d 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine1.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine1.yml @@ -67,32 +67,32 @@ router_bgp: - ip_address: 10.255.128.13 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Loopback0 remote_as: '65201' - ip_address: 10.255.128.14 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Loopback0 remote_as: '65201' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' - ip_address: 10.255.128.17 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf3a.arista.com - description: dc2-leaf3a.arista.com + description: dc2-leaf3a.arista.com_Loopback0 remote_as: '65203' - ip_address: 10.255.128.18 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf3b.arista.com - description: dc2-leaf3b.arista.com + description: dc2-leaf3b.arista.com_Loopback0 remote_as: '65203' address_family_evpn: peer_groups: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: dc2-leaf1a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1A_Ethernet1 + description: P2P_dc2-leaf1a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -157,7 +157,7 @@ ethernet_interfaces: peer: dc2-leaf1b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1B_Ethernet1 + description: P2P_dc2-leaf1b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -167,7 +167,7 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2A_Ethernet1 + description: P2P_dc2-leaf2a_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2B_Ethernet1 + description: P2P_dc2-leaf2b_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: dc2-leaf3a.arista.com peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet1 + description: P2P_dc2-leaf3a.arista.com_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: dc2-leaf3b.arista.com peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet1 + description: P2P_dc2-leaf3b.arista.com_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine2.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine2.yml index e427dee96c0..2e05257b546 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine2.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-spine2.yml @@ -67,32 +67,32 @@ router_bgp: - ip_address: 10.255.128.13 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1a - description: dc2-leaf1a + description: dc2-leaf1a_Loopback0 remote_as: '65201' - ip_address: 10.255.128.14 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf1b - description: dc2-leaf1b + description: dc2-leaf1b_Loopback0 remote_as: '65201' - ip_address: 10.255.128.15 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2a - description: dc2-leaf2a + description: dc2-leaf2a_Loopback0 remote_as: '65202' - ip_address: 10.255.128.16 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf2b - description: dc2-leaf2b + description: dc2-leaf2b_Loopback0 remote_as: '65202' - ip_address: 10.255.128.17 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf3a.arista.com - description: dc2-leaf3a.arista.com + description: dc2-leaf3a.arista.com_Loopback0 remote_as: '65203' - ip_address: 10.255.128.18 peer_group: EVPN-OVERLAY-PEERS peer: dc2-leaf3b.arista.com - description: dc2-leaf3b.arista.com + description: dc2-leaf3b.arista.com_Loopback0 remote_as: '65203' address_family_evpn: peer_groups: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: dc2-leaf1a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1A_Ethernet2 + description: P2P_dc2-leaf1a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -157,7 +157,7 @@ ethernet_interfaces: peer: dc2-leaf1b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF1B_Ethernet2 + description: P2P_dc2-leaf1b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -167,7 +167,7 @@ ethernet_interfaces: peer: dc2-leaf2a peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2A_Ethernet2 + description: P2P_dc2-leaf2a_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: dc2-leaf2b peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF2B_Ethernet2 + description: P2P_dc2-leaf2b_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -187,7 +187,7 @@ ethernet_interfaces: peer: dc2-leaf3a.arista.com peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet2 + description: P2P_dc2-leaf3a.arista.com_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -197,7 +197,7 @@ ethernet_interfaces: peer: dc2-leaf3b.arista.com peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet2 + description: P2P_dc2-leaf3b.arista.com_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1a-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1a-catalog.yml index 60453a2d2b7..bc7af8217f8 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1a-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1a-catalog.yml @@ -352,25 +352,25 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet1 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-spine1_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet1 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-spine2_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet1 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-wan1_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet7 status: up result_overwrite: - custom_field: Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet1 = 'up' + custom_field: Interface Ethernet7 - P2P_dc1-wan2_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -406,13 +406,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -430,7 +430,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -448,7 +448,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4085 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1b-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1b-catalog.yml index 02203e8daf3..d201add908b 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1b-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf1b-catalog.yml @@ -349,25 +349,25 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet2 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-spine1_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet2 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-spine2_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet2 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-wan1_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet7 status: up result_overwrite: - custom_field: Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet2 = 'up' + custom_field: Interface Ethernet7 - P2P_dc1-wan2_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -403,13 +403,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -427,7 +427,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -445,7 +445,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4085 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf2a-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf2a-catalog.yml index 75b32e916c3..0c1ea33f163 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf2a-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-leaf2a-catalog.yml @@ -319,13 +319,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet3 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-spine1_Ethernet3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet3 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-spine2_Ethernet3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -337,7 +337,7 @@ anta.tests.interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_dc2-leaf2a_Ethernet6 = 'up' + custom_field: Interface Ethernet6 - P2P_dc2-leaf2a_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 @@ -368,13 +368,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -392,7 +392,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -410,7 +410,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4085 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine1-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine1-catalog.yml index fd7699c639d..49e819c6696 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine1-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine1-catalog.yml @@ -200,37 +200,37 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet1 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet1 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 status: up result_overwrite: - custom_field: Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet1 = 'up' + custom_field: Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet4 status: adminDown result_overwrite: - custom_field: Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet1 = 'adminDown' + custom_field: Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet1 = 'adminDown' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 status: up result_overwrite: - custom_field: Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet1 = 'up' + custom_field: Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet1 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine2-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine2-catalog.yml index 5c3f986bce2..a5cf90e40d1 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine2-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-spine2-catalog.yml @@ -200,37 +200,37 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet2 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet2 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 status: up result_overwrite: - custom_field: Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet2 = 'up' + custom_field: Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet4 status: adminDown result_overwrite: - custom_field: Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet2 = 'adminDown' + custom_field: Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet2 = 'adminDown' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 status: up result_overwrite: - custom_field: Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet2 = 'up' + custom_field: Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet2 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1a-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1a-catalog.yml index dc76beaec4a..eb853dff0ec 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1a-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1a-catalog.yml @@ -310,13 +310,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet5 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-spine1_Ethernet5 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet5 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-spine2_Ethernet5 = 'up' - VerifyInterfacesStatus: interfaces: - name: Port-Channel3 @@ -329,13 +329,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1b-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1b-catalog.yml index 193a63c3181..75f0e68d52d 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1b-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-svc-leaf1b-catalog.yml @@ -310,13 +310,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet6 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-spine1_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet6 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-spine2_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Port-Channel3 @@ -329,13 +329,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan1-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan1-catalog.yml index 57ca347c2c4..69178601322 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan1-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan1-catalog.yml @@ -149,13 +149,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet6 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet6 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan2-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan2-catalog.yml index 135152ecadc..255d2d66a9b 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan2-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc1-wan2-catalog.yml @@ -149,13 +149,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet7 = 'up' + custom_field: Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet7 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet7 = 'up' + custom_field: Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet7 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1a-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1a-catalog.yml index b7747f15a61..038b244a020 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1a-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1a-catalog.yml @@ -317,13 +317,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet1 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet1 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -359,13 +359,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -383,7 +383,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -401,7 +401,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1b-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1b-catalog.yml index 11e37027d5b..0c940075564 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1b-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf1b-catalog.yml @@ -317,13 +317,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet2 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet2 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -359,13 +359,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -383,7 +383,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -401,7 +401,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2a-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2a-catalog.yml index df4ab628951..4a3f57fabc8 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2a-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2a-catalog.yml @@ -333,13 +333,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet3 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet3 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -351,7 +351,7 @@ anta.tests.interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2a_Ethernet6 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-leaf2a_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 @@ -382,13 +382,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -406,7 +406,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -424,7 +424,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2b-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2b-catalog.yml index 1552cdb6367..33f004fa842 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2b-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf2b-catalog.yml @@ -317,13 +317,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet4 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet4 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet4 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet4 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet8 @@ -335,7 +335,7 @@ anta.tests.interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2b_Ethernet6 = 'up' + custom_field: Interface Ethernet6 - P2P_dc1-leaf2b_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 @@ -366,13 +366,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -390,7 +390,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -408,7 +408,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml index fb7bb270d18..e703d77de76 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml @@ -326,13 +326,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet5 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet5 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet5 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet5 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet11 @@ -406,13 +406,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -430,7 +430,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -448,7 +448,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3b.arista.com-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3b.arista.com-catalog.yml index 0c465881971..2ea65fd82f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3b.arista.com-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3b.arista.com-catalog.yml @@ -310,13 +310,13 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet6 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-spine1_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet6 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-spine2_Ethernet6 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet11 @@ -341,13 +341,13 @@ anta.tests.interfaces: - name: Vlan4093 status: up result_overwrite: - custom_field: Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' + custom_field: Interface Vlan4093 - MLAG_L3 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan4094 status: up result_overwrite: - custom_field: Interface Vlan4094 - MLAG_PEER = 'up' + custom_field: Interface Vlan4094 - MLAG = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan11 @@ -365,7 +365,7 @@ anta.tests.interfaces: - name: Vlan3009 status: up result_overwrite: - custom_field: 'Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = ''up''' + custom_field: Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' - VerifyInterfacesStatus: interfaces: - name: Vlan21 @@ -383,7 +383,7 @@ anta.tests.interfaces: - name: Vlan3010 status: up result_overwrite: - custom_field: 'Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = ''up''' + custom_field: Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine1-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine1-catalog.yml index 312bb242a1e..ebb92aab8a4 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine1-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine1-catalog.yml @@ -195,39 +195,37 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet1 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet1 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 status: up result_overwrite: - custom_field: Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet1 = 'up' + custom_field: Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet4 status: up result_overwrite: - custom_field: Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet1 = 'up' + custom_field: Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 status: up result_overwrite: - custom_field: Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet1 - = 'up' + custom_field: Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet1 - = 'up' + custom_field: Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet1 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine2-catalog.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine2-catalog.yml index d65646b6fbf..1502a2465b4 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine2-catalog.yml +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-spine2-catalog.yml @@ -195,39 +195,37 @@ anta.tests.interfaces: - name: Ethernet1 status: up result_overwrite: - custom_field: Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet2 = 'up' + custom_field: Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet2 status: up result_overwrite: - custom_field: Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet2 = 'up' + custom_field: Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet3 status: up result_overwrite: - custom_field: Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet2 = 'up' + custom_field: Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet4 status: up result_overwrite: - custom_field: Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet2 = 'up' + custom_field: Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet5 status: up result_overwrite: - custom_field: Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet2 - = 'up' + custom_field: Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Ethernet6 status: up result_overwrite: - custom_field: Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet2 - = 'up' + custom_field: Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet2 = 'up' - VerifyInterfacesStatus: interfaces: - name: Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv index e1c2921b0a9..4f04abbfa6e 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv @@ -59,13 +59,13 @@ id,dut,categories,test,description,inputs,result,messages 58,dc1-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 59,dc1-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arastra, Inc.', 'Arista Networks', 'Generic', 'Not Present'",NOT RUN, 60,dc1-leaf1a,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -61,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet1 = 'up',NOT RUN, -62,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet1 = 'up',NOT RUN, +61,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-spine1_Ethernet1 = 'up',NOT RUN, +62,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-spine2_Ethernet1 = 'up',NOT RUN, 63,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc1-leaf1b_Ethernet3 = 'up',NOT RUN, 64,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc1-leaf1b_Ethernet4 = 'up',NOT RUN, 65,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc1-leaf1-server1_PCI1 = 'up',NOT RUN, -66,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet1 = 'up',NOT RUN, -67,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet1 = 'up',NOT RUN, +66,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-wan1_Ethernet1 = 'up',NOT RUN, +67,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_dc1-wan2_Ethernet1 = 'up',NOT RUN, 68,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC1-LEAF1C_Ethernet1 = 'up',NOT RUN, 69,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 70,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, @@ -78,11 +78,11 @@ id,dut,categories,test,description,inputs,result,messages 77,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 78,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 79,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -80,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -81,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, +80,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +81,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, 82,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4085 - Inband Management = 'up',NOT RUN, -83,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -84,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +83,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +84,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 85,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 86,dc1-leaf1a,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 87,dc1-leaf1a,MLAG,VerifyMlagStatus,Verifies the health status of the MLAG configuration.,,NOT RUN, @@ -218,13 +218,13 @@ id,dut,categories,test,description,inputs,result,messages 217,dc1-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 218,dc1-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 219,dc1-leaf1b,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -220,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet2 = 'up',NOT RUN, -221,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet2 = 'up',NOT RUN, +220,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-spine1_Ethernet2 = 'up',NOT RUN, +221,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-spine2_Ethernet2 = 'up',NOT RUN, 222,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc1-leaf1a_Ethernet3 = 'up',NOT RUN, 223,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc1-leaf1a_Ethernet4 = 'up',NOT RUN, 224,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc1-leaf1-server1_PCI2 = 'up',NOT RUN, -225,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet2 = 'up',NOT RUN, -226,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet2 = 'up',NOT RUN, +225,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-wan1_Ethernet2 = 'up',NOT RUN, +226,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_dc1-wan2_Ethernet2 = 'up',NOT RUN, 227,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC1-LEAF1C_Ethernet2 = 'up',NOT RUN, 228,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 229,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, @@ -237,11 +237,11 @@ id,dut,categories,test,description,inputs,result,messages 236,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 237,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 238,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -239,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -240,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, +239,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +240,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, 241,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4085 - Inband Management = 'up',NOT RUN, -242,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -243,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +242,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +243,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 244,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 245,dc1-leaf1b,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 246,dc1-leaf1b,MLAG,VerifyMlagStatus,Verifies the health status of the MLAG configuration.,,NOT RUN, @@ -454,12 +454,12 @@ id,dut,categories,test,description,inputs,result,messages 453,dc1-leaf2a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 454,dc1-leaf2a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 455,dc1-leaf2a,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -456,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet3 = 'up',NOT RUN, -457,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet3 = 'up',NOT RUN, +456,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-spine1_Ethernet3 = 'up',NOT RUN, +457,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-spine2_Ethernet3 = 'up',NOT RUN, 458,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc1-leaf2b_Ethernet3 = 'up',NOT RUN, 459,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc1-leaf2b_Ethernet4 = 'up',NOT RUN, 460,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc1-leaf2-server1_PCI1 = 'up',NOT RUN, -461,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_dc2-leaf2a_Ethernet6 = 'up',NOT RUN, +461,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc2-leaf2a_Ethernet6 = 'up',NOT RUN, 462,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC1-LEAF2C_Ethernet1 = 'up',NOT RUN, 463,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 464,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, @@ -472,11 +472,11 @@ id,dut,categories,test,description,inputs,result,messages 471,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 472,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 473,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -474,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -475,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, +474,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +475,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, 476,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4085 - Inband Management = 'up',NOT RUN, -477,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -478,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +477,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +478,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 479,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 480,dc1-leaf2a,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 481,dc1-leaf2a,MLAG,VerifyMlagStatus,Verifies the health status of the MLAG configuration.,,NOT RUN, @@ -714,12 +714,12 @@ id,dut,categories,test,description,inputs,result,messages 713,dc1-spine1,Interfaces,VerifyInterfaceErrDisabled,Verifies there are no interfaces in the errdisabled state.,,NOT RUN, 714,dc1-spine1,Interfaces,VerifyInterfaceErrors,Verifies there are no interface error counters.,,NOT RUN, 715,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,,NOT RUN, -716,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet1 = 'up',NOT RUN, -717,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet1 = 'up',NOT RUN, -718,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet1 = 'up',NOT RUN, -719,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet1 = 'adminDown',NOT RUN, -720,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet1 = 'up',NOT RUN, -721,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet1 = 'up',NOT RUN, +716,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet1 = 'up',NOT RUN, +717,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet1 = 'up',NOT RUN, +718,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet1 = 'up',NOT RUN, +719,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet1 = 'adminDown',NOT RUN, +720,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet1 = 'up',NOT RUN, +721,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet1 = 'up',NOT RUN, 722,dc1-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 723,dc1-spine1,Interfaces,VerifyInterfaceUtilization,Verifies that the utilization of interfaces is below a certain threshold.,,NOT RUN, 724,dc1-spine1,Interfaces,VerifyIPProxyARP,Verifies if Proxy ARP is enabled.,,NOT RUN, @@ -830,12 +830,12 @@ id,dut,categories,test,description,inputs,result,messages 829,dc1-spine2,Interfaces,VerifyInterfaceErrDisabled,Verifies there are no interfaces in the errdisabled state.,,NOT RUN, 830,dc1-spine2,Interfaces,VerifyInterfaceErrors,Verifies there are no interface error counters.,,NOT RUN, 831,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,,NOT RUN, -832,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet2 = 'up',NOT RUN, -833,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet2 = 'up',NOT RUN, -834,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet2 = 'up',NOT RUN, -835,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet2 = 'adminDown',NOT RUN, -836,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet2 = 'up',NOT RUN, -837,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet2 = 'up',NOT RUN, +832,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet2 = 'up',NOT RUN, +833,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet2 = 'up',NOT RUN, +834,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet2 = 'up',NOT RUN, +835,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet2 = 'adminDown',NOT RUN, +836,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet2 = 'up',NOT RUN, +837,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet2 = 'up',NOT RUN, 838,dc1-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 839,dc1-spine2,Interfaces,VerifyInterfaceUtilization,Verifies that the utilization of interfaces is below a certain threshold.,,NOT RUN, 840,dc1-spine2,Interfaces,VerifyIPProxyARP,Verifies if Proxy ARP is enabled.,,NOT RUN, @@ -945,15 +945,15 @@ id,dut,categories,test,description,inputs,result,messages 944,dc1-svc-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 945,dc1-svc-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 946,dc1-svc-leaf1a,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -947,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet5 = 'up',NOT RUN, -948,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet5 = 'up',NOT RUN, +947,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-spine1_Ethernet5 = 'up',NOT RUN, +948,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-spine2_Ethernet5 = 'up',NOT RUN, 949,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc1-svc-leaf1b_Ethernet3 = 'up',NOT RUN, 950,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc1-svc-leaf1b_Ethernet4 = 'up',NOT RUN, 951,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 952,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, 953,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_dc1-svc-leaf1b_Port-Channel3 = 'up',NOT RUN, -954,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -955,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +954,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +955,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 956,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 957,dc1-svc-leaf1a,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 958,dc1-svc-leaf1a,MLAG,VerifyMlagStatus,Verifies the health status of the MLAG configuration.,,NOT RUN, @@ -1074,15 +1074,15 @@ id,dut,categories,test,description,inputs,result,messages 1073,dc1-svc-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 1074,dc1-svc-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1075,dc1-svc-leaf1b,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -1076,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet6 = 'up',NOT RUN, -1077,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet6 = 'up',NOT RUN, +1076,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-spine1_Ethernet6 = 'up',NOT RUN, +1077,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-spine2_Ethernet6 = 'up',NOT RUN, 1078,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc1-svc-leaf1a_Ethernet3 = 'up',NOT RUN, 1079,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc1-svc-leaf1a_Ethernet4 = 'up',NOT RUN, 1080,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 1081,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, 1082,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_dc1-svc-leaf1a_Port-Channel3 = 'up',NOT RUN, -1083,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -1084,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +1083,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +1084,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 1085,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 1086,dc1-svc-leaf1b,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 1087,dc1-svc-leaf1b,MLAG,VerifyMlagStatus,Verifies the health status of the MLAG configuration.,,NOT RUN, @@ -1193,8 +1193,8 @@ id,dut,categories,test,description,inputs,result,messages 1192,dc1-wan1,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1193,dc1-wan1,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, 1194,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Dps1 - DPS Interface = 'up',NOT RUN, -1195,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet6 = 'up',NOT RUN, -1196,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet6 = 'up',NOT RUN, +1195,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet6 = 'up',NOT RUN, +1196,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet6 = 'up',NOT RUN, 1197,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - mpls-sp-1_DC1-MPLS-3 = 'up',NOT RUN, 1198,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - isp-1_DC1-INET-3 = 'up',NOT RUN, 1199,dc1-wan1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, @@ -1289,8 +1289,8 @@ id,dut,categories,test,description,inputs,result,messages 1288,dc1-wan2,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1289,dc1-wan2,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, 1290,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Dps1 - DPS Interface = 'up',NOT RUN, -1291,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet7 = 'up',NOT RUN, -1292,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet7 = 'up',NOT RUN, +1291,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet7 = 'up',NOT RUN, +1292,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet7 = 'up',NOT RUN, 1293,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - mpls-sp-1_DC1-MPLS-4 = 'up',NOT RUN, 1294,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - isp-1_DC1-INET-4 = 'up',NOT RUN, 1295,dc1-wan2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, @@ -1396,8 +1396,8 @@ id,dut,categories,test,description,inputs,result,messages 1395,dc2-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 1396,dc2-leaf1a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1397,dc2-leaf1a,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -1398,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet1 = 'up',NOT RUN, -1399,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet1 = 'up',NOT RUN, +1398,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet1 = 'up',NOT RUN, +1399,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet1 = 'up',NOT RUN, 1400,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf1b_Ethernet3 = 'up',NOT RUN, 1401,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf1b_Ethernet4 = 'up',NOT RUN, 1402,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc2-leaf1-server1_PCI1 = 'up',NOT RUN, @@ -1413,10 +1413,10 @@ id,dut,categories,test,description,inputs,result,messages 1412,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 1413,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 1414,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -1415,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -1416,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -1417,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -1418,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +1415,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +1416,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +1417,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +1418,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 1419,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 1420,dc2-leaf1a,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 1421,dc2-leaf1a,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -1558,8 +1558,8 @@ id,dut,categories,test,description,inputs,result,messages 1557,dc2-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 1558,dc2-leaf1b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1559,dc2-leaf1b,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -1560,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet2 = 'up',NOT RUN, -1561,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet2 = 'up',NOT RUN, +1560,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet2 = 'up',NOT RUN, +1561,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet2 = 'up',NOT RUN, 1562,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf1a_Ethernet3 = 'up',NOT RUN, 1563,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf1a_Ethernet4 = 'up',NOT RUN, 1564,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc2-leaf1-server1_PCI2 = 'up',NOT RUN, @@ -1575,10 +1575,10 @@ id,dut,categories,test,description,inputs,result,messages 1574,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 1575,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 1576,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -1577,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -1578,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -1579,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -1580,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +1577,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +1578,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +1579,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +1580,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 1581,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 1582,dc2-leaf1b,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 1583,dc2-leaf1b,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -1796,12 +1796,12 @@ id,dut,categories,test,description,inputs,result,messages 1795,dc2-leaf2a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 1796,dc2-leaf2a,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1797,dc2-leaf2a,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -1798,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet3 = 'up',NOT RUN, -1799,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet3 = 'up',NOT RUN, +1798,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet3 = 'up',NOT RUN, +1799,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet3 = 'up',NOT RUN, 1800,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf2b_Ethernet3 = 'up',NOT RUN, 1801,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf2b_Ethernet4 = 'up',NOT RUN, 1802,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc2-leaf2-server1_PCI1 = 'up',NOT RUN, -1803,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2a_Ethernet6 = 'up',NOT RUN, +1803,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-leaf2a_Ethernet6 = 'up',NOT RUN, 1804,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC2-LEAF2C_Ethernet1 = 'up',NOT RUN, 1805,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 1806,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, @@ -1814,10 +1814,10 @@ id,dut,categories,test,description,inputs,result,messages 1813,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 1814,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 1815,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -1816,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -1817,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -1818,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -1819,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +1816,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +1817,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +1818,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +1819,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 1820,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 1821,dc2-leaf2a,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 1822,dc2-leaf2a,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -1959,12 +1959,12 @@ id,dut,categories,test,description,inputs,result,messages 1958,dc2-leaf2b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 1959,dc2-leaf2b,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 1960,dc2-leaf2b,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -1961,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet4 = 'up',NOT RUN, -1962,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet4 = 'up',NOT RUN, +1961,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet4 = 'up',NOT RUN, +1962,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet4 = 'up',NOT RUN, 1963,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf2a_Ethernet3 = 'up',NOT RUN, 1964,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf2a_Ethernet4 = 'up',NOT RUN, 1965,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - SERVER_dc2-leaf2-server1_PCI2 = 'up',NOT RUN, -1966,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2b_Ethernet6 = 'up',NOT RUN, +1966,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc1-leaf2b_Ethernet6 = 'up',NOT RUN, 1967,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC2-LEAF2C_Ethernet2 = 'up',NOT RUN, 1968,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 1969,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN, @@ -1977,10 +1977,10 @@ id,dut,categories,test,description,inputs,result,messages 1976,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 1977,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 1978,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -1979,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -1980,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -1981,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -1982,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +1979,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +1980,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +1981,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +1982,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 1983,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 1984,dc2-leaf2b,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 1985,dc2-leaf2b,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -2195,13 +2195,13 @@ id,dut,categories,test,description,inputs,result,messages 2194,dc2-leaf3a.arista.com,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 2195,dc2-leaf3a.arista.com,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 2196,dc2-leaf3a.arista.com,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -2197,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet5 = 'up',NOT RUN, +2197,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet5 = 'up',NOT RUN, 2198,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet11 - dc2-leaf3-fw1_e1 = 'up',NOT RUN, 2199,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet12 - Test_mode_and_vlans = 'up',NOT RUN, 2200,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet13 - Test_native_vlan_and_trunk_groups = 'up',NOT RUN, 2201,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet14 - Test_phone = 'up',NOT RUN, 2202,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet15 - Test_type_routed = 'up',NOT RUN, -2203,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet5 = 'up',NOT RUN, +2203,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet5 = 'up',NOT RUN, 2204,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf3b.arista.com_Ethernet3 = 'up',NOT RUN, 2205,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf3b.arista.com_Ethernet4 = 'up',NOT RUN, 2206,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, @@ -2218,10 +2218,10 @@ id,dut,categories,test,description,inputs,result,messages 2217,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 2218,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 2219,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -2220,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -2221,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -2222,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -2223,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +2220,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +2221,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +2222,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +2223,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 2224,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 2225,dc2-leaf3a.arista.com,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 2226,dc2-leaf3a.arista.com,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -2362,9 +2362,9 @@ id,dut,categories,test,description,inputs,result,messages 2361,dc2-leaf3b.arista.com,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 2362,dc2-leaf3b.arista.com,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 2363,dc2-leaf3b.arista.com,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -2364,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet6 = 'up',NOT RUN, +2364,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-spine1_Ethernet6 = 'up',NOT RUN, 2365,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet11 - dc2-leaf3-fw1_e1 = 'adminDown',NOT RUN, -2366,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet6 = 'up',NOT RUN, +2366,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-spine2_Ethernet6 = 'up',NOT RUN, 2367,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_dc2-leaf3a.arista.com_Ethernet3 = 'up',NOT RUN, 2368,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_dc2-leaf3a.arista.com_Ethernet4 = 'up',NOT RUN, 2369,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, @@ -2377,10 +2377,10 @@ id,dut,categories,test,description,inputs,result,messages 2376,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan12 - VRF10_VLAN12 = 'up',NOT RUN, 2377,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan21 - VRF11_VLAN21 = 'up',NOT RUN, 2378,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan22 - VRF11_VLAN22 = 'up',NOT RUN, -2379,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up',NOT RUN, -2380,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up',NOT RUN, -2381,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up',NOT RUN, -2382,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG_PEER = 'up',NOT RUN, +2379,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up',NOT RUN, +2380,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up',NOT RUN, +2381,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4093 - MLAG_L3 = 'up',NOT RUN, +2382,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vlan4094 - MLAG = 'up',NOT RUN, 2383,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Vxlan1 = 'up',NOT RUN, 2384,dc2-leaf3b.arista.com,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 2385,dc2-leaf3b.arista.com,Logging,VerifyLoggingAccounting,Verifies if AAA accounting logs are generated.,,NOT RUN, @@ -2517,12 +2517,12 @@ id,dut,categories,test,description,inputs,result,messages 2516,dc2-spine1,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 2517,dc2-spine1,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 2518,dc2-spine1,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -2519,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet1 = 'up',NOT RUN, -2520,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet1 = 'up',NOT RUN, -2521,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet1 = 'up',NOT RUN, -2522,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet1 = 'up',NOT RUN, -2523,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet1 = 'up',NOT RUN, -2524,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet1 = 'up',NOT RUN, +2519,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet1 = 'up',NOT RUN, +2520,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet1 = 'up',NOT RUN, +2521,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet1 = 'up',NOT RUN, +2522,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet1 = 'up',NOT RUN, +2523,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet1 = 'up',NOT RUN, +2524,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet1 = 'up',NOT RUN, 2525,dc2-spine1,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 2526,dc2-spine1,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 2527,dc2-spine1,PTP,VerifyPtpGMStatus,Verifies that the device is locked to a valid PTP Grandmaster.,,NOT RUN, @@ -2615,12 +2615,12 @@ id,dut,categories,test,description,inputs,result,messages 2614,dc2-spine2,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,,NOT RUN, 2615,dc2-spine2,Hardware,VerifyTransceiversManufacturers,Verifies if all transceivers come from approved manufacturers.,"Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present'",NOT RUN, 2616,dc2-spine2,Hardware,VerifyTransceiversTemperature,Verifies the transceivers temperature.,,NOT RUN, -2617,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet2 = 'up',NOT RUN, -2618,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet2 = 'up',NOT RUN, -2619,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet2 = 'up',NOT RUN, -2620,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet2 = 'up',NOT RUN, -2621,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet2 = 'up',NOT RUN, -2622,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet2 = 'up',NOT RUN, +2617,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet2 = 'up',NOT RUN, +2618,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet2 = 'up',NOT RUN, +2619,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet2 = 'up',NOT RUN, +2620,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet2 = 'up',NOT RUN, +2621,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet2 = 'up',NOT RUN, +2622,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet2 = 'up',NOT RUN, 2623,dc2-spine2,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN, 2624,dc2-spine2,LANZ,VerifyLANZ,Verifies if LANZ is enabled.,,NOT RUN, 2625,dc2-spine2,PTP,VerifyPtpGMStatus,Verifies that the device is locked to a valid PTP Grandmaster.,,NOT RUN, diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md index a0fa9295d2f..37d35478371 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md @@ -141,13 +141,13 @@ | 58 | dc1-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 59 | dc1-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arastra, Inc.', 'Arista Networks', 'Generic', 'Not Present' | NOT RUN | - | | 60 | dc1-leaf1a | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 61 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet1 = 'up' | NOT RUN | - | -| 62 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet1 = 'up' | NOT RUN | - | +| 61 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-spine1_Ethernet1 = 'up' | NOT RUN | - | +| 62 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-spine2_Ethernet1 = 'up' | NOT RUN | - | | 63 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc1-leaf1b_Ethernet3 = 'up' | NOT RUN | - | | 64 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc1-leaf1b_Ethernet4 = 'up' | NOT RUN | - | | 65 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc1-leaf1-server1_PCI1 = 'up' | NOT RUN | - | -| 66 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet1 = 'up' | NOT RUN | - | -| 67 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet1 = 'up' | NOT RUN | - | +| 66 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-wan1_Ethernet1 = 'up' | NOT RUN | - | +| 67 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_dc1-wan2_Ethernet1 = 'up' | NOT RUN | - | | 68 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC1-LEAF1C_Ethernet1 = 'up' | NOT RUN | - | | 69 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 70 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | @@ -160,11 +160,11 @@ | 77 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 78 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 79 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 80 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 81 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | +| 80 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 81 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | | 82 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4085 - Inband Management = 'up' | NOT RUN | - | -| 83 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 84 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 83 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 84 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 85 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 86 | dc1-leaf1a | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 87 | dc1-leaf1a | MLAG | VerifyMlagStatus | Verifies the health status of the MLAG configuration. | - | NOT RUN | - | @@ -300,13 +300,13 @@ | 217 | dc1-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 218 | dc1-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 219 | dc1-leaf1b | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 220 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet2 = 'up' | NOT RUN | - | -| 221 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet2 = 'up' | NOT RUN | - | +| 220 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-spine1_Ethernet2 = 'up' | NOT RUN | - | +| 221 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-spine2_Ethernet2 = 'up' | NOT RUN | - | | 222 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc1-leaf1a_Ethernet3 = 'up' | NOT RUN | - | | 223 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc1-leaf1a_Ethernet4 = 'up' | NOT RUN | - | | 224 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc1-leaf1-server1_PCI2 = 'up' | NOT RUN | - | -| 225 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet2 = 'up' | NOT RUN | - | -| 226 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet2 = 'up' | NOT RUN | - | +| 225 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-wan1_Ethernet2 = 'up' | NOT RUN | - | +| 226 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_dc1-wan2_Ethernet2 = 'up' | NOT RUN | - | | 227 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC1-LEAF1C_Ethernet2 = 'up' | NOT RUN | - | | 228 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 229 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | @@ -319,11 +319,11 @@ | 236 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 237 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 238 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 239 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 240 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | +| 239 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 240 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | | 241 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4085 - Inband Management = 'up' | NOT RUN | - | -| 242 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 243 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 242 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 243 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 244 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 245 | dc1-leaf1b | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 246 | dc1-leaf1b | MLAG | VerifyMlagStatus | Verifies the health status of the MLAG configuration. | - | NOT RUN | - | @@ -536,12 +536,12 @@ | 453 | dc1-leaf2a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 454 | dc1-leaf2a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 455 | dc1-leaf2a | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 456 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet3 = 'up' | NOT RUN | - | -| 457 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet3 = 'up' | NOT RUN | - | +| 456 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-spine1_Ethernet3 = 'up' | NOT RUN | - | +| 457 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-spine2_Ethernet3 = 'up' | NOT RUN | - | | 458 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc1-leaf2b_Ethernet3 = 'up' | NOT RUN | - | | 459 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc1-leaf2b_Ethernet4 = 'up' | NOT RUN | - | | 460 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc1-leaf2-server1_PCI1 = 'up' | NOT RUN | - | -| 461 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_dc2-leaf2a_Ethernet6 = 'up' | NOT RUN | - | +| 461 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc2-leaf2a_Ethernet6 = 'up' | NOT RUN | - | | 462 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC1-LEAF2C_Ethernet1 = 'up' | NOT RUN | - | | 463 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 464 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | @@ -554,11 +554,11 @@ | 471 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 472 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 473 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 474 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 475 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | +| 474 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 475 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | | 476 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4085 - Inband Management = 'up' | NOT RUN | - | -| 477 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 478 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 477 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 478 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 479 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 480 | dc1-leaf2a | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 481 | dc1-leaf2a | MLAG | VerifyMlagStatus | Verifies the health status of the MLAG configuration. | - | NOT RUN | - | @@ -796,12 +796,12 @@ | 713 | dc1-spine1 | Interfaces | VerifyInterfaceErrDisabled | Verifies there are no interfaces in the errdisabled state. | - | NOT RUN | - | | 714 | dc1-spine1 | Interfaces | VerifyInterfaceErrors | Verifies there are no interface error counters. | - | NOT RUN | - | | 715 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | - | NOT RUN | - | -| 716 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet1 = 'up' | NOT RUN | - | -| 717 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet1 = 'up' | NOT RUN | - | -| 718 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet1 = 'up' | NOT RUN | - | -| 719 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet1 = 'adminDown' | NOT RUN | - | -| 720 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet1 = 'up' | NOT RUN | - | -| 721 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet1 = 'up' | NOT RUN | - | +| 716 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet1 = 'up' | NOT RUN | - | +| 717 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet1 = 'up' | NOT RUN | - | +| 718 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet1 = 'up' | NOT RUN | - | +| 719 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet1 = 'adminDown' | NOT RUN | - | +| 720 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet1 = 'up' | NOT RUN | - | +| 721 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet1 = 'up' | NOT RUN | - | | 722 | dc1-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 723 | dc1-spine1 | Interfaces | VerifyInterfaceUtilization | Verifies that the utilization of interfaces is below a certain threshold. | - | NOT RUN | - | | 724 | dc1-spine1 | Interfaces | VerifyIPProxyARP | Verifies if Proxy ARP is enabled. | - | NOT RUN | - | @@ -912,12 +912,12 @@ | 829 | dc1-spine2 | Interfaces | VerifyInterfaceErrDisabled | Verifies there are no interfaces in the errdisabled state. | - | NOT RUN | - | | 830 | dc1-spine2 | Interfaces | VerifyInterfaceErrors | Verifies there are no interface error counters. | - | NOT RUN | - | | 831 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | - | NOT RUN | - | -| 832 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet2 = 'up' | NOT RUN | - | -| 833 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet2 = 'up' | NOT RUN | - | -| 834 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet2 = 'up' | NOT RUN | - | -| 835 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet2 = 'adminDown' | NOT RUN | - | -| 836 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet2 = 'up' | NOT RUN | - | -| 837 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet2 = 'up' | NOT RUN | - | +| 832 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet2 = 'up' | NOT RUN | - | +| 833 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet2 = 'up' | NOT RUN | - | +| 834 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet2 = 'up' | NOT RUN | - | +| 835 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet2 = 'adminDown' | NOT RUN | - | +| 836 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet2 = 'up' | NOT RUN | - | +| 837 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet2 = 'up' | NOT RUN | - | | 838 | dc1-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 839 | dc1-spine2 | Interfaces | VerifyInterfaceUtilization | Verifies that the utilization of interfaces is below a certain threshold. | - | NOT RUN | - | | 840 | dc1-spine2 | Interfaces | VerifyIPProxyARP | Verifies if Proxy ARP is enabled. | - | NOT RUN | - | @@ -1027,15 +1027,15 @@ | 944 | dc1-svc-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 945 | dc1-svc-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 946 | dc1-svc-leaf1a | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 947 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet5 = 'up' | NOT RUN | - | -| 948 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet5 = 'up' | NOT RUN | - | +| 947 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-spine1_Ethernet5 = 'up' | NOT RUN | - | +| 948 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-spine2_Ethernet5 = 'up' | NOT RUN | - | | 949 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc1-svc-leaf1b_Ethernet3 = 'up' | NOT RUN | - | | 950 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc1-svc-leaf1b_Ethernet4 = 'up' | NOT RUN | - | | 951 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 952 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | | 953 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_dc1-svc-leaf1b_Port-Channel3 = 'up' | NOT RUN | - | -| 954 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 955 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 954 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 955 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 956 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 957 | dc1-svc-leaf1a | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 958 | dc1-svc-leaf1a | MLAG | VerifyMlagStatus | Verifies the health status of the MLAG configuration. | - | NOT RUN | - | @@ -1156,15 +1156,15 @@ | 1073 | dc1-svc-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 1074 | dc1-svc-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1075 | dc1-svc-leaf1b | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 1076 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet6 = 'up' | NOT RUN | - | -| 1077 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet6 = 'up' | NOT RUN | - | +| 1076 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-spine1_Ethernet6 = 'up' | NOT RUN | - | +| 1077 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-spine2_Ethernet6 = 'up' | NOT RUN | - | | 1078 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc1-svc-leaf1a_Ethernet3 = 'up' | NOT RUN | - | | 1079 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc1-svc-leaf1a_Ethernet4 = 'up' | NOT RUN | - | | 1080 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 1081 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | | 1082 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_dc1-svc-leaf1a_Port-Channel3 = 'up' | NOT RUN | - | -| 1083 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 1084 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 1083 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 1084 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 1085 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 1086 | dc1-svc-leaf1b | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 1087 | dc1-svc-leaf1b | MLAG | VerifyMlagStatus | Verifies the health status of the MLAG configuration. | - | NOT RUN | - | @@ -1275,8 +1275,8 @@ | 1192 | dc1-wan1 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1193 | dc1-wan1 | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | | 1194 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Dps1 - DPS Interface = 'up' | NOT RUN | - | -| 1195 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet6 = 'up' | NOT RUN | - | -| 1196 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet6 = 'up' | NOT RUN | - | +| 1195 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet6 = 'up' | NOT RUN | - | +| 1196 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet6 = 'up' | NOT RUN | - | | 1197 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - mpls-sp-1_DC1-MPLS-3 = 'up' | NOT RUN | - | | 1198 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - isp-1_DC1-INET-3 = 'up' | NOT RUN | - | | 1199 | dc1-wan1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | @@ -1371,8 +1371,8 @@ | 1288 | dc1-wan2 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1289 | dc1-wan2 | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | | 1290 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Dps1 - DPS Interface = 'up' | NOT RUN | - | -| 1291 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet7 = 'up' | NOT RUN | - | -| 1292 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet7 = 'up' | NOT RUN | - | +| 1291 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet7 = 'up' | NOT RUN | - | +| 1292 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet7 = 'up' | NOT RUN | - | | 1293 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - mpls-sp-1_DC1-MPLS-4 = 'up' | NOT RUN | - | | 1294 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - isp-1_DC1-INET-4 = 'up' | NOT RUN | - | | 1295 | dc1-wan2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | @@ -1478,8 +1478,8 @@ | 1395 | dc2-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 1396 | dc2-leaf1a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1397 | dc2-leaf1a | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 1398 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet1 = 'up' | NOT RUN | - | -| 1399 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet1 = 'up' | NOT RUN | - | +| 1398 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet1 = 'up' | NOT RUN | - | +| 1399 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet1 = 'up' | NOT RUN | - | | 1400 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf1b_Ethernet3 = 'up' | NOT RUN | - | | 1401 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf1b_Ethernet4 = 'up' | NOT RUN | - | | 1402 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc2-leaf1-server1_PCI1 = 'up' | NOT RUN | - | @@ -1495,10 +1495,10 @@ | 1412 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 1413 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 1414 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 1415 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 1416 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 1417 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 1418 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 1415 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 1416 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 1417 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 1418 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 1419 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 1420 | dc2-leaf1a | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 1421 | dc2-leaf1a | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -1640,8 +1640,8 @@ | 1557 | dc2-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 1558 | dc2-leaf1b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1559 | dc2-leaf1b | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 1560 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet2 = 'up' | NOT RUN | - | -| 1561 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet2 = 'up' | NOT RUN | - | +| 1560 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet2 = 'up' | NOT RUN | - | +| 1561 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet2 = 'up' | NOT RUN | - | | 1562 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf1a_Ethernet3 = 'up' | NOT RUN | - | | 1563 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf1a_Ethernet4 = 'up' | NOT RUN | - | | 1564 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc2-leaf1-server1_PCI2 = 'up' | NOT RUN | - | @@ -1657,10 +1657,10 @@ | 1574 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 1575 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 1576 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 1577 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 1578 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 1579 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 1580 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 1577 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 1578 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 1579 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 1580 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 1581 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 1582 | dc2-leaf1b | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 1583 | dc2-leaf1b | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -1878,12 +1878,12 @@ | 1795 | dc2-leaf2a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 1796 | dc2-leaf2a | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1797 | dc2-leaf2a | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 1798 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet3 = 'up' | NOT RUN | - | -| 1799 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet3 = 'up' | NOT RUN | - | +| 1798 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet3 = 'up' | NOT RUN | - | +| 1799 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet3 = 'up' | NOT RUN | - | | 1800 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf2b_Ethernet3 = 'up' | NOT RUN | - | | 1801 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf2b_Ethernet4 = 'up' | NOT RUN | - | | 1802 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc2-leaf2-server1_PCI1 = 'up' | NOT RUN | - | -| 1803 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2a_Ethernet6 = 'up' | NOT RUN | - | +| 1803 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-leaf2a_Ethernet6 = 'up' | NOT RUN | - | | 1804 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC2-LEAF2C_Ethernet1 = 'up' | NOT RUN | - | | 1805 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 1806 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | @@ -1896,10 +1896,10 @@ | 1813 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 1814 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 1815 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 1816 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 1817 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 1818 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 1819 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 1816 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 1817 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 1818 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 1819 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 1820 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 1821 | dc2-leaf2a | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 1822 | dc2-leaf2a | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -2041,12 +2041,12 @@ | 1958 | dc2-leaf2b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 1959 | dc2-leaf2b | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 1960 | dc2-leaf2b | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 1961 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet4 = 'up' | NOT RUN | - | -| 1962 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet4 = 'up' | NOT RUN | - | +| 1961 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet4 = 'up' | NOT RUN | - | +| 1962 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet4 = 'up' | NOT RUN | - | | 1963 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf2a_Ethernet3 = 'up' | NOT RUN | - | | 1964 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf2a_Ethernet4 = 'up' | NOT RUN | - | | 1965 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - SERVER_dc2-leaf2-server1_PCI2 = 'up' | NOT RUN | - | -| 1966 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2b_Ethernet6 = 'up' | NOT RUN | - | +| 1966 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc1-leaf2b_Ethernet6 = 'up' | NOT RUN | - | | 1967 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC2-LEAF2C_Ethernet2 = 'up' | NOT RUN | - | | 1968 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 1969 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - | @@ -2059,10 +2059,10 @@ | 1976 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 1977 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 1978 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 1979 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 1980 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 1981 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 1982 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 1979 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 1980 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 1981 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 1982 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 1983 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 1984 | dc2-leaf2b | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 1985 | dc2-leaf2b | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -2277,13 +2277,13 @@ | 2194 | dc2-leaf3a.arista.com | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 2195 | dc2-leaf3a.arista.com | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 2196 | dc2-leaf3a.arista.com | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 2197 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet5 = 'up' | NOT RUN | - | +| 2197 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet5 = 'up' | NOT RUN | - | | 2198 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet11 - dc2-leaf3-fw1_e1 = 'up' | NOT RUN | - | | 2199 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet12 - Test_mode_and_vlans = 'up' | NOT RUN | - | | 2200 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet13 - Test_native_vlan_and_trunk_groups = 'up' | NOT RUN | - | | 2201 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet14 - Test_phone = 'up' | NOT RUN | - | | 2202 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet15 - Test_type_routed = 'up' | NOT RUN | - | -| 2203 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet5 = 'up' | NOT RUN | - | +| 2203 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet5 = 'up' | NOT RUN | - | | 2204 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf3b.arista.com_Ethernet3 = 'up' | NOT RUN | - | | 2205 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf3b.arista.com_Ethernet4 = 'up' | NOT RUN | - | | 2206 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | @@ -2300,10 +2300,10 @@ | 2217 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 2218 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 2219 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 2220 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 2221 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 2222 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 2223 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 2220 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 2221 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 2222 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 2223 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 2224 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 2225 | dc2-leaf3a.arista.com | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 2226 | dc2-leaf3a.arista.com | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -2444,9 +2444,9 @@ | 2361 | dc2-leaf3b.arista.com | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 2362 | dc2-leaf3b.arista.com | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 2363 | dc2-leaf3b.arista.com | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 2364 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet6 = 'up' | NOT RUN | - | +| 2364 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-spine1_Ethernet6 = 'up' | NOT RUN | - | | 2365 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet11 - dc2-leaf3-fw1_e1 = 'adminDown' | NOT RUN | - | -| 2366 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet6 = 'up' | NOT RUN | - | +| 2366 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-spine2_Ethernet6 = 'up' | NOT RUN | - | | 2367 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_dc2-leaf3a.arista.com_Ethernet3 = 'up' | NOT RUN | - | | 2368 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_dc2-leaf3a.arista.com_Ethernet4 = 'up' | NOT RUN | - | | 2369 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | @@ -2459,10 +2459,10 @@ | 2376 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan12 - VRF10_VLAN12 = 'up' | NOT RUN | - | | 2377 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan21 - VRF11_VLAN21 = 'up' | NOT RUN | - | | 2378 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan22 - VRF11_VLAN22 = 'up' | NOT RUN | - | -| 2379 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up' | NOT RUN | - | -| 2380 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up' | NOT RUN | - | -| 2381 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up' | NOT RUN | - | -| 2382 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG_PEER = 'up' | NOT RUN | - | +| 2379 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up' | NOT RUN | - | +| 2380 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up' | NOT RUN | - | +| 2381 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4093 - MLAG_L3 = 'up' | NOT RUN | - | +| 2382 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vlan4094 - MLAG = 'up' | NOT RUN | - | | 2383 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Vxlan1 = 'up' | NOT RUN | - | | 2384 | dc2-leaf3b.arista.com | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 2385 | dc2-leaf3b.arista.com | Logging | VerifyLoggingAccounting | Verifies if AAA accounting logs are generated. | - | NOT RUN | - | @@ -2599,12 +2599,12 @@ | 2516 | dc2-spine1 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 2517 | dc2-spine1 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 2518 | dc2-spine1 | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 2519 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet1 = 'up' | NOT RUN | - | -| 2520 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet1 = 'up' | NOT RUN | - | -| 2521 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet1 = 'up' | NOT RUN | - | -| 2522 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet1 = 'up' | NOT RUN | - | -| 2523 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet1 = 'up' | NOT RUN | - | -| 2524 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet1 = 'up' | NOT RUN | - | +| 2519 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet1 = 'up' | NOT RUN | - | +| 2520 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet1 = 'up' | NOT RUN | - | +| 2521 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet1 = 'up' | NOT RUN | - | +| 2522 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet1 = 'up' | NOT RUN | - | +| 2523 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet1 = 'up' | NOT RUN | - | +| 2524 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet1 = 'up' | NOT RUN | - | | 2525 | dc2-spine1 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 2526 | dc2-spine1 | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 2527 | dc2-spine1 | PTP | VerifyPtpGMStatus | Verifies that the device is locked to a valid PTP Grandmaster. | - | NOT RUN | - | @@ -2697,12 +2697,12 @@ | 2614 | dc2-spine2 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | - | NOT RUN | - | | 2615 | dc2-spine2 | Hardware | VerifyTransceiversManufacturers | Verifies if all transceivers come from approved manufacturers. | Accepted Manufacturers: 'Arista Networks', 'Arastra, Inc.', 'Not Present' | NOT RUN | - | | 2616 | dc2-spine2 | Hardware | VerifyTransceiversTemperature | Verifies the transceivers temperature. | - | NOT RUN | - | -| 2617 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet2 = 'up' | NOT RUN | - | -| 2618 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet2 = 'up' | NOT RUN | - | -| 2619 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet2 = 'up' | NOT RUN | - | -| 2620 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet2 = 'up' | NOT RUN | - | -| 2621 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet2 = 'up' | NOT RUN | - | -| 2622 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet2 = 'up' | NOT RUN | - | +| 2617 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet2 = 'up' | NOT RUN | - | +| 2618 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet2 = 'up' | NOT RUN | - | +| 2619 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet2 = 'up' | NOT RUN | - | +| 2620 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet2 = 'up' | NOT RUN | - | +| 2621 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet2 = 'up' | NOT RUN | - | +| 2622 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet2 = 'up' | NOT RUN | - | | 2623 | dc2-spine2 | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - | | 2624 | dc2-spine2 | LANZ | VerifyLANZ | Verifies if LANZ is enabled. | - | NOT RUN | - | | 2625 | dc2-spine2 | PTP | VerifyPtpGMStatus | Verifies that the device is locked to a valid PTP Grandmaster. | - | NOT RUN | - | diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1a-results.json index 618d9c1ee0a..b5c9ad827a2 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1a-results.json @@ -525,7 +525,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-spine1_Ethernet1 = 'up'" }, { "name": "dc1-leaf1a", @@ -534,7 +534,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-spine2_Ethernet1 = 'up'" }, { "name": "dc1-leaf1a", @@ -570,7 +570,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-wan1_Ethernet1 = 'up'" }, { "name": "dc1-leaf1a", @@ -579,7 +579,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet7 - P2P_dc1-wan2_Ethernet1 = 'up'" }, { "name": "dc1-leaf1a", @@ -696,7 +696,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc1-leaf1a", @@ -705,7 +705,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc1-leaf1a", @@ -723,7 +723,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc1-leaf1a", @@ -732,7 +732,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc1-leaf1a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1b-results.json index 0d750c6bb43..a2781ed408f 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf1b-results.json @@ -516,7 +516,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-spine1_Ethernet2 = 'up'" }, { "name": "dc1-leaf1b", @@ -525,7 +525,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-spine2_Ethernet2 = 'up'" }, { "name": "dc1-leaf1b", @@ -561,7 +561,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC1-WAN1_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-wan1_Ethernet2 = 'up'" }, { "name": "dc1-leaf1b", @@ -570,7 +570,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet7 - P2P_LINK_TO_DC1-WAN2_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet7 - P2P_dc1-wan2_Ethernet2 = 'up'" }, { "name": "dc1-leaf1b", @@ -687,7 +687,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc1-leaf1b", @@ -696,7 +696,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc1-leaf1b", @@ -714,7 +714,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc1-leaf1b", @@ -723,7 +723,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc1-leaf1b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf2a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf2a-results.json index d63c2b9c054..350b22803eb 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf2a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-leaf2a-results.json @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet3 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-spine1_Ethernet3 = 'up'" }, { "name": "dc1-leaf2a", @@ -480,7 +480,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet3 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-spine2_Ethernet3 = 'up'" }, { "name": "dc1-leaf2a", @@ -516,7 +516,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_dc2-leaf2a_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc2-leaf2a_Ethernet6 = 'up'" }, { "name": "dc1-leaf2a", @@ -633,7 +633,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc1-leaf2a", @@ -642,7 +642,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc1-leaf2a", @@ -660,7 +660,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc1-leaf2a", @@ -669,7 +669,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc1-leaf2a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine1-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine1-results.json index f58193d31fc..ba1e85f4725 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine1-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine1-results.json @@ -443,7 +443,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet1 = 'up'" }, { "name": "dc1-spine1", @@ -452,7 +452,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet1 = 'up'" }, { "name": "dc1-spine1", @@ -461,7 +461,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet1 = 'up'" }, { "name": "dc1-spine1", @@ -470,7 +470,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet1 = 'adminDown'" + "custom_field": "Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet1 = 'adminDown'" }, { "name": "dc1-spine1", @@ -479,7 +479,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet1 = 'up'" }, { "name": "dc1-spine1", @@ -488,7 +488,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet1 = 'up'" }, { "name": "dc1-spine1", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine2-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine2-results.json index 72a509118ca..1a21d9132d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine2-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-spine2-results.json @@ -443,7 +443,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet2 = 'up'" }, { "name": "dc1-spine2", @@ -452,7 +452,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet2 = 'up'" }, { "name": "dc1-spine2", @@ -461,7 +461,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet3 - P2P_LINK_TO_DC1-LEAF2A_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet3 - P2P_dc1-leaf2a_Ethernet2 = 'up'" }, { "name": "dc1-spine2", @@ -470,7 +470,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet4 - P2P_LINK_TO_DC1-LEAF2B_Ethernet2 = 'adminDown'" + "custom_field": "Interface Ethernet4 - P2P_dc1-leaf2b_Ethernet2 = 'adminDown'" }, { "name": "dc1-spine2", @@ -479,7 +479,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet5 - P2P_LINK_TO_DC1-SVC-LEAF1A_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet5 - P2P_dc1-svc-leaf1a_Ethernet2 = 'up'" }, { "name": "dc1-spine2", @@ -488,7 +488,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC1-SVC-LEAF1B_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-svc-leaf1b_Ethernet2 = 'up'" }, { "name": "dc1-spine2", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1a-results.json index d4bcb076f72..f8130de051c 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1a-results.json @@ -453,7 +453,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet5 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-spine1_Ethernet5 = 'up'" }, { "name": "dc1-svc-leaf1a", @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet5 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-spine2_Ethernet5 = 'up'" }, { "name": "dc1-svc-leaf1a", @@ -516,7 +516,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc1-svc-leaf1a", @@ -525,7 +525,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc1-svc-leaf1a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1b-results.json index b205df873e1..8f0d81b3934 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-svc-leaf1b-results.json @@ -453,7 +453,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-SPINE1_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-spine1_Ethernet6 = 'up'" }, { "name": "dc1-svc-leaf1b", @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-SPINE2_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-spine2_Ethernet6 = 'up'" }, { "name": "dc1-svc-leaf1b", @@ -516,7 +516,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc1-svc-leaf1b", @@ -525,7 +525,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc1-svc-leaf1b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan1-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan1-results.json index f2b3987fa79..bf5233848f3 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan1-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan1-results.json @@ -363,7 +363,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet6 = 'up'" }, { "name": "dc1-wan1", @@ -372,7 +372,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet6 = 'up'" }, { "name": "dc1-wan1", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan2-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan2-results.json index ee34df2593a..ec8b0607d61 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan2-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc1-wan2-results.json @@ -363,7 +363,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC1-LEAF1A_Ethernet7 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc1-leaf1a_Ethernet7 = 'up'" }, { "name": "dc1-wan2", @@ -372,7 +372,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC1-LEAF1B_Ethernet7 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc1-leaf1b_Ethernet7 = 'up'" }, { "name": "dc1-wan2", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json index 6061047ee13..a599392a08c 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet1 = 'up'" }, { "name": "dc2-leaf1a", @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet1 = 'up'" }, { "name": "dc2-leaf1a", @@ -615,7 +615,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf1a", @@ -624,7 +624,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf1a", @@ -633,7 +633,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf1a", @@ -642,7 +642,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf1a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json index 402eadd9d2b..5d423b9c129 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet2 = 'up'" }, { "name": "dc2-leaf1b", @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet2 = 'up'" }, { "name": "dc2-leaf1b", @@ -615,7 +615,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf1b", @@ -624,7 +624,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf1b", @@ -633,7 +633,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf1b", @@ -642,7 +642,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf1b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json index 69862eea725..fef15a951d0 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json @@ -498,7 +498,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet3 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet3 = 'up'" }, { "name": "dc2-leaf2a", @@ -507,7 +507,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet3 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet3 = 'up'" }, { "name": "dc2-leaf2a", @@ -543,7 +543,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2a_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-leaf2a_Ethernet6 = 'up'" }, { "name": "dc2-leaf2a", @@ -660,7 +660,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf2a", @@ -669,7 +669,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf2a", @@ -678,7 +678,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf2a", @@ -687,7 +687,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf2a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json index ac2d9692f45..338cda62926 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet4 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet4 = 'up'" }, { "name": "dc2-leaf2b", @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet4 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet4 = 'up'" }, { "name": "dc2-leaf2b", @@ -507,7 +507,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_dc1-leaf2b_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc1-leaf2b_Ethernet6 = 'up'" }, { "name": "dc2-leaf2b", @@ -624,7 +624,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf2b", @@ -633,7 +633,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf2b", @@ -642,7 +642,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf2b", @@ -651,7 +651,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf2b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json index 9a10398e222..0982f9a0828 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet5 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet5 = 'up'" }, { "name": "dc2-leaf3a.arista.com", @@ -525,7 +525,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet5 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet5 = 'up'" }, { "name": "dc2-leaf3a.arista.com", @@ -678,7 +678,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf3a.arista.com", @@ -687,7 +687,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf3a.arista.com", @@ -696,7 +696,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf3a.arista.com", @@ -705,7 +705,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf3a.arista.com", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json index 2fff03d8d01..dfa25a97bc4 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json @@ -453,7 +453,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-SPINE1_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-spine1_Ethernet6 = 'up'" }, { "name": "dc2-leaf3b.arista.com", @@ -471,7 +471,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-SPINE2_Ethernet6 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet6 = 'up'" }, { "name": "dc2-leaf3b.arista.com", @@ -588,7 +588,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3009 - MLAG_PEER_L3_iBGP: vrf VRF10 = 'up'" + "custom_field": "Interface Vlan3009 - MLAG_L3_VRF_VRF10 = 'up'" }, { "name": "dc2-leaf3b.arista.com", @@ -597,7 +597,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan3010 - MLAG_PEER_L3_iBGP: vrf VRF11 = 'up'" + "custom_field": "Interface Vlan3010 - MLAG_L3_VRF_VRF11 = 'up'" }, { "name": "dc2-leaf3b.arista.com", @@ -606,7 +606,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4093 - MLAG_PEER_L3_PEERING = 'up'" + "custom_field": "Interface Vlan4093 - MLAG_L3 = 'up'" }, { "name": "dc2-leaf3b.arista.com", @@ -615,7 +615,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Vlan4094 - MLAG_PEER = 'up'" + "custom_field": "Interface Vlan4094 - MLAG = 'up'" }, { "name": "dc2-leaf3b.arista.com", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine1-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine1-results.json index acaa3653b09..5b1a3bb83e5 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine1-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine1-results.json @@ -417,7 +417,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet1 = 'up'" }, { "name": "dc2-spine1", @@ -426,7 +426,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet1 = 'up'" }, { "name": "dc2-spine1", @@ -435,7 +435,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet1 = 'up'" }, { "name": "dc2-spine1", @@ -444,7 +444,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet1 = 'up'" }, { "name": "dc2-spine1", @@ -453,7 +453,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet1 = 'up'" }, { "name": "dc2-spine1", @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet1 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet1 = 'up'" }, { "name": "dc2-spine1", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine2-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine2-results.json index a182e7a863b..922ed7dd991 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine2-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-spine2-results.json @@ -417,7 +417,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet1 - P2P_LINK_TO_DC2-LEAF1A_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet1 - P2P_dc2-leaf1a_Ethernet2 = 'up'" }, { "name": "dc2-spine2", @@ -426,7 +426,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet2 - P2P_LINK_TO_DC2-LEAF1B_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet2 - P2P_dc2-leaf1b_Ethernet2 = 'up'" }, { "name": "dc2-spine2", @@ -435,7 +435,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet3 - P2P_LINK_TO_DC2-LEAF2A_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet3 - P2P_dc2-leaf2a_Ethernet2 = 'up'" }, { "name": "dc2-spine2", @@ -444,7 +444,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet4 - P2P_LINK_TO_DC2-LEAF2B_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet4 - P2P_dc2-leaf2b_Ethernet2 = 'up'" }, { "name": "dc2-spine2", @@ -453,7 +453,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet5 - P2P_LINK_TO_DC2-LEAF3A.ARISTA.COM_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet5 - P2P_dc2-leaf3a.arista.com_Ethernet2 = 'up'" }, { "name": "dc2-spine2", @@ -462,7 +462,7 @@ "interfaces" ], "description": "Verifies the status of the provided interfaces.", - "custom_field": "Interface Ethernet6 - P2P_LINK_TO_DC2-LEAF3B.ARISTA.COM_Ethernet2 = 'up'" + "custom_field": "Interface Ethernet6 - P2P_dc2-leaf3b.arista.com_Ethernet2 = 'up'" }, { "name": "dc2-spine2", diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md index 7df95897977..9ef2e1bca6e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -213,8 +213,8 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -706,16 +706,16 @@ router bgp 65104 neighbor 172.31.255.86 description DC1-SPINE4_Ethernet6 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -845,8 +845,9 @@ router bfd ```eos ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying +! +queue-monitor length log 5 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md index 49452c8a3c7..f0a26bc742d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -211,8 +211,8 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -704,16 +704,16 @@ router bgp 65105 neighbor 172.31.255.102 description DC1-SPINE4_Ethernet7 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone @@ -843,8 +843,9 @@ router bfd ```eos ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying +! +queue-monitor length log 5 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1A.md index 74adcded392..a050a3409bd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1A.md @@ -277,7 +277,7 @@ vlan internal order ascending range 1006 1199 | 160 | Tenant_A_VMOTION | - | | 161 | Tenant_A_NFS | - | | 162 | Tenant_A_FTP | - | -| 4091 | MLAG_PEER | MLAG | +| 4091 | MLAG | MLAG | ### VLANs Device Configuration @@ -320,7 +320,7 @@ vlan 162 name Tenant_A_FTP ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -374,7 +374,7 @@ interface Ethernet4 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | CUSTOM_DC1_LEAF2_Po7 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | 1 | - | +| Port-Channel1 | CUSTOM_DC1-LEAF2A_Po7 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | 1 | - | | Port-Channel3 | MLAG_DC1-L2LEAF1B_Port-Channel3 | trunk | - | - | MLAG | - | - | - | - | #### Port-Channel Interfaces Device Configuration @@ -382,7 +382,7 @@ interface Ethernet4 ```eos ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po7 + description CUSTOM_DC1-LEAF2A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -403,7 +403,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4091 | MLAG_PEER | default | 1500 | False | +| Vlan4091 | MLAG | default | 1500 | False | ##### IPv4 @@ -416,7 +416,7 @@ interface Port-Channel3 ```eos ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -486,6 +486,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1B.md index c3a22cf3525..ef0cb7b894c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1B.md @@ -277,7 +277,7 @@ vlan internal order ascending range 1006 1199 | 160 | Tenant_A_VMOTION | - | | 161 | Tenant_A_NFS | - | | 162 | Tenant_A_FTP | - | -| 4091 | MLAG_PEER | MLAG | +| 4091 | MLAG | MLAG | ### VLANs Device Configuration @@ -320,7 +320,7 @@ vlan 162 name Tenant_A_FTP ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -374,7 +374,7 @@ interface Ethernet4 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | CUSTOM_DC1_LEAF2_Po7 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | 1 | - | +| Port-Channel1 | CUSTOM_DC1-LEAF2A_Po7 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | 1 | - | | Port-Channel3 | MLAG_DC1-L2LEAF1A_Port-Channel3 | trunk | - | - | MLAG | - | - | - | - | #### Port-Channel Interfaces Device Configuration @@ -382,7 +382,7 @@ interface Ethernet4 ```eos ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po7 + description CUSTOM_DC1-LEAF2A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -403,7 +403,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4091 | MLAG_PEER | default | 1500 | False | +| Vlan4091 | MLAG | default | 1500 | False | ##### IPv4 @@ -416,7 +416,7 @@ interface Port-Channel3 ```eos ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -486,6 +486,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md index fc0cb67b6c6..09ded295018 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md @@ -288,7 +288,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4091 | MLAG_PEER | MLAG | +| 4091 | MLAG | MLAG | ### VLANs Device Configuration @@ -358,7 +358,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -412,7 +412,7 @@ interface Ethernet4 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | CUSTOM_DC1_SVC3_Po7 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 1 | - | +| Port-Channel1 | CUSTOM_DC1-SVC3A_Po7 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 1 | - | | Port-Channel3 | MLAG_DC1-L2LEAF2B_Port-Channel3 | trunk | - | - | MLAG | - | - | - | - | #### Port-Channel Interfaces Device Configuration @@ -420,7 +420,7 @@ interface Ethernet4 ```eos ! interface Port-Channel1 - description CUSTOM_DC1_SVC3_Po7 + description CUSTOM_DC1-SVC3A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -441,7 +441,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4091 | MLAG_PEER | default | 1500 | False | +| Vlan4091 | MLAG | default | 1500 | False | ##### IPv4 @@ -454,7 +454,7 @@ interface Port-Channel3 ```eos ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -524,6 +524,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md index 3fae2e45c63..3aa0e642bf5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md @@ -288,7 +288,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4091 | MLAG_PEER | MLAG | +| 4091 | MLAG | MLAG | ### VLANs Device Configuration @@ -358,7 +358,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -412,7 +412,7 @@ interface Ethernet4 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | CUSTOM_DC1_SVC3_Po7 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 1 | - | +| Port-Channel1 | CUSTOM_DC1-SVC3A_Po7 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 1 | - | | Port-Channel3 | MLAG_DC1-L2LEAF2A_Port-Channel3 | trunk | - | - | MLAG | - | - | - | - | #### Port-Channel Interfaces Device Configuration @@ -420,7 +420,7 @@ interface Ethernet4 ```eos ! interface Port-Channel1 - description CUSTOM_DC1_SVC3_Po7 + description CUSTOM_DC1-SVC3A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -441,7 +441,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4091 | MLAG_PEER | default | 1500 | False | +| Vlan4091 | MLAG | default | 1500 | False | ##### IPv4 @@ -454,7 +454,7 @@ interface Port-Channel3 ```eos ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -524,6 +524,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF3A.md index 393ac4e754c..b87fd2ad847 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF3A.md @@ -325,14 +325,14 @@ interface Ethernet2 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | CUSTOM_DC1_LEAF2_Po9 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | - | +| Port-Channel1 | CUSTOM_DC1-LEAF2A_Po9 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | - | #### Port-Channel Interfaces Device Configuration ```eos ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po9 + description CUSTOM_DC1-LEAF2A_Po9 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -402,6 +402,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index 8b3fe707c34..c9a422f9b1e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -219,8 +219,8 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -695,16 +695,16 @@ router bgp 65101 neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -773,6 +773,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index 200df2e2ebc..fe741efd770 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -240,8 +240,8 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -467,7 +467,7 @@ interface Ethernet21 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel7 | CUSTOM_DC1_L2LEAF1_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0808:0707:0606 | +| Port-Channel7 | CUSTOM_DC1-L2LEAF1A_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0808:0707:0606 | | Port-Channel9 | CUSTOM_DC1-L2LEAF3A_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0606:0707:0808 | | Port-Channel10 | CUSTOM_server01_MLAG_PortChanne1 | trunk | 210-211 | - | - | - | - | - | - | | Port-Channel11 | CUSTOM_server01_MTU_PROFILE_MLAG_PortChanne1 | access | 110 | - | - | - | - | - | - | @@ -488,7 +488,7 @@ interface Ethernet21 ```eos ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF1_Po1 + description CUSTOM_DC1-L2LEAF1A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -1006,16 +1006,16 @@ router bgp 65102 neighbor 172.31.255.22 description DC1-SPINE4_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1154,8 +1154,9 @@ router bfd ```eos ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying +! +queue-monitor length log 5 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index 83654cabfd2..01754601398 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -240,8 +240,8 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -467,7 +467,7 @@ interface Ethernet21 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel7 | CUSTOM_DC1_L2LEAF1_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0808:0707:0606 | +| Port-Channel7 | CUSTOM_DC1-L2LEAF1A_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0808:0707:0606 | | Port-Channel9 | CUSTOM_DC1-L2LEAF3A_Po1 | trunk | 110-111,120-124,130-131,160-162 | - | - | - | - | - | 0000:1234:0606:0707:0808 | | Port-Channel10 | CUSTOM_server01_MLAG_PortChanne1 | trunk | 210-211 | - | - | - | - | - | - | | Port-Channel11 | CUSTOM_server01_MTU_PROFILE_MLAG_PortChanne1 | access | 110 | - | - | - | - | - | - | @@ -488,7 +488,7 @@ interface Ethernet21 ```eos ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF1_Po1 + description CUSTOM_DC1-L2LEAF1A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -1006,16 +1006,16 @@ router bgp 65102 neighbor 172.31.255.38 description DC1-SPINE4_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1154,8 +1154,9 @@ router bfd ```eos ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying +! +queue-monitor length log 5 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md index 2dd31839e7c..2233031dc7c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -496,25 +496,25 @@ router bgp 65001 neighbor 172.31.255.97 description DC1-BL1B_Ethernet45 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn @@ -556,6 +556,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md index 7f596d1257e..b2d013463c1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -496,25 +496,25 @@ router bgp 65001 neighbor 172.31.255.99 description DC1-BL1B_Ethernet46 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn @@ -556,6 +556,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md index 8d0b7e52bb2..d4fa76dfeb4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -496,25 +496,25 @@ router bgp 65001 neighbor 172.31.255.101 description DC1-BL1B_Ethernet47 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn @@ -556,6 +556,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md index 14b06926ee4..4126423a236 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -496,25 +496,25 @@ router bgp 65001 neighbor 172.31.255.103 description DC1-BL1B_Ethernet48 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn @@ -556,6 +556,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 6ab450c56de..bd6e43867c9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -253,9 +253,9 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -280,7 +280,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -302,22 +302,22 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4092 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4092 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -384,39 +384,39 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4092 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -632,7 +632,7 @@ interface Ethernet44 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | | Port-Channel5 | CUSTOM_MLAG_PEER_DC1-SVC3B_Po5 | trunk | - | - | MLAG | - | - | - | - | -| Port-Channel7 | CUSTOM_DC1_L2LEAF2_Po1 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 7 | - | +| Port-Channel7 | CUSTOM_DC1-L2LEAF2A_Po1 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 7 | - | | Port-Channel10 | CUSTOM_server03_ESI_PortChanne1 | trunk | 110-111,210-211 | - | - | - | - | - | 0000:1234:0303:0202:0101 | | Port-Channel14 | CUSTOM_server07_inherit_all_from_profile_port_channel_ALL_WITH_SECURITY_PORT_CHANNEL | trunk | 1-4094 | - | - | - | - | 14 | - | | Port-Channel15 | CUSTOM_server08_no_profile_port_channel_server08_no_profile_port_channel | trunk | 1-4094 | - | - | - | - | 15 | - | @@ -661,7 +661,7 @@ interface Port-Channel5 switchport ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF2_Po1 + description CUSTOM_DC1-L2LEAF2A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -814,7 +814,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | SVI 110 CUSTOM DESCRIPTION | Tenant_A_OP_Zone | - | False | | Vlan111 | SVI 111 CUSTOM DESCRIPTION | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -833,15 +833,15 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4092 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4092 | MLAG | default | 1500 | False | ##### IPv4 @@ -881,7 +881,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -1003,63 +1003,63 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.252.6/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.252.6/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.252.6/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.252.6/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.6/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan4092 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1392,7 +1392,7 @@ router bgp 65103 neighbor UNDERLAY-PEERS send-community neighbor UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan4092 neighbor 172.31.255.48 peer group UNDERLAY-PEERS neighbor 172.31.255.48 remote-as 65001 neighbor 172.31.255.48 description DC1-SPINE1_Ethernet4 @@ -1407,16 +1407,16 @@ router bgp 65103 neighbor 172.31.255.54 description DC1-SPINE4_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1501,7 +1501,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1511,7 +1511,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1521,7 +1521,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -1533,7 +1533,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3013 redistribute connected redistribute static ! @@ -1544,7 +1544,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1554,7 +1554,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -1564,7 +1564,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1574,7 +1574,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan2 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -1584,7 +1584,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3030 redistribute connected ``` @@ -1619,6 +1619,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md index aa9917dfaef..7eea5729b89 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -253,9 +253,9 @@ STP Root Super: **True** ```eos ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ``` @@ -280,7 +280,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -302,22 +302,22 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4092 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4092 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -384,39 +384,39 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4092 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -632,7 +632,7 @@ interface Ethernet44 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | | Port-Channel5 | CUSTOM_MLAG_PEER_DC1-SVC3A_Po5 | trunk | - | - | MLAG | - | - | - | - | -| Port-Channel7 | CUSTOM_DC1_L2LEAF2_Po1 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 7 | - | +| Port-Channel7 | CUSTOM_DC1-L2LEAF2A_Po1 | trunk | 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 | - | - | - | - | 7 | - | | Port-Channel10 | CUSTOM_server03_ESI_PortChanne1 | trunk | 110-111,210-211 | - | - | - | - | - | 0000:1234:0303:0202:0101 | | Port-Channel14 | CUSTOM_server07_inherit_all_from_profile_port_channel_ALL_WITH_SECURITY_PORT_CHANNEL | trunk | 1-4094 | - | - | - | - | 14 | - | | Port-Channel15 | CUSTOM_server08_no_profile_port_channel_server08_no_profile_port_channel | trunk | 1-4094 | - | - | - | - | 15 | - | @@ -661,7 +661,7 @@ interface Port-Channel5 switchport ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF2_Po1 + description CUSTOM_DC1-L2LEAF2A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -814,7 +814,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | SVI 110 CUSTOM DESCRIPTION | Tenant_A_OP_Zone | - | False | | Vlan111 | SVI 111 CUSTOM DESCRIPTION | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -833,15 +833,15 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4092 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4092 | MLAG | default | 1500 | False | ##### IPv4 @@ -881,7 +881,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -1003,63 +1003,63 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.252.7/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.252.7/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.252.7/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.252.7/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.7/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan4092 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1392,7 +1392,7 @@ router bgp 65103 neighbor UNDERLAY-PEERS send-community neighbor UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan4092 neighbor 172.31.255.64 peer group UNDERLAY-PEERS neighbor 172.31.255.64 remote-as 65001 neighbor 172.31.255.64 description DC1-SPINE1_Ethernet5 @@ -1407,16 +1407,16 @@ router bgp 65103 neighbor 172.31.255.70 description DC1-SPINE4_Ethernet5 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1501,7 +1501,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -1511,7 +1511,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -1521,7 +1521,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -1533,7 +1533,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3013 redistribute connected redistribute static ! @@ -1544,7 +1544,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -1554,7 +1554,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -1564,7 +1564,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -1574,7 +1574,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan2 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -1584,7 +1584,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3030 redistribute connected ``` @@ -1619,6 +1619,7 @@ router bfd ```eos ! queue-monitor length +! queue-monitor length log 5 ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg index 1c15a6ce672..0690bd766c5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg @@ -28,9 +28,10 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying ! +queue-monitor length log 5 +! hostname DC1-BL1A ip name-server vrf MGMT 1.1.1.1 ip name-server vrf MGMT 8.8.8.8 @@ -41,8 +42,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location DC1_FABRIC DC1-BL1A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 150 @@ -261,16 +262,16 @@ router bgp 65104 neighbor 172.31.255.86 description DC1-SPINE4_Ethernet6 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg index da8967ade6a..08bbb592914 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg @@ -28,9 +28,10 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying ! +queue-monitor length log 5 +! hostname DC1-BL1B ip name-server vrf MGMT 8.8.8.8 ip name-server vrf MGMT 192.168.200.5 @@ -40,8 +41,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location DC1_FABRIC DC1-BL1B ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 150 @@ -260,16 +261,16 @@ router bgp 65105 neighbor 172.31.255.102 description DC1-SPINE4_Ethernet7 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1A.cfg index 09aaeb03293..877a7162375 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1A.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-L2LEAF1A @@ -77,13 +78,13 @@ vlan 162 name Tenant_A_FTP ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po7 + description CUSTOM_DC1-LEAF2A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -124,7 +125,7 @@ interface Management1 ip address 192.168.200.112/24 ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1B.cfg index ecf729c3c33..acf63864319 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1B.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-L2LEAF1B @@ -77,13 +78,13 @@ vlan 162 name Tenant_A_FTP ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po7 + description CUSTOM_DC1-LEAF2A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -124,7 +125,7 @@ interface Management1 ip address 192.168.200.115/24 ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg index 2d300d60d07..f046402cbcb 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-L2LEAF2A @@ -104,13 +105,13 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description CUSTOM_DC1_SVC3_Po7 + description CUSTOM_DC1-SVC3A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -151,7 +152,7 @@ interface Management1 ip address 192.168.200.113/24 ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg index 7936a5aee1f..350e00e76a1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-L2LEAF2B @@ -104,13 +105,13 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4091 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT ! interface Port-Channel1 - description CUSTOM_DC1_SVC3_Po7 + description CUSTOM_DC1-SVC3A_Po7 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -151,7 +152,7 @@ interface Management1 ip address 192.168.200.114/24 ! interface Vlan4091 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF3A.cfg index 93726bb4055..eedeecc7dcc 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF3A.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-L2LEAF3A @@ -78,7 +79,7 @@ vlan 162 vrf instance MGMT ! interface Port-Channel1 - description CUSTOM_DC1_LEAF2_Po9 + description CUSTOM_DC1-LEAF2A_Po9 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg index 011e75be245..331d7f531c7 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg @@ -25,6 +25,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-LEAF1A @@ -34,8 +35,8 @@ ip name-server vrf MGMT 192.168.200.5 snmp-server contact example@example.com snmp-server location DC1_FABRIC rackA DC1-LEAF1A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 120 @@ -241,16 +242,16 @@ router bgp 65101 neighbor 172.31.255.6 description DC1-SPINE4_Ethernet1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg index 0fc9030e467..aef506fd705 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg @@ -32,9 +32,10 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying ! +queue-monitor length log 5 +! hostname DC1-LEAF2A ip name-server vrf MGMT 8.8.8.8 ip name-server vrf MGMT 192.168.200.5 @@ -44,8 +45,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location DC1_FABRIC rackC DC1-LEAF2A ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 @@ -117,7 +118,7 @@ vrf instance Tenant_B_OP_Zone vrf instance Tenant_C_OP_Zone ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF1_Po1 + description CUSTOM_DC1-L2LEAF1A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -454,16 +455,16 @@ router bgp 65102 neighbor 172.31.255.22 description DC1-SPINE4_Ethernet2 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg index 63e5f7a747d..a7f7d1a1f21 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg @@ -32,9 +32,10 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length -queue-monitor length log 5 queue-monitor length notifying ! +queue-monitor length log 5 +! hostname DC1-LEAF2B ip name-server vrf MGMT 8.8.8.8 ip name-server vrf MGMT 192.168.200.5 @@ -44,8 +45,8 @@ platform sand lag hardware-only snmp-server contact example@example.com snmp-server location DC1_FABRIC rackD DC1-LEAF2B ! -spanning-tree root super spanning-tree mode mstp +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 110 @@ -117,7 +118,7 @@ vrf instance Tenant_B_OP_Zone vrf instance Tenant_C_OP_Zone ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF1_Po1 + description CUSTOM_DC1-L2LEAF1A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,160-162 switchport mode trunk @@ -454,16 +455,16 @@ router bgp 65102 neighbor 172.31.255.38 description DC1-SPINE4_Ethernet3 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE1.cfg index 03a8ebfe28f..747725cb584 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE1.cfg @@ -23,6 +23,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SPINE1 @@ -161,25 +162,25 @@ router bgp 65001 neighbor 172.31.255.97 description DC1-BL1B_Ethernet45 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE2.cfg index 2a600b738ed..bf62f46a9ab 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE2.cfg @@ -23,6 +23,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SPINE2 @@ -161,25 +162,25 @@ router bgp 65001 neighbor 172.31.255.99 description DC1-BL1B_Ethernet46 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE3.cfg index 6fe43d63810..37f1588a481 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE3.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE3.cfg @@ -23,6 +23,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SPINE3 @@ -161,25 +162,25 @@ router bgp 65001 neighbor 172.31.255.101 description DC1-BL1B_Ethernet47 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE4.cfg index d1c90c706f1..9b38191566d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SPINE4.cfg @@ -23,6 +23,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SPINE4 @@ -161,25 +162,25 @@ router bgp 65001 neighbor 172.31.255.103 description DC1-BL1B_Ethernet48 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65101 - neighbor 192.168.255.9 description DC1-LEAF1A + neighbor 192.168.255.9 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65102 - neighbor 192.168.255.10 description DC1-LEAF2A + neighbor 192.168.255.10 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65102 - neighbor 192.168.255.11 description DC1-LEAF2B + neighbor 192.168.255.11 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.12 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.12 remote-as 65103 - neighbor 192.168.255.12 description DC1-SVC3A + neighbor 192.168.255.12 description DC1-SVC3A_Loopback0 neighbor 192.168.255.13 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.13 remote-as 65103 - neighbor 192.168.255.13 description DC1-SVC3B + neighbor 192.168.255.13 description DC1-SVC3B_Loopback0 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65104 - neighbor 192.168.255.14 description DC1-BL1A + neighbor 192.168.255.14 description DC1-BL1A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65105 - neighbor 192.168.255.15 description DC1-BL1B + neighbor 192.168.255.15 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index f6fb897dff6..debc24290de 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SVC3A @@ -36,13 +37,13 @@ ip name-server vrf MGMT 192.168.200.5 snmp-server contact example@example.com snmp-server location DC1_FABRIC DC1-SVC3A ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -109,39 +110,39 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4092 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -172,7 +173,7 @@ interface Port-Channel5 switchport ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF2_Po1 + description CUSTOM_DC1-L2LEAF2A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -459,7 +460,7 @@ interface Management1 ip address 192.168.200.108/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -581,63 +582,63 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.252.6/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.252.6/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.252.6/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.252.6/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.6/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.252.6/31 ! interface Vlan4092 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -747,7 +748,7 @@ router bgp 65103 neighbor UNDERLAY-PEERS send-community neighbor UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan4092 neighbor 172.31.255.48 peer group UNDERLAY-PEERS neighbor 172.31.255.48 remote-as 65001 neighbor 172.31.255.48 description DC1-SPINE1_Ethernet4 @@ -762,16 +763,16 @@ router bgp 65103 neighbor 172.31.255.54 description DC1-SPINE4_Ethernet4 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -856,7 +857,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -866,7 +867,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -876,7 +877,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -888,7 +889,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3013 redistribute connected redistribute static ! @@ -899,7 +900,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -909,7 +910,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -919,7 +920,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -929,7 +930,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan2 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -939,7 +940,7 @@ router bgp 65103 router-id 192.168.255.12 update wait-install neighbor 10.255.252.7 peer group MLAG-PEERS - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index afb10393dfb..d1fce6c3bad 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -27,6 +27,7 @@ transceiver qsfp default-mode 4x10G service routing protocols model multi-agent ! queue-monitor length +! queue-monitor length log 5 ! hostname DC1-SVC3B @@ -36,13 +37,13 @@ ip name-server vrf MGMT 192.168.200.5 snmp-server contact example@example.com snmp-server location DC1_FABRIC DC1-SVC3B ! -spanning-tree root super spanning-tree mode mstp no spanning-tree vlan-id 4092 +spanning-tree root super spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -109,39 +110,39 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4092 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -172,7 +173,7 @@ interface Port-Channel5 switchport ! interface Port-Channel7 - description CUSTOM_DC1_L2LEAF2_Po1 + description CUSTOM_DC1-L2LEAF2A_Po1 no shutdown switchport trunk allowed vlan 110-111,120-124,130-131,140-141,150,160-162,210-211,250,310-311,350 switchport mode trunk @@ -459,7 +460,7 @@ interface Management1 ip address 192.168.200.109/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -581,63 +582,63 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.252.7/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.252.7/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.252.7/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.252.7/31 ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.7/31 ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ip address 10.255.252.7/31 ! interface Vlan4092 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -747,7 +748,7 @@ router bgp 65103 neighbor UNDERLAY-PEERS send-community neighbor UNDERLAY-PEERS maximum-routes 12000 neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan4092 neighbor 172.31.255.64 peer group UNDERLAY-PEERS neighbor 172.31.255.64 remote-as 65001 neighbor 172.31.255.64 description DC1-SPINE1_Ethernet5 @@ -762,16 +763,16 @@ router bgp 65103 neighbor 172.31.255.70 description DC1-SPINE4_Ethernet5 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -856,7 +857,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3011 redistribute connected ! vrf Tenant_A_DB_Zone @@ -866,7 +867,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3012 redistribute connected ! vrf Tenant_A_OP_Zone @@ -876,7 +877,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3009 redistribute connected ! vrf Tenant_A_WAN_Zone @@ -888,7 +889,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3013 redistribute connected redistribute static ! @@ -899,7 +900,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3010 redistribute connected ! vrf Tenant_B_OP_Zone @@ -909,7 +910,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3019 redistribute connected ! vrf Tenant_B_WAN_Zone @@ -919,7 +920,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3020 redistribute connected ! vrf Tenant_C_OP_Zone @@ -929,7 +930,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan2 redistribute connected ! vrf Tenant_C_WAN_Zone @@ -939,7 +940,7 @@ router bgp 65103 router-id 192.168.255.13 update wait-install neighbor 10.255.252.6 peer group MLAG-PEERS - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3030 redistribute connected ! end diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml index f8efce00e0a..07d6576b282 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml index 507d1d5e481..5ccdc328925 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1A.yml index b1de129c1d0..b49a927670c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1A.yml @@ -78,7 +78,7 @@ snmp_server: vlans: - id: 4091 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -119,7 +119,7 @@ vlans: tenant: Tenant_A vlan_interfaces: - name: Vlan4091 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -135,7 +135,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: CUSTOM_DC1_LEAF2_Po7 + description: CUSTOM_DC1-LEAF2A_Po7 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1B.yml index 7ef5ed80082..a171d0c5608 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1B.yml @@ -78,7 +78,7 @@ snmp_server: vlans: - id: 4091 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -119,7 +119,7 @@ vlans: tenant: Tenant_A vlan_interfaces: - name: Vlan4091 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -135,7 +135,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: CUSTOM_DC1_LEAF2_Po7 + description: CUSTOM_DC1-LEAF2A_Po7 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml index 6ac018a3532..5b069109a7c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml @@ -78,7 +78,7 @@ snmp_server: vlans: - id: 4091 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -146,7 +146,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4091 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -162,7 +162,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: CUSTOM_DC1_SVC3_Po7 + description: CUSTOM_DC1-SVC3A_Po7 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml index d74744b2685..46571799155 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml @@ -78,7 +78,7 @@ snmp_server: vlans: - id: 4091 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -146,7 +146,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4091 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -162,7 +162,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel1 - description: CUSTOM_DC1_SVC3_Po7 + description: CUSTOM_DC1-SVC3A_Po7 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF3A.yml index 2d12c348c53..a19281c0c8b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF3A.yml @@ -95,7 +95,7 @@ ethernet_interfaces: mode: active port_channel_interfaces: - name: Port-Channel1 - description: CUSTOM_DC1_LEAF2_Po9 + description: CUSTOM_DC1-LEAF2A_Po9 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml index fafa12f2aeb..654b3fe174e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 0ef863f2d10..64ac639b8e2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -490,7 +490,7 @@ ethernet_interfaces: access_vlan: '110' port_channel_interfaces: - name: Port-Channel7 - description: CUSTOM_DC1_L2LEAF1_Po1 + description: CUSTOM_DC1-L2LEAF1A_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 238615a40da..1036b30c6be 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -60,22 +60,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' address_family_evpn: peer_groups: @@ -490,7 +490,7 @@ ethernet_interfaces: access_vlan: '110' port_channel_interfaces: - name: Port-Channel7 - description: CUSTOM_DC1_L2LEAF1_Po1 + description: CUSTOM_DC1-L2LEAF1A_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml index 8c86666a40b..ad904a6952a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml @@ -76,37 +76,37 @@ router_bgp: - ip_address: 192.168.255.14 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.15 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.12 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.13 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml index 49a7eb3b4e4..4f57f30c1fd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml @@ -76,37 +76,37 @@ router_bgp: - ip_address: 192.168.255.14 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.15 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.12 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.13 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml index 93ca463ae14..8203766534c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml @@ -76,37 +76,37 @@ router_bgp: - ip_address: 192.168.255.14 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.15 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.12 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.13 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml index 99186b67162..42d1f4c7dc2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml @@ -76,37 +76,37 @@ router_bgp: - ip_address: 192.168.255.14 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.15 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.12 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.13 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' address_family_evpn: peer_groups: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index 84db6f3bf7d..26b53feea04 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Vlan4092 - ip_address: 172.31.255.48 peer_group: UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -118,7 +118,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -138,7 +138,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -158,7 +158,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3009 updates: wait_install: true - name: Tenant_A_WAN_Zone @@ -181,7 +181,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3013 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -201,7 +201,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -221,7 +221,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3019 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -241,7 +241,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3020 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -261,7 +261,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan2 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -281,7 +281,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-PEERS - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -486,7 +486,7 @@ snmp_server: vlans: - id: 4092 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -496,7 +496,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -507,7 +507,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -518,7 +518,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -526,7 +526,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -546,7 +546,7 @@ vlans: name: Tenant_a_WEB_DHCP_vrf_no_source_int tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -566,7 +566,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -574,7 +574,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -585,7 +585,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -593,13 +593,13 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4092 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -625,7 +625,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -650,7 +650,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -680,7 +680,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -696,7 +696,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -758,7 +758,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -782,7 +782,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -798,7 +798,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -822,7 +822,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -838,7 +838,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -853,7 +853,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel7 - description: CUSTOM_DC1_L2LEAF2_Po1 + description: CUSTOM_DC1-L2LEAF2A_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 0fc1a71f962..eb8be3c01a4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -48,7 +48,7 @@ router_bgp: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Vlan4092 - ip_address: 172.31.255.64 peer_group: UNDERLAY-PEERS remote_as: '65001' @@ -72,22 +72,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' redistribute_routes: - source_protocol: connected @@ -118,7 +118,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3011 updates: wait_install: true - name: Tenant_A_DB_Zone @@ -138,7 +138,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3012 updates: wait_install: true - name: Tenant_A_OP_Zone @@ -158,7 +158,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3009 updates: wait_install: true - name: Tenant_A_WAN_Zone @@ -181,7 +181,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3013 updates: wait_install: true - name: Tenant_A_WEB_Zone @@ -201,7 +201,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3010 updates: wait_install: true - name: Tenant_B_OP_Zone @@ -221,7 +221,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3019 updates: wait_install: true - name: Tenant_B_WAN_Zone @@ -241,7 +241,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3020 updates: wait_install: true - name: Tenant_C_OP_Zone @@ -261,7 +261,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan2 updates: wait_install: true - name: Tenant_C_WAN_Zone @@ -281,7 +281,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-PEERS - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3030 updates: wait_install: true vlan_aware_bundles: @@ -486,7 +486,7 @@ snmp_server: vlans: - id: 4092 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -496,7 +496,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -507,7 +507,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -518,7 +518,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -526,7 +526,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -546,7 +546,7 @@ vlans: name: Tenant_a_WEB_DHCP_vrf_no_source_int tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -566,7 +566,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -574,7 +574,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -585,7 +585,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -593,13 +593,13 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4092 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -625,7 +625,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -650,7 +650,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -680,7 +680,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -696,7 +696,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -758,7 +758,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -782,7 +782,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -798,7 +798,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -822,7 +822,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -838,7 +838,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -853,7 +853,7 @@ port_channel_interfaces: - MLAG shutdown: false - name: Port-Channel7 - description: CUSTOM_DC1_L2LEAF2_Po1 + description: CUSTOM_DC1-L2LEAF2A_Po1 switchport: enabled: true mode: trunk diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/inventory/group_vars/DC1_SERVERS.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/inventory/group_vars/DC1_SERVERS.yml index c446ca6d38b..873ce05ff6a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/inventory/group_vars/DC1_SERVERS.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/inventory/group_vars/DC1_SERVERS.yml @@ -17,7 +17,6 @@ port_profiles: vlans: "210-211" - profile: ALL_WITH_SECURITY - parent_profile: NON_EXISTING_PROFILE # Test that pointing to a nonexisting profile won't break templates. mode: trunk vlans: "1-4094" spanning_tree_bpdufilter: true diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md index 6e59dca1d64..f5f142fb1de 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md @@ -255,19 +255,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -290,11 +290,11 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | -| Ethernet8 | P2P_LINK_TO_ROUTERX_Ethernet8 | - | 100.64.0.0/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | +| Ethernet8 | P2P_ROUTERX_Ethernet8 | - | 100.64.0.0/31 | default | 1500 | False | - | - | ##### ISIS @@ -311,7 +311,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport @@ -323,7 +323,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport @@ -335,7 +335,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport @@ -347,7 +347,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -369,7 +369,7 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet8 - description P2P_LINK_TO_ROUTERX_Ethernet8 + description P2P_ROUTERX_Ethernet8 no shutdown mtu 1500 no switchport @@ -454,8 +454,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -475,7 +475,7 @@ interface Loopback1 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 @@ -485,7 +485,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -688,9 +688,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md index df60cd92215..72141a16005 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md @@ -255,19 +255,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -290,10 +290,10 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | ##### ISIS @@ -309,7 +309,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport @@ -321,7 +321,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport @@ -333,7 +333,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport @@ -345,7 +345,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -439,8 +439,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -460,7 +460,7 @@ interface Loopback1 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 @@ -470,7 +470,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -672,9 +672,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2A.md index a26784adde0..5889e3a6c41 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2A.md @@ -245,14 +245,14 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -335,7 +335,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -348,7 +348,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2B.md index 20b92543ac7..6766700f2c8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-L2LEAF2B.md @@ -245,14 +245,14 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -335,7 +335,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -348,7 +348,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md index 770b66a7ab5..802ea2d7d6f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md @@ -230,10 +230,10 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | ##### ISIS @@ -249,7 +249,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport @@ -261,7 +261,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport @@ -273,7 +273,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport @@ -285,7 +285,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -522,9 +522,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md index 0e4e6efa7db..5d24f87b815 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md @@ -255,19 +255,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -291,10 +291,10 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | ##### ISIS @@ -310,7 +310,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport @@ -322,7 +322,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport @@ -334,7 +334,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport @@ -346,7 +346,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -454,8 +454,8 @@ interface Loopback10 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -475,7 +475,7 @@ interface Loopback10 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 @@ -485,7 +485,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -687,9 +687,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md index fe4a33a8b34..e8df13021bc 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md @@ -255,19 +255,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -291,10 +291,10 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | ##### ISIS @@ -310,7 +310,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport @@ -322,7 +322,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport @@ -334,7 +334,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport @@ -346,7 +346,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -454,8 +454,8 @@ interface Loopback10 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -475,7 +475,7 @@ interface Loopback10 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 @@ -485,7 +485,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -687,9 +687,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md index 7bb3bb16dfe..98eb70ac6c1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md @@ -216,13 +216,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | ##### ISIS @@ -241,7 +241,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -253,7 +253,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport @@ -265,7 +265,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport @@ -277,7 +277,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport @@ -289,7 +289,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport @@ -301,7 +301,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -313,7 +313,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -533,19 +533,19 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group OVERLAY-PEERS - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group OVERLAY-PEERS - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group OVERLAY-PEERS - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group OVERLAY-PEERS - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group OVERLAY-PEERS - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group OVERLAY-PEERS - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group OVERLAY-PEERS - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE2.md index 57c100ea2eb..e611d6eeeb7 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE2.md @@ -213,13 +213,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | ##### ISIS @@ -238,7 +238,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -250,7 +250,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport @@ -274,7 +274,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport @@ -286,7 +286,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -298,7 +298,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -310,7 +310,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE3.md index e7d6d87b7f7..131c28b0fd2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE3.md @@ -213,13 +213,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | ##### ISIS @@ -238,7 +238,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -250,7 +250,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport @@ -274,7 +274,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport @@ -286,7 +286,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport @@ -298,7 +298,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -310,7 +310,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md index e101ddca2a0..1bf51a6481d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md @@ -216,13 +216,13 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | ##### ISIS @@ -241,7 +241,7 @@ vlan internal order ascending range 1006 1199 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -253,7 +253,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport @@ -265,7 +265,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport @@ -277,7 +277,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport @@ -289,7 +289,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport @@ -301,7 +301,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -313,7 +313,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -533,19 +533,19 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group OVERLAY-PEERS - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group OVERLAY-PEERS - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group OVERLAY-PEERS - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group OVERLAY-PEERS - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group OVERLAY-PEERS - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group OVERLAY-PEERS - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group OVERLAY-PEERS - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md index 07bbcdbd251..caafd72821c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md @@ -255,14 +255,14 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -287,10 +287,10 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | ##### ISIS @@ -306,7 +306,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport @@ -318,7 +318,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport @@ -330,7 +330,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport @@ -342,7 +342,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -455,7 +455,7 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -474,7 +474,7 @@ interface Loopback1 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -680,9 +680,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md index 7eed8c8ce70..c240ea432ac 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md @@ -255,14 +255,14 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -287,10 +287,10 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | ##### ISIS @@ -306,7 +306,7 @@ vlan 4094 ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport @@ -318,7 +318,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport @@ -330,7 +330,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport @@ -342,7 +342,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -455,7 +455,7 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -474,7 +474,7 @@ interface Loopback1 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -680,9 +680,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1A.cfg index 09b3ec6a00e..e823bc9f0e2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1A.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport @@ -60,7 +60,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport @@ -72,7 +72,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport @@ -84,7 +84,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -106,7 +106,7 @@ interface Ethernet6 channel-group 5 mode active ! interface Ethernet8 - description P2P_LINK_TO_ROUTERX_Ethernet8 + description P2P_ROUTERX_Ethernet8 no shutdown mtu 1500 no switchport @@ -139,7 +139,7 @@ interface Management1 ip address 192.168.200.110/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 @@ -149,7 +149,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -206,9 +206,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1B.cfg index 4b4207a32eb..b223bbf49c3 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-BL1B.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport @@ -60,7 +60,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport @@ -72,7 +72,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport @@ -84,7 +84,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -126,7 +126,7 @@ interface Management1 ip address 192.168.200.111/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 @@ -136,7 +136,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -193,9 +193,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2A.cfg index 41a1803d7f3..665d17003db 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2A.cfg @@ -31,7 +31,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 16384 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,7 +78,7 @@ interface Management1 ip address 192.168.200.113/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2B.cfg index 7b8ca158ac3..3da8134b8b4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-L2LEAF2B.cfg @@ -31,7 +31,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 16384 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -78,7 +78,7 @@ interface Management1 ip address 192.168.200.114/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF1A.cfg index 1d9fa6c57cc..aa4e14d49e9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF1A.cfg @@ -32,7 +32,7 @@ spanning-tree mst 0 priority 4096 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport @@ -44,7 +44,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport @@ -56,7 +56,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport @@ -68,7 +68,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -134,9 +134,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2A.cfg index 6e2a984aa2b..6079d5b96c6 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2A.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -56,7 +56,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport @@ -68,7 +68,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport @@ -80,7 +80,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport @@ -92,7 +92,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -139,7 +139,7 @@ interface Management1 ip address 192.168.200.106/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 @@ -149,7 +149,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -206,9 +206,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2B.cfg index 4da18eb1fe6..88024d49f20 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-LEAF2B.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -56,7 +56,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport @@ -68,7 +68,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport @@ -80,7 +80,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport @@ -92,7 +92,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -139,7 +139,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 @@ -149,7 +149,7 @@ interface Vlan4093 isis network point-to-point ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -206,9 +206,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE1.cfg index bc9075dcb87..23c154e4850 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE1.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport @@ -55,7 +55,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport @@ -67,7 +67,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport @@ -91,7 +91,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -103,7 +103,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -154,19 +154,19 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group OVERLAY-PEERS - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group OVERLAY-PEERS - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group OVERLAY-PEERS - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group OVERLAY-PEERS - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group OVERLAY-PEERS - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group OVERLAY-PEERS - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group OVERLAY-PEERS - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE2.cfg index 8e5938c8d4e..4a06d5eb25b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE2.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport @@ -55,7 +55,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport @@ -67,7 +67,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -91,7 +91,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -103,7 +103,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE3.cfg index ea4f689088f..2f9e1cddc14 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE3.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE3.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport @@ -55,7 +55,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport @@ -67,7 +67,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport @@ -91,7 +91,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -103,7 +103,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE4.cfg index 13f593c7d73..400614f45a0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SPINE4.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport @@ -55,7 +55,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport @@ -67,7 +67,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport @@ -79,7 +79,7 @@ interface Ethernet4 isis network point-to-point ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport @@ -91,7 +91,7 @@ interface Ethernet5 isis network point-to-point ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -103,7 +103,7 @@ interface Ethernet6 isis network point-to-point ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -154,19 +154,19 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group OVERLAY-PEERS - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group OVERLAY-PEERS - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group OVERLAY-PEERS - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group OVERLAY-PEERS - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group OVERLAY-PEERS - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group OVERLAY-PEERS - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group OVERLAY-PEERS - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3A.cfg index c8de93b2171..317c2249f97 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3A.cfg @@ -31,7 +31,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 4096 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -52,7 +52,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport @@ -76,7 +76,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport @@ -88,7 +88,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -140,7 +140,7 @@ interface Management1 ip address 192.168.200.108/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -201,9 +201,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3B.cfg index a39a343facf..14e42aa5a94 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/configs/DC1-SVC3B.cfg @@ -31,7 +31,7 @@ no spanning-tree vlan-id 4094 spanning-tree mst 0 priority 4096 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -52,7 +52,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet1 isis network point-to-point ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport @@ -76,7 +76,7 @@ interface Ethernet2 isis network point-to-point ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport @@ -88,7 +88,7 @@ interface Ethernet3 isis network point-to-point ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -140,7 +140,7 @@ interface Management1 ip address 192.168.200.109/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -201,9 +201,9 @@ router bgp 65000 neighbor OVERLAY-PEERS send-community neighbor OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group OVERLAY-PEERS - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.4 peer group OVERLAY-PEERS - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn neighbor OVERLAY-PEERS route-map RM-EVPN-SOO-IN in diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1A.yml index f950d8b4fbe..ca1806b386e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1A.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,17 +114,17 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.10/31 @@ -133,7 +133,7 @@ vlan_interfaces: isis_metric: 50 isis_network_point_to_point: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -171,7 +171,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description: P2P_DC1-SPINE1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -186,7 +186,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description: P2P_DC1-SPINE2_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -201,7 +201,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description: P2P_DC1-SPINE3_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -216,7 +216,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description: P2P_DC1-SPINE4_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -231,7 +231,6 @@ ethernet_interfaces: peer: ROUTERX peer_interface: Ethernet8 peer_type: other - description: P2P_LINK_TO_ROUTERX_Ethernet8 switchport: enabled: false shutdown: false @@ -243,6 +242,7 @@ ethernet_interfaces: isis_network_point_to_point: true isis_hello_padding: true isis_circuit_type: level-2 + description: P2P_ROUTERX_Ethernet8 mlag_configuration: domain_id: DC1_BL1 local_interface: Vlan4094 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1B.yml index 64d8311c461..6e24423e9ac 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-BL1B.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,17 +114,17 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.11/31 @@ -133,7 +133,7 @@ vlan_interfaces: isis_metric: 50 isis_network_point_to_point: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -171,7 +171,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description: P2P_DC1-SPINE1_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -186,7 +186,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description: P2P_DC1-SPINE2_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -201,7 +201,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description: P2P_DC1-SPINE3_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -216,7 +216,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description: P2P_DC1-SPINE4_Ethernet7 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2A.yml index 1c966035dcb..eec04cd6e02 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2A.yml @@ -72,12 +72,12 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2B.yml index 5b680ab2190..2cae6a5e6a8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-L2LEAF2B.yml @@ -72,12 +72,12 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF1A.yml index cb637616e0b..4569987eb14 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF1A.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -115,7 +115,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_DC1-SPINE1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -130,7 +130,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_DC1-SPINE2_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -145,7 +145,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description: P2P_DC1-SPINE3_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -160,7 +160,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description: P2P_DC1-SPINE4_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2A.yml index bc3590ede06..21d10217543 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2A.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,17 +114,17 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.2/31 @@ -133,7 +133,7 @@ vlan_interfaces: isis_metric: 50 isis_network_point_to_point: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -180,7 +180,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_DC1-SPINE1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -195,7 +195,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_DC1-SPINE2_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -210,7 +210,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description: P2P_DC1-SPINE3_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -225,7 +225,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description: P2P_DC1-SPINE4_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2B.yml index d2cd4a12243..c8e78af9e66 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-LEAF2B.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,17 +114,17 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.3/31 @@ -133,7 +133,7 @@ vlan_interfaces: isis_metric: 50 isis_network_point_to_point: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -180,7 +180,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_DC1-SPINE1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -195,7 +195,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_DC1-SPINE2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -210,7 +210,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description: P2P_DC1-SPINE3_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -225,7 +225,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description: P2P_DC1-SPINE4_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE1.yml index 4b318a1d757..2e5fa28852a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE1.yml @@ -36,31 +36,31 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 - ip_address: 192.168.255.11 peer_group: OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 - ip_address: 192.168.255.5 peer_group: OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 - ip_address: 192.168.255.6 peer_group: OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 - ip_address: 192.168.255.7 peer_group: OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 - ip_address: 192.168.255.8 peer_group: OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 - ip_address: 192.168.255.9 peer_group: OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -132,7 +132,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_DC1-LEAF1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_DC1-LEAF2A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -162,7 +162,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_DC1-LEAF2B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description: P2P_DC1-SVC3A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -192,7 +192,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description: P2P_DC1-SVC3B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet1 + description: P2P_DC1-BL1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -222,7 +222,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet1 + description: P2P_DC1-BL1B_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE2.yml index c210e7d58e3..2c5f317c99f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE2.yml @@ -71,7 +71,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_DC1-LEAF1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -86,7 +86,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_DC1-LEAF2A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -101,7 +101,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_DC1-LEAF2B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -116,7 +116,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description: P2P_DC1-SVC3A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -131,7 +131,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description: P2P_DC1-SVC3B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet2 + description: P2P_DC1-BL1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -161,7 +161,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet2 + description: P2P_DC1-BL1B_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE3.yml index ee2e37cbb45..92fa04a8a85 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE3.yml @@ -71,7 +71,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description: P2P_DC1-LEAF1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -86,7 +86,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description: P2P_DC1-LEAF2A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -101,7 +101,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description: P2P_DC1-LEAF2B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -116,7 +116,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description: P2P_DC1-SVC3A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -131,7 +131,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description: P2P_DC1-SVC3B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet3 + description: P2P_DC1-BL1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -161,7 +161,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet3 + description: P2P_DC1-BL1B_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE4.yml index eb8e5b9b28c..7ac2d81f7a5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SPINE4.yml @@ -36,31 +36,31 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 - ip_address: 192.168.255.11 peer_group: OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 - ip_address: 192.168.255.5 peer_group: OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 - ip_address: 192.168.255.6 peer_group: OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 - ip_address: 192.168.255.7 peer_group: OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 - ip_address: 192.168.255.8 peer_group: OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 - ip_address: 192.168.255.9 peer_group: OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -132,7 +132,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description: P2P_DC1-LEAF1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -147,7 +147,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description: P2P_DC1-LEAF2A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -162,7 +162,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description: P2P_DC1-LEAF2B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -177,7 +177,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description: P2P_DC1-SVC3A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -192,7 +192,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description: P2P_DC1-SVC3B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -207,7 +207,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet4 + description: P2P_DC1-BL1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -222,7 +222,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet4 + description: P2P_DC1-BL1B_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3A.yml index 5d2b48adf39..21d5ede2763 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3A.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,12 +114,12 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -170,7 +170,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_DC1-SPINE1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -185,7 +185,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_DC1-SPINE2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -200,7 +200,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description: P2P_DC1-SPINE3_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -215,7 +215,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description: P2P_DC1-SPINE4_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3B.yml index af5722aa8f2..59b2b991bcb 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/intended/structured_configs/DC1-SVC3B.yml @@ -36,11 +36,11 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 - ip_address: 192.168.255.4 peer_group: OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 static_routes: - vrf: MGMT destination_address_prefix: 0.0.0.0/0 @@ -114,12 +114,12 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -170,7 +170,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description: P2P_DC1-SPINE1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -185,7 +185,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description: P2P_DC1-SPINE2_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -200,7 +200,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description: P2P_DC1-SPINE3_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -215,7 +215,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description: P2P_DC1-SPINE4_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md index d52465e8ea4..6092ada0c6b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -252,19 +252,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -287,17 +287,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet6 | - | 172.31.255.41/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet6 | - | 172.31.255.43/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet6 | - | 172.31.255.45/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet6 | - | 172.31.255.47/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport @@ -308,7 +308,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport @@ -319,7 +319,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport @@ -330,7 +330,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -414,8 +414,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -429,7 +429,7 @@ interface Loopback1 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 @@ -437,7 +437,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -638,16 +638,16 @@ router bgp 65104 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md index 0f6f2c05407..ec1040fde93 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -252,19 +252,19 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -287,17 +287,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet7 | - | 172.31.255.49/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet7 | - | 172.31.255.51/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet7 | - | 172.31.255.53/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet7 | - | 172.31.255.55/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport @@ -308,7 +308,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport @@ -319,7 +319,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport @@ -330,7 +330,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -414,8 +414,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -429,7 +429,7 @@ interface Loopback1 ```eos ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 @@ -437,7 +437,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -638,16 +638,16 @@ router bgp 65104 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md index c255c1a32d3..7df60b12afb 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md @@ -246,7 +246,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -256,7 +256,7 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -339,7 +339,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -352,7 +352,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md index 8626e993bd2..2e989c64040 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md @@ -246,7 +246,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -256,7 +256,7 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -339,7 +339,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -352,7 +352,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index e681505bdfb..35055c947e5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -227,17 +227,17 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet1 | - | 172.31.255.1/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet1 | - | 172.31.255.3/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet1 | - | 172.31.255.5/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet1 | - | 172.31.255.7/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport @@ -248,7 +248,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport @@ -259,7 +259,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport @@ -270,7 +270,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -506,16 +506,16 @@ router bgp 65101 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index d1de23fc4a7..0878908cd74 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -255,9 +255,9 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,15 +267,15 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -299,17 +299,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet2 | - | 172.31.255.9/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet2 | - | 172.31.255.11/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet2 | - | 172.31.255.13/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet2 | - | 172.31.255.15/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport @@ -320,7 +320,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport @@ -331,7 +331,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport @@ -342,7 +342,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -441,9 +441,9 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan210 | Tenant_B_OP_Zone_1 | Tenant_B_OP_Zone | - | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -465,14 +465,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 @@ -480,7 +480,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -729,16 +729,16 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.6:20 @@ -761,7 +761,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index b8f2331631c..75b8d4b5551 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -255,9 +255,9 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -267,15 +267,15 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -299,17 +299,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet3 | - | 172.31.255.17/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet3 | - | 172.31.255.19/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet3 | - | 172.31.255.21/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet3 | - | 172.31.255.23/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport @@ -320,7 +320,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport @@ -331,7 +331,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport @@ -342,7 +342,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -441,9 +441,9 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan210 | Tenant_B_OP_Zone_1 | Tenant_B_OP_Zone | - | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -465,14 +465,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 @@ -480,7 +480,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -729,16 +729,16 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.7:20 @@ -761,7 +761,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md index 0d3ce02ff85..59eda819d2d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -216,20 +216,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -240,7 +240,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport @@ -251,7 +251,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport @@ -273,7 +273,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport @@ -284,7 +284,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -295,7 +295,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -495,25 +495,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md index 3a254ec1914..659a118c117 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -216,20 +216,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -240,7 +240,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport @@ -251,7 +251,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport @@ -273,7 +273,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -284,7 +284,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -295,7 +295,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -495,25 +495,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md index 70f758fc4af..f60b55ab377 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -216,20 +216,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -240,7 +240,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport @@ -251,7 +251,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport @@ -273,7 +273,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport @@ -284,7 +284,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -295,7 +295,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -495,25 +495,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md index 2cfe7ef2bf6..a220761863a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -216,20 +216,20 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | False | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | False | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | False | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | False | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -240,7 +240,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport @@ -251,7 +251,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport @@ -262,7 +262,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport @@ -273,7 +273,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport @@ -284,7 +284,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -295,7 +295,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -495,25 +495,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 37cec5bc728..15e085c7c64 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -255,8 +255,8 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -266,11 +266,11 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -295,17 +295,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet4 | - | 172.31.255.25/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet4 | - | 172.31.255.27/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet4 | - | 172.31.255.29/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet4 | - | 172.31.255.31/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport @@ -316,7 +316,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport @@ -327,7 +327,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport @@ -338,7 +338,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -442,8 +442,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan210 | Tenant_B_OP_Zone_1 | Tenant_B_OP_Zone | - | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -464,14 +464,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.6/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -722,16 +722,16 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.8:20 @@ -754,7 +754,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.252.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3019 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md index e4b98419a0a..3e6deefb5f8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -255,8 +255,8 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | | 210 | Tenant_B_OP_Zone_1 | - | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -266,11 +266,11 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -295,17 +295,17 @@ vlan 4094 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet5 | - | 172.31.255.33/31 | default | 1500 | False | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet5 | - | 172.31.255.35/31 | default | 1500 | False | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet5 | - | 172.31.255.37/31 | default | 1500 | False | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet5 | - | 172.31.255.39/31 | default | 1500 | False | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport @@ -316,7 +316,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport @@ -327,7 +327,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport @@ -338,7 +338,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -442,8 +442,8 @@ interface Loopback1 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | | Vlan210 | Tenant_B_OP_Zone_1 | Tenant_B_OP_Zone | - | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -464,14 +464,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.7/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -722,16 +722,16 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.9:20 @@ -754,7 +754,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.252.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3019 redistribute connected ``` diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1A.cfg index 784a2216cb9..d70ec4cd679 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1A.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport @@ -59,7 +59,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport @@ -70,7 +70,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport @@ -81,7 +81,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport @@ -120,7 +120,7 @@ interface Management1 ip address 192.168.200.110/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.10/31 @@ -128,7 +128,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -176,16 +176,16 @@ router bgp 65104 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1B.cfg index 86472b46d81..826cc043af8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-BL1B.cfg @@ -31,11 +31,11 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -48,7 +48,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport @@ -59,7 +59,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport @@ -70,7 +70,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport @@ -81,7 +81,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport @@ -120,7 +120,7 @@ interface Management1 ip address 192.168.200.111/24 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.11/31 @@ -128,7 +128,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -176,16 +176,16 @@ router bgp 65104 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg index 363c1be976d..b024e078797 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg @@ -34,7 +34,7 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -81,7 +81,7 @@ interface Management1 ip address 192.168.200.113/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg index bc17d3dc0d9..ea96a326fa3 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg @@ -34,7 +34,7 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -81,7 +81,7 @@ interface Management1 ip address 192.168.200.114/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg index c5081246fe3..71f3bd521a2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg @@ -32,7 +32,7 @@ spanning-tree mst 0 priority 4096 vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport @@ -43,7 +43,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport @@ -54,7 +54,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport @@ -65,7 +65,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -126,16 +126,16 @@ router bgp 65101 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! address-family evpn host-flap detection window 180 threshold 30 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg index e5a4e24f6f1..e1d3ee04961 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg @@ -34,15 +34,15 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,7 +65,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport @@ -76,7 +76,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport @@ -87,7 +87,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport @@ -98,7 +98,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -148,14 +148,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.2/31 @@ -163,7 +163,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -226,16 +226,16 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.6:20 @@ -258,7 +258,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ! router ospf 101 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg index c98c4d91a2d..5f4b6c97e74 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg @@ -34,15 +34,15 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -65,7 +65,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport @@ -76,7 +76,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport @@ -87,7 +87,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport @@ -98,7 +98,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -148,14 +148,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ip address 10.255.251.3/31 @@ -163,7 +163,7 @@ interface Vlan4093 ip ospf area 0.0.0.0 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -226,16 +226,16 @@ router bgp 65102 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.7:20 @@ -258,7 +258,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ! router ospf 101 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE1.cfg index a2ff07aa7f8..fbc88f206f0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE1.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -42,7 +42,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport @@ -53,7 +53,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport @@ -75,7 +75,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport @@ -86,7 +86,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport @@ -97,7 +97,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 kguPGHyy/wCN0mKibi4dLRL4PmsrU4UP ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -146,25 +146,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE2.cfg index 1d9212ef44d..bfc5ad6ade1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE2.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -42,7 +42,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport @@ -53,7 +53,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport @@ -75,7 +75,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -86,7 +86,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport @@ -97,7 +97,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 kguPGHyy/wCN0mKibi4dLRL4PmsrU4UP ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -146,25 +146,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE3.cfg index 58efbd7c6de..55add77cd8a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE3.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE3.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -42,7 +42,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport @@ -53,7 +53,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport @@ -75,7 +75,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport @@ -86,7 +86,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport @@ -97,7 +97,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 kguPGHyy/wCN0mKibi4dLRL4PmsrU4UP ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -146,25 +146,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE4.cfg index 4c73f1320f1..e58050f67f4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SPINE4.cfg @@ -31,7 +31,7 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -42,7 +42,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport @@ -53,7 +53,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport @@ -64,7 +64,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport @@ -75,7 +75,7 @@ interface Ethernet4 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport @@ -86,7 +86,7 @@ interface Ethernet5 ip ospf message-digest-key 1 sha256 7 QB0XEg/PJV6Y5HtvjDdiafrPx/g+JRKk ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport @@ -97,7 +97,7 @@ interface Ethernet6 ip ospf message-digest-key 1 sha256 7 kguPGHyy/wCN0mKibi4dLRL4PmsrU4UP ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -146,25 +146,25 @@ router bgp 65001 neighbor EVPN-OVERLAY-PEERS maximum-routes 0 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65104 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 ! address-family evpn neighbor EVPN-OVERLAY-PEERS activate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index 01c30bf7321..3bc328ebd80 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -34,11 +34,11 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -61,7 +61,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport @@ -72,7 +72,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport @@ -83,7 +83,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport @@ -94,7 +94,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -149,14 +149,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.6/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -221,16 +221,16 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.8:20 @@ -253,7 +253,7 @@ router bgp 65103 router-id 192.168.255.8 update wait-install neighbor 10.255.252.7 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.7 description DC1-SVC3B + neighbor 10.255.252.7 description DC1-SVC3B_Vlan3019 redistribute connected ! router ospf 101 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index 77756696694..73a69db2c67 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -34,11 +34,11 @@ vlan 210 name Tenant_B_OP_Zone_1 ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -61,7 +61,7 @@ interface Port-Channel7 mlag 7 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport @@ -72,7 +72,7 @@ interface Ethernet1 ip ospf message-digest-key 1 sha256 7 /wCirdje6f59x/1Ev+Oe6xok2+5jD3M/ ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport @@ -83,7 +83,7 @@ interface Ethernet2 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport @@ -94,7 +94,7 @@ interface Ethernet3 ip ospf message-digest-key 1 sha256 7 1/hPOHp0a3PkQCWZMV0yGy6bP8mYwQ5y ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -149,14 +149,14 @@ interface Vlan210 ip address virtual 10.2.10.1/24 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.252.7/31 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -221,16 +221,16 @@ router bgp 65103 neighbor MLAG-IPv4-UNDERLAY-PEER route-map RM-MLAG-PEER-IN in neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 ! vlan-aware-bundle Tenant_B_OP_Zone rd 192.168.255.9:20 @@ -253,7 +253,7 @@ router bgp 65103 router-id 192.168.255.9 update wait-install neighbor 10.255.252.6 peer group MLAG-IPv4-UNDERLAY-PEER - neighbor 10.255.252.6 description DC1-SVC3A + neighbor 10.255.252.6 description DC1-SVC3A_Vlan3019 redistribute connected ! router ospf 101 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml index 285d795c87c..312d5c7a6c9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml @@ -38,22 +38,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' static_routes: - vrf: MGMT @@ -128,24 +128,24 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.10/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -183,7 +183,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description: P2P_DC1-SPINE1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -200,7 +200,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description: P2P_DC1-SPINE2_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description: P2P_DC1-SPINE3_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -234,7 +234,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description: P2P_DC1-SPINE4_Ethernet6 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml index 87bed3b86e3..bd85365be9d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml @@ -38,22 +38,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' static_routes: - vrf: MGMT @@ -128,24 +128,24 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.11/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -183,7 +183,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description: P2P_DC1-SPINE1_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -200,7 +200,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description: P2P_DC1-SPINE2_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -217,7 +217,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description: P2P_DC1-SPINE3_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -234,7 +234,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description: P2P_DC1-SPINE4_Ethernet7 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml index 5b0d3ea0324..118a8ab2043 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 @@ -80,7 +80,7 @@ vlans: tenant: Tenant_A vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml index 58628b7ee09..caa0c829f32 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 @@ -80,7 +80,7 @@ vlans: tenant: Tenant_A vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml index 2fa85a961e5..64c166380ad 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml @@ -38,22 +38,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' static_routes: - vrf: MGMT @@ -129,7 +129,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_DC1-SPINE1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -146,7 +146,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_DC1-SPINE2_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -163,7 +163,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description: P2P_DC1-SPINE3_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -180,7 +180,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description: P2P_DC1-SPINE4_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 2599340f595..b8676beeb88 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -49,22 +49,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_B_OP_Zone @@ -84,7 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3019 updates: wait_install: true vlan_aware_bundles: @@ -172,32 +172,32 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 name: Tenant_B_OP_Zone_1 tenant: Tenant_A - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_A vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.2/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -214,7 +214,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -260,7 +260,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_DC1-SPINE1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -277,7 +277,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_DC1-SPINE2_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -294,7 +294,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description: P2P_DC1-SPINE3_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -311,7 +311,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description: P2P_DC1-SPINE4_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 803fe38c1f7..771ceae83e7 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -49,22 +49,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_B_OP_Zone @@ -84,7 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3019 updates: wait_install: true vlan_aware_bundles: @@ -172,32 +172,32 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 name: Tenant_B_OP_Zone_1 tenant: Tenant_A - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_A vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ip_address: 10.255.251.3/31 ospf_network_point_to_point: true ospf_area: 0.0.0.0 - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -214,7 +214,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -260,7 +260,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_DC1-SPINE1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -277,7 +277,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_DC1-SPINE2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -294,7 +294,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description: P2P_DC1-SPINE3_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -311,7 +311,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description: P2P_DC1-SPINE4_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml index 9f23f2797ac..cb1ff35ccc0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml @@ -35,37 +35,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_DC1-LEAF1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_DC1-LEAF2A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -172,7 +172,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_DC1-LEAF2B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description: P2P_DC1-SVC3A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -206,7 +206,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description: P2P_DC1-SVC3B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -223,7 +223,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet1 + description: P2P_DC1-BL1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -240,7 +240,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet1 + description: P2P_DC1-BL1B_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml index 0e5683bb65b..4854bc2118c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml @@ -35,37 +35,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_DC1-LEAF1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_DC1-LEAF2A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -172,7 +172,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_DC1-LEAF2B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description: P2P_DC1-SVC3A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -206,7 +206,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description: P2P_DC1-SVC3B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -223,7 +223,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet2 + description: P2P_DC1-BL1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -240,7 +240,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet2 + description: P2P_DC1-BL1B_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml index 454abdc287d..532d6bb0720 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml @@ -35,37 +35,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description: P2P_DC1-LEAF1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description: P2P_DC1-LEAF2A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -172,7 +172,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description: P2P_DC1-LEAF2B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description: P2P_DC1-SVC3A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -206,7 +206,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description: P2P_DC1-SVC3B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -223,7 +223,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet3 + description: P2P_DC1-BL1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -240,7 +240,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet3 + description: P2P_DC1-BL1B_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml index 6ac0f660b3b..912236aff1e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml @@ -35,37 +35,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65104' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -138,7 +138,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description: P2P_DC1-LEAF1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -155,7 +155,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description: P2P_DC1-LEAF2A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -172,7 +172,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description: P2P_DC1-LEAF2B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description: P2P_DC1-SVC3A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -206,7 +206,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description: P2P_DC1-SVC3B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -223,7 +223,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet4 + description: P2P_DC1-BL1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -240,7 +240,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet4 + description: P2P_DC1-BL1B_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index 18710e7f816..0f54aaa4d93 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -49,22 +49,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_B_OP_Zone @@ -84,7 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.7 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3019 updates: wait_install: true vlan_aware_bundles: @@ -172,20 +172,20 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 name: Tenant_B_OP_Zone_1 tenant: Tenant_A - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_A vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -204,7 +204,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.252.6/31 @@ -250,7 +250,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_DC1-SPINE1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -267,7 +267,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_DC1-SPINE2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -284,7 +284,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description: P2P_DC1-SPINE3_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -301,7 +301,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description: P2P_DC1-SPINE4_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index d8e1393b7bc..e65e82c565f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -49,22 +49,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_B_OP_Zone @@ -84,7 +84,7 @@ router_bgp: neighbors: - ip_address: 10.255.252.6 peer_group: MLAG-IPv4-UNDERLAY-PEER - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3019 updates: wait_install: true vlan_aware_bundles: @@ -172,20 +172,20 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 210 name: Tenant_B_OP_Zone_1 tenant: Tenant_A - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_A vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -204,7 +204,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.252.7/31 @@ -250,7 +250,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description: P2P_DC1-SPINE1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -267,7 +267,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description: P2P_DC1-SPINE2_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -284,7 +284,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description: P2P_DC1-SPINE3_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -301,7 +301,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description: P2P_DC1-SPINE4_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md index 1f824da770c..ee416072789 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -275,68 +275,68 @@ vlan 350 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet11 | P2P_LINK_TO_outside-r1_other1 | - | 10.23.23.1/30 | default | 1500 | False | - | - | +| Ethernet11 | P2P_outside-r1_other1 | - | 10.23.23.1/30 | default | 1500 | False | - | - | | Ethernet4000 | My test | - | 10.1.2.3/12 | default | 1500 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet9 | P2P_LINK_TO_DC1-BL1B_Ethernet9 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet10 | P2P_LINK_TO_DC1-BL1B_Ethernet10 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet6 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet9 | P2P_DC1-BL1B_Ethernet9 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet10 | P2P_DC1-BL1B_Ethernet10 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet9 - description P2P_LINK_TO_DC1-BL1B_Ethernet9 + description P2P_DC1-BL1B_Ethernet9 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet10 - description P2P_LINK_TO_DC1-BL1B_Ethernet10 + description P2P_DC1-BL1B_Ethernet10 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet11 - description P2P_LINK_TO_outside-r1_other1 + description P2P_outside-r1_other1 no shutdown mtu 1500 no switchport @@ -694,16 +694,16 @@ router bgp 65104 neighbor 10.23.23.2 description outside-r1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md index ca9e2d74efd..1f9f42e1b39 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -274,69 +274,69 @@ vlan 350 | Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | | --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- | -| Ethernet11 | P2P_LINK_TO_outside-r1_other2 | - | 10.23.23.5/30 | default | 1500 | False | - | - | +| Ethernet11 | P2P_outside-r1_other2 | - | 10.23.23.5/30 | default | 1500 | False | - | - | | Ethernet4000 | My test | - | 10.1.2.3/12 | default | 1500 | False | - | - | ##### IPv6 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet9 | P2P_LINK_TO_DC1-BL1A_Ethernet9 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet10 | P2P_LINK_TO_DC1-BL1A_Ethernet10 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet11 | P2P_LINK_TO_outside-r1_other2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet7 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet9 | P2P_DC1-BL1A_Ethernet9 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet10 | P2P_DC1-BL1A_Ethernet10 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet11 | P2P_outside-r1_other2 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet9 - description P2P_LINK_TO_DC1-BL1A_Ethernet9 + description P2P_DC1-BL1A_Ethernet9 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet10 - description P2P_LINK_TO_DC1-BL1A_Ethernet10 + description P2P_DC1-BL1A_Ethernet10 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet11 - description P2P_LINK_TO_outside-r1_other2 + description P2P_outside-r1_other2 no shutdown mtu 1500 no switchport @@ -673,16 +673,16 @@ router bgp 65105 neighbor 10.23.23.6 description outside-r1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md index f8284a54889..40e432dd297 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2A.md @@ -264,7 +264,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -322,7 +322,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -405,7 +405,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -418,7 +418,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md index 5f45d666c69..ac62fe588e9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-L2LEAF2B.md @@ -264,7 +264,7 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 4094 | MLAG_PEER | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration @@ -322,7 +322,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -405,7 +405,7 @@ interface Port-Channel3 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -418,7 +418,7 @@ interface Port-Channel3 ```eos ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index d75d66476de..3f66d2f8b44 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -280,38 +280,38 @@ vlan 131 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -652,16 +652,16 @@ router bgp 65101 neighbor interface Ethernet4 peer-group UNDERLAY_PEERS remote-as 65001 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index fd7e349a468..a417372bbaa 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -274,7 +274,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -289,20 +289,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -348,31 +348,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -399,38 +399,38 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -572,7 +572,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -585,13 +585,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -623,7 +623,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -705,48 +705,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.2/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.2/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.2/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1061,16 +1061,16 @@ router bgp 65102 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65102 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1139,7 +1139,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3011 redistribute connected ! address-family ipv4 @@ -1152,7 +1152,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012 redistribute connected ! address-family ipv4 @@ -1165,7 +1165,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009 redistribute connected ! address-family ipv4 @@ -1178,7 +1178,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010 redistribute connected ! address-family ipv4 @@ -1191,7 +1191,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ! address-family ipv4 @@ -1204,7 +1204,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan2 redistribute connected ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index 431d82c0b52..43a0f9d5d4d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -274,7 +274,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -289,20 +289,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -348,31 +348,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -399,38 +399,38 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -572,7 +572,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -585,13 +585,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -623,7 +623,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -705,48 +705,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.3/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.3/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.3/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1061,16 +1061,16 @@ router bgp 65102 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65102 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -1139,7 +1139,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3011 redistribute connected ! address-family ipv4 @@ -1152,7 +1152,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012 redistribute connected ! address-family ipv4 @@ -1165,7 +1165,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009 redistribute connected ! address-family ipv4 @@ -1178,7 +1178,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010 redistribute connected ! address-family ipv4 @@ -1191,7 +1191,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ! address-family ipv4 @@ -1204,7 +1204,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan2 redistribute connected ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md index bfe093349e8..49982f17005 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md @@ -275,7 +275,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -290,20 +290,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -349,31 +349,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -396,22 +396,22 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE5_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE5_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE5_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE5_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE5_Ethernet1 + description P2P_DC1-SPINE5_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE5_Ethernet3 + description P2P_DC1-SPINE5_Ethernet3 no shutdown mtu 1500 no switchport @@ -498,7 +498,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -511,13 +511,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -549,7 +549,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -631,48 +631,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -986,7 +986,7 @@ router bgp 65106 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65106 neighbor 2001:1::5 peer group EVPN-OVERLAY-PEERS neighbor 2001:1::5 remote-as 65001 - neighbor 2001:1::5 description DC1-SPINE5 + neighbor 2001:1::5 description DC1-SPINE5_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md index 2033d3e9f95..229b830a032 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md @@ -275,7 +275,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -290,20 +290,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -349,31 +349,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -396,22 +396,22 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE5_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE5_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE5_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE5_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE5_Ethernet2 + description P2P_DC1-SPINE5_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE5_Ethernet4 + description P2P_DC1-SPINE5_Ethernet4 no shutdown mtu 1500 no switchport @@ -498,7 +498,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -511,13 +511,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -549,7 +549,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -631,48 +631,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -986,7 +986,7 @@ router bgp 65106 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65106 neighbor 2001:1::5 peer group EVPN-OVERLAY-PEERS neighbor 2001:1::5 remote-as 65001 - neighbor 2001:1::5 description DC1-SPINE5 + neighbor 2001:1::5 description DC1-SPINE5_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md index a99ef43af00..ee8946905ab 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md @@ -275,7 +275,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -290,20 +290,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -349,31 +349,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -396,14 +396,14 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE6_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE6_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE6_Ethernet1 + description P2P_DC1-SPINE6_Ethernet1 no shutdown mtu 1500 no switchport @@ -490,7 +490,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -503,13 +503,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -541,7 +541,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -623,48 +623,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -976,7 +976,7 @@ router bgp 65107 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65107 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65001 - neighbor 192.168.255.6 description DC1-SPINE6 + neighbor 192.168.255.6 description DC1-SPINE6_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md index 572f0865615..6f8e4f4858c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md @@ -275,7 +275,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -290,20 +290,20 @@ vlan internal order ascending range 1006 1199 | 211 | Tenant_B_OP_Zone_2 | - | | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -349,31 +349,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -396,14 +396,14 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE6_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE6_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE6_Ethernet2 + description P2P_DC1-SPINE6_Ethernet2 no shutdown mtu 1500 no switchport @@ -490,7 +490,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -503,13 +503,13 @@ interface Loopback100 | Vlan211 | Tenant_B_OP_Zone_2 | Tenant_B_OP_Zone | - | False | | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -541,7 +541,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -623,48 +623,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -976,7 +976,7 @@ router bgp 65107 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65107 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65001 - neighbor 192.168.255.6 description DC1-SPINE6 + neighbor 192.168.255.6 description DC1-SPINE6_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md index e267dccb2a7..f9f005528c4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -467,25 +467,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md index 19384fa1c96..67238694dfd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -467,25 +467,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md index b8641c2ade5..549afc3b4b1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet3 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -467,25 +467,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md index d5982091778..e8108c009fe 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -218,62 +218,62 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF1A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF2A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-LEAF2B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SVC3A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet5 | P2P_DC1-SVC3B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet6 | P2P_DC1-BL1A_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet7 | P2P_DC1-BL1B_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -467,25 +467,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md index 605d259259e..61ba142cea0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md @@ -219,38 +219,38 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF3A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF3B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-LEAF3A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-LEAF3B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF3A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF3B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-LEAF3A_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-LEAF3B_Ethernet2 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF3A_Ethernet1 + description P2P_DC1-LEAF3A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF3B_Ethernet1 + description P2P_DC1-LEAF3B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF3A_Ethernet2 + description P2P_DC1-LEAF3A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF3B_Ethernet2 + description P2P_DC1-LEAF3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -434,10 +434,10 @@ router bgp 65001 neighbor interface Ethernet4 peer-group UNDERLAY_PEERS remote-as 65106 neighbor 2001:1::c peer group EVPN-OVERLAY-PEERS neighbor 2001:1::c remote-as 65106 - neighbor 2001:1::c description DC1-LEAF3A + neighbor 2001:1::c description DC1-LEAF3A_Loopback0 neighbor 2001:1::d peer group EVPN-OVERLAY-PEERS neighbor 2001:1::d remote-as 65106 - neighbor 2001:1::d description DC1-LEAF3B + neighbor 2001:1::d description DC1-LEAF3B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md index 13f751d0a4e..c428e836016 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md @@ -219,22 +219,22 @@ vlan internal order ascending range 1006 1199 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-LEAF4A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-LEAF4B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-LEAF4A_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-LEAF4B_Ethernet1 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF4A_Ethernet1 + description P2P_DC1-LEAF4A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF4B_Ethernet1 + description P2P_DC1-LEAF4B_Ethernet1 no shutdown mtu 1500 no switchport @@ -414,10 +414,10 @@ router bgp 65001 neighbor interface Ethernet2 peer-group UNDERLAY_PEERS remote-as 65107 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65107 - neighbor 192.168.255.14 description DC1-LEAF4A + neighbor 192.168.255.14 description DC1-LEAF4A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65107 - neighbor 192.168.255.15 description DC1-LEAF4B + neighbor 192.168.255.15 description DC1-LEAF4B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 7dba0471562..6487ec07bf9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -274,7 +274,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -292,23 +292,23 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -363,43 +363,43 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -431,38 +431,38 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet4 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -684,7 +684,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -700,16 +700,16 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -747,7 +747,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -847,69 +847,69 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ipv6 enable ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1263,16 +1263,16 @@ router bgp 65103 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65103 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 1cf519bdbd1..49fa6e1545b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -274,7 +274,7 @@ vlan internal order ascending range 1006 1199 | VLAN ID | Name | Trunk Groups | | ------- | ---- | ------------ | -| 2 | MLAG_iBGP_Tenant_C_OP_Zone | MLAG | +| 2 | MLAG_L3_VRF_Tenant_C_OP_Zone | MLAG | | 110 | Tenant_A_OP_Zone_1 | - | | 111 | Tenant_A_OP_Zone_2 | - | | 120 | Tenant_A_WEB_Zone_1 | - | @@ -292,23 +292,23 @@ vlan internal order ascending range 1006 1199 | 310 | Tenant_C_OP_Zone_1 | - | | 311 | Tenant_C_OP_Zone_2 | - | | 350 | Tenant_C_WAN_Zone_1 | - | -| 3009 | MLAG_iBGP_Tenant_A_OP_Zone | MLAG | -| 3010 | MLAG_iBGP_Tenant_A_WEB_Zone | MLAG | -| 3011 | MLAG_iBGP_Tenant_A_APP_Zone | MLAG | -| 3012 | MLAG_iBGP_Tenant_A_DB_Zone | MLAG | -| 3013 | MLAG_iBGP_Tenant_A_WAN_Zone | MLAG | -| 3019 | MLAG_iBGP_Tenant_B_OP_Zone | MLAG | -| 3020 | MLAG_iBGP_Tenant_B_WAN_Zone | MLAG | -| 3030 | MLAG_iBGP_Tenant_C_WAN_Zone | MLAG | -| 4093 | LEAF_PEER_L3 | MLAG | -| 4094 | MLAG_PEER | MLAG | +| 3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | MLAG | +| 3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | MLAG | +| 3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | MLAG | +| 3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | MLAG | +| 3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | MLAG | +| 3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | MLAG | +| 3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | MLAG | +| 3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | MLAG | +| 4093 | MLAG_L3 | MLAG | +| 4094 | MLAG | MLAG | ### VLANs Device Configuration ```eos ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -363,43 +363,43 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ``` @@ -430,38 +430,38 @@ vlan 4094 | Interface | Description | Channel Group | IPv6 Address | VRF | MTU | Shutdown | ND RA Disabled | Managed Config Flag | IPv6 ACL In | IPv6 ACL Out | | --------- | ----------- | --------------| ------------ | --- | --- | -------- | -------------- | -------------------| ----------- | ------------ | -| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet3 | P2P_LINK_TO_DC1-SPINE3_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | -| Ethernet4 | P2P_LINK_TO_DC1-SPINE4_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet1 | P2P_DC1-SPINE1_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet2 | P2P_DC1-SPINE2_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet3 | P2P_DC1-SPINE3_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | +| Ethernet4 | P2P_DC1-SPINE4_Ethernet5 | - | - | default | 1500 | False | - | - | - | - | #### Ethernet Interfaces Device Configuration ```eos ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -658,7 +658,7 @@ interface Loopback100 | Interface | Description | VRF | MTU | Shutdown | | --------- | ----------- | --- | ---- | -------- | -| Vlan2 | MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | +| Vlan2 | MLAG_L3_VRF_Tenant_C_OP_Zone | Tenant_C_OP_Zone | 1500 | False | | Vlan110 | Tenant_A_OP_Zone_1 | Tenant_A_OP_Zone | - | False | | Vlan111 | Tenant_A_OP_Zone_2 | Tenant_A_OP_Zone | - | False | | Vlan120 | Tenant_A_WEB_Zone_1 | Tenant_A_WEB_Zone | - | False | @@ -674,16 +674,16 @@ interface Loopback100 | Vlan310 | Tenant_C_OP_Zone_1 | Tenant_C_OP_Zone | - | False | | Vlan311 | Tenant_C_OP_Zone_2 | Tenant_C_OP_Zone | - | False | | Vlan350 | Tenant_C_WAN_Zone_1 | Tenant_C_WAN_Zone | - | False | -| Vlan3009 | MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | -| Vlan3010 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | -| Vlan3011 | MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | -| Vlan3012 | MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | -| Vlan3013 | MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | -| Vlan3019 | MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | -| Vlan3020 | MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | -| Vlan3030 | MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | -| Vlan4093 | MLAG_PEER_L3_PEERING | default | 1500 | False | -| Vlan4094 | MLAG_PEER | default | 1500 | False | +| Vlan3009 | MLAG_L3_VRF_Tenant_A_OP_Zone | Tenant_A_OP_Zone | 1500 | False | +| Vlan3010 | MLAG_L3_VRF_Tenant_A_WEB_Zone | Tenant_A_WEB_Zone | 1500 | False | +| Vlan3011 | MLAG_L3_VRF_Tenant_A_APP_Zone | Tenant_A_APP_Zone | 1500 | False | +| Vlan3012 | MLAG_L3_VRF_Tenant_A_DB_Zone | Tenant_A_DB_Zone | 1500 | False | +| Vlan3013 | MLAG_L3_VRF_Tenant_A_WAN_Zone | Tenant_A_WAN_Zone | 1500 | False | +| Vlan3019 | MLAG_L3_VRF_Tenant_B_OP_Zone | Tenant_B_OP_Zone | 1500 | False | +| Vlan3020 | MLAG_L3_VRF_Tenant_B_WAN_Zone | Tenant_B_WAN_Zone | 1500 | False | +| Vlan3030 | MLAG_L3_VRF_Tenant_C_WAN_Zone | Tenant_C_WAN_Zone | 1500 | False | +| Vlan4093 | MLAG_L3 | default | 1500 | False | +| Vlan4094 | MLAG | default | 1500 | False | ##### IPv4 @@ -721,7 +721,7 @@ interface Loopback100 ```eos ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -821,69 +821,69 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ipv6 enable ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -1237,16 +1237,16 @@ router bgp 65103 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65103 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg index 5cbcc6036bb..24539346ce8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg @@ -49,49 +49,49 @@ vrf instance Tenant_B_WAN_Zone vrf instance Tenant_C_WAN_Zone ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description P2P_DC1-SPINE1_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description P2P_DC1-SPINE2_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description P2P_DC1-SPINE3_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description P2P_DC1-SPINE4_Ethernet6 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet9 - description P2P_LINK_TO_DC1-BL1B_Ethernet9 + description P2P_DC1-BL1B_Ethernet9 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet10 - description P2P_LINK_TO_DC1-BL1B_Ethernet10 + description P2P_DC1-BL1B_Ethernet10 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet11 - description P2P_LINK_TO_outside-r1_other1 + description P2P_outside-r1_other1 no shutdown mtu 1500 no switchport @@ -212,16 +212,16 @@ router bgp 65104 neighbor 10.23.23.2 description outside-r1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg index 1487ac315df..c772f8d3a67 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg @@ -49,49 +49,49 @@ vrf instance Tenant_B_WAN_Zone vrf instance Tenant_C_WAN_Zone ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description P2P_DC1-SPINE1_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description P2P_DC1-SPINE2_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description P2P_DC1-SPINE3_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description P2P_DC1-SPINE4_Ethernet7 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet9 - description P2P_LINK_TO_DC1-BL1A_Ethernet9 + description P2P_DC1-BL1A_Ethernet9 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet10 - description P2P_LINK_TO_DC1-BL1A_Ethernet10 + description P2P_DC1-BL1A_Ethernet10 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet11 - description P2P_LINK_TO_outside-r1_other2 + description P2P_outside-r1_other2 no shutdown mtu 1500 no switchport @@ -213,16 +213,16 @@ router bgp 65105 neighbor 10.23.23.6 description outside-r1 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_WAN_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg index 5eca5b39df8..125c268e8a5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2A.cfg @@ -84,7 +84,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -131,7 +131,7 @@ interface Management1 ip address 192.168.200.113/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg index e64b13aef11..9fb3327e7b2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-L2LEAF2B.cfg @@ -84,7 +84,7 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -131,7 +131,7 @@ interface Management1 ip address 192.168.200.114/24 ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg index c1ad0d162cc..fb9ac92cf7a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF1A.cfg @@ -52,28 +52,28 @@ vrf instance Tenant_A_APP_Zone vrf instance Tenant_A_WEB_Zone ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description P2P_DC1-SPINE1_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description P2P_DC1-SPINE2_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description P2P_DC1-SPINE3_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description P2P_DC1-SPINE4_Ethernet1 no shutdown mtu 1500 no switchport @@ -202,16 +202,16 @@ router bgp 65101 neighbor interface Ethernet4 peer-group UNDERLAY_PEERS remote-as 65001 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg index 0062c7193a3..dc49c1c619c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -162,28 +162,28 @@ interface Port-Channel12 mlag 12 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description P2P_DC1-SPINE1_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description P2P_DC1-SPINE2_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description P2P_DC1-SPINE3_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description P2P_DC1-SPINE4_Ethernet2 no shutdown mtu 1500 no switchport @@ -242,7 +242,7 @@ interface Management1 ip address 192.168.200.106/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -324,48 +324,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.2/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.2/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.2/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.2/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.2/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -474,16 +474,16 @@ router bgp 65102 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65102 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -552,7 +552,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3011 redistribute connected ! address-family ipv4 @@ -565,7 +565,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3012 redistribute connected ! address-family ipv4 @@ -578,7 +578,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3009 redistribute connected ! address-family ipv4 @@ -591,7 +591,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3010 redistribute connected ! address-family ipv4 @@ -604,7 +604,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan3019 redistribute connected ! address-family ipv4 @@ -617,7 +617,7 @@ router bgp 65102 router-id 192.168.255.6 update wait-install neighbor 10.255.251.3 peer group MLAG_PEER - neighbor 10.255.251.3 description DC1-LEAF2B + neighbor 10.255.251.3 description DC1-LEAF2B_Vlan2 redistribute connected ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg index d0cadb73411..cbb9ac1fefd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -162,28 +162,28 @@ interface Port-Channel12 mlag 12 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description P2P_DC1-SPINE1_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description P2P_DC1-SPINE2_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description P2P_DC1-SPINE3_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description P2P_DC1-SPINE4_Ethernet3 no shutdown mtu 1500 no switchport @@ -242,7 +242,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -324,48 +324,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ip address 10.255.251.3/31 ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ip address 10.255.251.3/31 ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ip address 10.255.251.3/31 ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ip address 10.255.251.3/31 ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ip address 10.255.251.3/31 ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -474,16 +474,16 @@ router bgp 65102 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65102 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone @@ -552,7 +552,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3011 redistribute connected ! address-family ipv4 @@ -565,7 +565,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3012 redistribute connected ! address-family ipv4 @@ -578,7 +578,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3009 redistribute connected ! address-family ipv4 @@ -591,7 +591,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3010 redistribute connected ! address-family ipv4 @@ -604,7 +604,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan3019 redistribute connected ! address-family ipv4 @@ -617,7 +617,7 @@ router bgp 65102 router-id 192.168.255.7 update wait-install neighbor 10.255.251.2 peer group MLAG_PEER - neighbor 10.255.251.2 description DC1-LEAF2A + neighbor 10.255.251.2 description DC1-LEAF2A_Vlan2 redistribute connected ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3A.cfg index 3b4a628636c..4d8e0326038 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3A.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -130,14 +130,14 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE5_Ethernet1 + description P2P_DC1-SPINE5_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE5_Ethernet3 + description P2P_DC1-SPINE5_Ethernet3 no shutdown mtu 1500 no switchport @@ -177,7 +177,7 @@ interface Management1 ip address 192.168.200.106/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -259,48 +259,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -419,7 +419,7 @@ router bgp 65106 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65106 neighbor 2001:1::5 peer group EVPN-OVERLAY-PEERS neighbor 2001:1::5 remote-as 65001 - neighbor 2001:1::5 description DC1-SPINE5 + neighbor 2001:1::5 description DC1-SPINE5_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3B.cfg index d409b7f85a1..c9ef2142bd3 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF3B.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -130,14 +130,14 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE5_Ethernet2 + description P2P_DC1-SPINE5_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE5_Ethernet4 + description P2P_DC1-SPINE5_Ethernet4 no shutdown mtu 1500 no switchport @@ -177,7 +177,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -259,48 +259,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -419,7 +419,7 @@ router bgp 65106 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65106 neighbor 2001:1::5 peer group EVPN-OVERLAY-PEERS neighbor 2001:1::5 remote-as 65001 - neighbor 2001:1::5 description DC1-SPINE5 + neighbor 2001:1::5 description DC1-SPINE5_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4A.cfg index dac0e2de84a..de44eef6251 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4A.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -130,7 +130,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE6_Ethernet1 + description P2P_DC1-SPINE6_Ethernet1 no shutdown mtu 1500 no switchport @@ -170,7 +170,7 @@ interface Management1 ip address 192.168.200.106/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -252,48 +252,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -411,7 +411,7 @@ router bgp 65107 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65107 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65001 - neighbor 192.168.255.6 description DC1-SPINE6 + neighbor 192.168.255.6 description DC1-SPINE6_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4B.cfg index c76bd7967fb..1365a3ba045 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-LEAF4B.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -81,31 +81,31 @@ vlan 311 name Tenant_C_OP_Zone_2 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -130,7 +130,7 @@ interface Port-Channel5 switchport ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE6_Ethernet2 + description P2P_DC1-SPINE6_Ethernet2 no shutdown mtu 1500 no switchport @@ -170,7 +170,7 @@ interface Management1 ip address 192.168.200.107/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -252,48 +252,48 @@ interface Vlan311 ip address virtual 10.3.11.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -411,7 +411,7 @@ router bgp 65107 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65107 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65001 - neighbor 192.168.255.6 description DC1-SPINE6 + neighbor 192.168.255.6 description DC1-SPINE6_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE1.cfg index 6872eb97bba..3d3b811e68e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE1.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description P2P_DC1-LEAF1A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description P2P_DC1-LEAF2A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description P2P_DC1-LEAF2B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description P2P_DC1-SVC3A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description P2P_DC1-SVC3B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet1 + description P2P_DC1-BL1A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet1 + description P2P_DC1-BL1B_Ethernet1 no shutdown mtu 1500 no switchport @@ -136,25 +136,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE2.cfg index efd246c7efb..314a433f587 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE2.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description P2P_DC1-LEAF1A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description P2P_DC1-LEAF2A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description P2P_DC1-LEAF2B_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description P2P_DC1-SVC3A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description P2P_DC1-SVC3B_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet2 + description P2P_DC1-BL1A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet2 + description P2P_DC1-BL1B_Ethernet2 no shutdown mtu 1500 no switchport @@ -136,25 +136,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE3.cfg index 3aba74f39fc..4e6729dde75 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE3.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE3.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description P2P_DC1-LEAF1A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description P2P_DC1-LEAF2A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description P2P_DC1-LEAF2B_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description P2P_DC1-SVC3A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description P2P_DC1-SVC3B_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet3 + description P2P_DC1-BL1A_Ethernet3 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet3 + description P2P_DC1-BL1B_Ethernet3 no shutdown mtu 1500 no switchport @@ -136,25 +136,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE4.cfg index c536f6ea775..da65d202e10 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE4.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE4.cfg @@ -31,49 +31,49 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description P2P_DC1-LEAF1A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description P2P_DC1-LEAF2A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description P2P_DC1-LEAF2B_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description P2P_DC1-SVC3A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet5 - description P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description P2P_DC1-SVC3B_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet6 - description P2P_LINK_TO_DC1-BL1A_Ethernet4 + description P2P_DC1-BL1A_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet7 - description P2P_LINK_TO_DC1-BL1B_Ethernet4 + description P2P_DC1-BL1B_Ethernet4 no shutdown mtu 1500 no switchport @@ -136,25 +136,25 @@ router bgp 65001 neighbor interface Ethernet7 peer-group UNDERLAY_PEERS remote-as 65105 neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.5 remote-as 65101 - neighbor 192.168.255.5 description DC1-LEAF1A + neighbor 192.168.255.5 description DC1-LEAF1A_Loopback0 neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.6 remote-as 65102 - neighbor 192.168.255.6 description DC1-LEAF2A + neighbor 192.168.255.6 description DC1-LEAF2A_Loopback0 neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.7 remote-as 65102 - neighbor 192.168.255.7 description DC1-LEAF2B + neighbor 192.168.255.7 description DC1-LEAF2B_Loopback0 neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.8 remote-as 65103 - neighbor 192.168.255.8 description DC1-SVC3A + neighbor 192.168.255.8 description DC1-SVC3A_Loopback0 neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.9 remote-as 65103 - neighbor 192.168.255.9 description DC1-SVC3B + neighbor 192.168.255.9 description DC1-SVC3B_Loopback0 neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.10 remote-as 65104 - neighbor 192.168.255.10 description DC1-BL1A + neighbor 192.168.255.10 description DC1-BL1A_Loopback0 neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.11 remote-as 65105 - neighbor 192.168.255.11 description DC1-BL1B + neighbor 192.168.255.11 description DC1-BL1B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE5.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE5.cfg index eeaab478787..369b6e3a134 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE5.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE5.cfg @@ -31,28 +31,28 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF3A_Ethernet1 + description P2P_DC1-LEAF3A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF3B_Ethernet1 + description P2P_DC1-LEAF3B_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-LEAF3A_Ethernet2 + description P2P_DC1-LEAF3A_Ethernet2 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-LEAF3B_Ethernet2 + description P2P_DC1-LEAF3B_Ethernet2 no shutdown mtu 1500 no switchport @@ -119,10 +119,10 @@ router bgp 65001 neighbor interface Ethernet4 peer-group UNDERLAY_PEERS remote-as 65106 neighbor 2001:1::c peer group EVPN-OVERLAY-PEERS neighbor 2001:1::c remote-as 65106 - neighbor 2001:1::c description DC1-LEAF3A + neighbor 2001:1::c description DC1-LEAF3A_Loopback0 neighbor 2001:1::d peer group EVPN-OVERLAY-PEERS neighbor 2001:1::d remote-as 65106 - neighbor 2001:1::d description DC1-LEAF3B + neighbor 2001:1::d description DC1-LEAF3B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE6.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE6.cfg index 42f0d0febbe..64872c2fdc0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE6.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SPINE6.cfg @@ -31,14 +31,14 @@ spanning-tree mode none vrf instance MGMT ! interface Ethernet1 - description P2P_LINK_TO_DC1-LEAF4A_Ethernet1 + description P2P_DC1-LEAF4A_Ethernet1 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-LEAF4B_Ethernet1 + description P2P_DC1-LEAF4B_Ethernet1 no shutdown mtu 1500 no switchport @@ -103,10 +103,10 @@ router bgp 65001 neighbor interface Ethernet2 peer-group UNDERLAY_PEERS remote-as 65107 neighbor 192.168.255.14 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.14 remote-as 65107 - neighbor 192.168.255.14 description DC1-LEAF4A + neighbor 192.168.255.14 description DC1-LEAF4A_Loopback0 neighbor 192.168.255.15 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.15 remote-as 65107 - neighbor 192.168.255.15 description DC1-LEAF4B + neighbor 192.168.255.15 description DC1-LEAF4B_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index a8808ba482c..2108caa5b6c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -90,43 +90,43 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -204,28 +204,28 @@ interface Port-Channel15 storm-control unknown-unicast level 2 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description P2P_DC1-SPINE1_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description P2P_DC1-SPINE2_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description P2P_DC1-SPINE3_Ethernet4 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description P2P_DC1-SPINE4_Ethernet4 no shutdown mtu 1500 no switchport @@ -341,7 +341,7 @@ interface Management1 ip address 192.168.200.108/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -441,69 +441,69 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ipv6 enable ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -630,16 +630,16 @@ router bgp 65103 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65103 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index e8762af6ba9..a97db8ad04d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -35,7 +35,7 @@ no spanning-tree vlan-id 4093-4094 spanning-tree mst 0 priority 4096 ! vlan 2 - name MLAG_iBGP_Tenant_C_OP_Zone + name MLAG_L3_VRF_Tenant_C_OP_Zone trunk group MLAG ! vlan 110 @@ -90,43 +90,43 @@ vlan 350 name Tenant_C_WAN_Zone_1 ! vlan 3009 - name MLAG_iBGP_Tenant_A_OP_Zone + name MLAG_L3_VRF_Tenant_A_OP_Zone trunk group MLAG ! vlan 3010 - name MLAG_iBGP_Tenant_A_WEB_Zone + name MLAG_L3_VRF_Tenant_A_WEB_Zone trunk group MLAG ! vlan 3011 - name MLAG_iBGP_Tenant_A_APP_Zone + name MLAG_L3_VRF_Tenant_A_APP_Zone trunk group MLAG ! vlan 3012 - name MLAG_iBGP_Tenant_A_DB_Zone + name MLAG_L3_VRF_Tenant_A_DB_Zone trunk group MLAG ! vlan 3013 - name MLAG_iBGP_Tenant_A_WAN_Zone + name MLAG_L3_VRF_Tenant_A_WAN_Zone trunk group MLAG ! vlan 3019 - name MLAG_iBGP_Tenant_B_OP_Zone + name MLAG_L3_VRF_Tenant_B_OP_Zone trunk group MLAG ! vlan 3020 - name MLAG_iBGP_Tenant_B_WAN_Zone + name MLAG_L3_VRF_Tenant_B_WAN_Zone trunk group MLAG ! vlan 3030 - name MLAG_iBGP_Tenant_C_WAN_Zone + name MLAG_L3_VRF_Tenant_C_WAN_Zone trunk group MLAG ! vlan 4093 - name LEAF_PEER_L3 + name MLAG_L3 trunk group MLAG ! vlan 4094 - name MLAG_PEER + name MLAG trunk group MLAG ! vrf instance MGMT @@ -193,28 +193,28 @@ interface Port-Channel15 storm-control unknown-unicast level 2 ! interface Ethernet1 - description P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description P2P_DC1-SPINE1_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet2 - description P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description P2P_DC1-SPINE2_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet3 - description P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description P2P_DC1-SPINE3_Ethernet5 no shutdown mtu 1500 no switchport ipv6 enable ! interface Ethernet4 - description P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description P2P_DC1-SPINE4_Ethernet5 no shutdown mtu 1500 no switchport @@ -325,7 +325,7 @@ interface Management1 ip address 192.168.200.109/24 ! interface Vlan2 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone + description MLAG_L3_VRF_Tenant_C_OP_Zone no shutdown mtu 1500 vrf Tenant_C_OP_Zone @@ -425,69 +425,69 @@ interface Vlan350 ip address virtual 10.3.50.1/24 ! interface Vlan3009 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone + description MLAG_L3_VRF_Tenant_A_OP_Zone no shutdown mtu 1500 vrf Tenant_A_OP_Zone ipv6 enable ! interface Vlan3010 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone + description MLAG_L3_VRF_Tenant_A_WEB_Zone no shutdown mtu 1500 vrf Tenant_A_WEB_Zone ipv6 enable ! interface Vlan3011 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone + description MLAG_L3_VRF_Tenant_A_APP_Zone no shutdown mtu 1500 vrf Tenant_A_APP_Zone ipv6 enable ! interface Vlan3012 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone + description MLAG_L3_VRF_Tenant_A_DB_Zone no shutdown mtu 1500 vrf Tenant_A_DB_Zone ipv6 enable ! interface Vlan3013 - description MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone + description MLAG_L3_VRF_Tenant_A_WAN_Zone no shutdown mtu 1500 vrf Tenant_A_WAN_Zone ipv6 enable ! interface Vlan3019 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone + description MLAG_L3_VRF_Tenant_B_OP_Zone no shutdown mtu 1500 vrf Tenant_B_OP_Zone ipv6 enable ! interface Vlan3020 - description MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone + description MLAG_L3_VRF_Tenant_B_WAN_Zone no shutdown mtu 1500 vrf Tenant_B_WAN_Zone ipv6 enable ! interface Vlan3030 - description MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone + description MLAG_L3_VRF_Tenant_C_WAN_Zone no shutdown mtu 1500 vrf Tenant_C_WAN_Zone ipv6 enable ! interface Vlan4093 - description MLAG_PEER_L3_PEERING + description MLAG_L3 no shutdown mtu 1500 ipv6 enable ! interface Vlan4094 - description MLAG_PEER + description MLAG no shutdown mtu 1500 no autostate @@ -614,16 +614,16 @@ router bgp 65103 neighbor interface Vlan4093 peer-group MLAG_PEER remote-as 65103 neighbor 192.168.255.1 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.1 remote-as 65001 - neighbor 192.168.255.1 description DC1-SPINE1 + neighbor 192.168.255.1 description DC1-SPINE1_Loopback0 neighbor 192.168.255.2 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.2 remote-as 65001 - neighbor 192.168.255.2 description DC1-SPINE2 + neighbor 192.168.255.2 description DC1-SPINE2_Loopback0 neighbor 192.168.255.3 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.3 remote-as 65001 - neighbor 192.168.255.3 description DC1-SPINE3 + neighbor 192.168.255.3 description DC1-SPINE3_Loopback0 neighbor 192.168.255.4 peer group EVPN-OVERLAY-PEERS neighbor 192.168.255.4 remote-as 65001 - neighbor 192.168.255.4 description DC1-SPINE4 + neighbor 192.168.255.4 description DC1-SPINE4_Loopback0 redistribute connected route-map RM-CONN-2-BGP ! vlan-aware-bundle Tenant_A_APP_Zone diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml index 1404a73e01c..e0955f29753 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml @@ -83,22 +83,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' - ip_address: 10.23.23.2 remote_as: '64900' @@ -297,7 +297,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet6 + description: P2P_DC1-SPINE1_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -307,7 +307,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet6 + description: P2P_DC1-SPINE2_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -317,7 +317,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet6 + description: P2P_DC1-SPINE3_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -327,7 +327,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet6 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet6 + description: P2P_DC1-SPINE4_Ethernet6 shutdown: false mtu: 1500 switchport: @@ -337,32 +337,32 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet9 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet9 switchport: enabled: false shutdown: false mtu: 1500 ipv6_enable: true + description: P2P_DC1-BL1B_Ethernet9 - name: Ethernet10 peer: DC1-BL1B peer_interface: Ethernet10 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet10 switchport: enabled: false shutdown: false mtu: 1500 ipv6_enable: true + description: P2P_DC1-BL1B_Ethernet10 - name: Ethernet11 peer: outside-r1 peer_interface: other1 peer_type: other - description: P2P_LINK_TO_outside-r1_other1 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 10.23.23.1/30 + description: P2P_outside-r1_other1 - name: Ethernet4000 description: My test ip_address: 10.1.2.3/12 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml index e19e151edce..e47b94a3cda 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-BL1B.yml @@ -83,22 +83,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' - ip_address: 10.23.23.6 remote_as: '64900' @@ -297,7 +297,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet7 + description: P2P_DC1-SPINE1_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -307,7 +307,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet7 + description: P2P_DC1-SPINE2_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -317,7 +317,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet7 + description: P2P_DC1-SPINE3_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -327,7 +327,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet7 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet7 + description: P2P_DC1-SPINE4_Ethernet7 shutdown: false mtu: 1500 switchport: @@ -337,33 +337,33 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet9 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet9 switchport: enabled: false shutdown: false mtu: 1500 ipv6_enable: true + description: P2P_DC1-BL1A_Ethernet9 - name: Ethernet10 peer: DC1-BL1A peer_interface: Ethernet10 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet10 switchport: enabled: false shutdown: false mtu: 1500 ipv6_enable: true + description: P2P_DC1-BL1A_Ethernet10 - name: Ethernet11 peer: outside-r1 peer_interface: other2 peer_type: other - description: P2P_LINK_TO_outside-r1_other2 switchport: enabled: false shutdown: false mtu: 1500 ip_address: 10.23.23.5/30 ipv6_enable: true + description: P2P_outside-r1_other2 - name: Ethernet4000 description: My test ip_address: 10.1.2.3/12 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml index 7e2534b47b7..9b9e1abc62b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2A.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -128,7 +128,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml index 003105bd7a2..1c2835435f7 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-L2LEAF2B.yml @@ -72,7 +72,7 @@ ntp: vlans: - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -128,7 +128,7 @@ vlans: tenant: Tenant_C vlan_interfaces: - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml index db9569394a2..e88318c63ee 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF1A.yml @@ -73,22 +73,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -223,7 +223,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet1 + description: P2P_DC1-SPINE1_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -233,7 +233,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet1 + description: P2P_DC1-SPINE2_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -243,7 +243,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet1 + description: P2P_DC1-SPINE3_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -253,7 +253,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet1 + description: P2P_DC1-SPINE4_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 832c7fb2f2f..f32aa6b41e5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -57,7 +57,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF2B remote_as: '65102' - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -93,22 +93,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -128,7 +128,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3011 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3012 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -180,7 +180,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3009 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -206,7 +206,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3010 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -232,7 +232,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan3019 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -258,7 +258,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.3 peer_group: MLAG_PEER - description: DC1-LEAF2B + description: DC1-LEAF2B_Vlan2 address_family_ipv4: neighbors: - ip_address: 10.255.251.3 @@ -432,12 +432,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -447,7 +447,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -458,7 +458,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -469,7 +469,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -480,7 +480,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -497,7 +497,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -508,18 +508,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -545,7 +545,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -570,7 +570,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -598,7 +598,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -628,7 +628,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -652,7 +652,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -676,7 +676,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.2/31 @@ -747,7 +747,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet2 + description: P2P_DC1-SPINE1_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -757,7 +757,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet2 + description: P2P_DC1-SPINE2_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -767,7 +767,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet2 + description: P2P_DC1-SPINE3_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -777,7 +777,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet2 + description: P2P_DC1-SPINE4_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 11034741ac5..306ae9b50a1 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -57,7 +57,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF2A remote_as: '65102' - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -93,22 +93,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -128,7 +128,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3011 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -154,7 +154,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3012 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -180,7 +180,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3009 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -206,7 +206,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3010 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -232,7 +232,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan3019 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -258,7 +258,7 @@ router_bgp: neighbors: - ip_address: 10.255.251.2 peer_group: MLAG_PEER - description: DC1-LEAF2A + description: DC1-LEAF2A_Vlan2 address_family_ipv4: neighbors: - ip_address: 10.255.251.2 @@ -432,12 +432,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -447,7 +447,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -458,7 +458,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -469,7 +469,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -480,7 +480,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -497,7 +497,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -508,18 +508,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -545,7 +545,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -570,7 +570,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -598,7 +598,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -628,7 +628,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -652,7 +652,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -676,7 +676,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ip_address: 10.255.251.3/31 @@ -747,7 +747,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet3 + description: P2P_DC1-SPINE1_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -757,7 +757,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet3 + description: P2P_DC1-SPINE2_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -767,7 +767,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet3 + description: P2P_DC1-SPINE3_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -777,7 +777,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet3 + description: P2P_DC1-SPINE4_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3A.yml index c94834a2073..b755657aa1e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3A.yml @@ -63,7 +63,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF3B remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -89,7 +89,7 @@ router_bgp: - ip_address: 2001:1::5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE5 - description: DC1-SPINE5 + description: DC1-SPINE5_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -110,7 +110,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.12:13 route_targets: @@ -129,7 +129,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.12:10 route_targets: @@ -148,7 +148,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan3009 - name: Tenant_A_WEB_Zone rd: 192.168.255.12:11 route_targets: @@ -167,7 +167,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.12:20 route_targets: @@ -186,7 +186,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan3019 - name: Tenant_C_OP_Zone rd: 192.168.255.12:30 route_targets: @@ -205,7 +205,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3B + description: DC1-LEAF3B_Vlan2 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.12:12 @@ -377,12 +377,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -392,7 +392,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -403,7 +403,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -414,7 +414,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -425,7 +425,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -442,7 +442,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -453,18 +453,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -490,7 +490,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -515,7 +515,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -543,7 +543,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -573,7 +573,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -597,7 +597,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -621,7 +621,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -658,7 +658,7 @@ ethernet_interfaces: peer: DC1-SPINE5 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE5_Ethernet1 + description: P2P_DC1-SPINE5_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -668,7 +668,7 @@ ethernet_interfaces: peer: DC1-SPINE5 peer_interface: Ethernet3 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE5_Ethernet3 + description: P2P_DC1-SPINE5_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3B.yml index b7ada17dfc4..5c30b7b2985 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF3B.yml @@ -63,7 +63,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF3A remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -89,7 +89,7 @@ router_bgp: - ip_address: 2001:1::5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE5 - description: DC1-SPINE5 + description: DC1-SPINE5_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -110,7 +110,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.13:13 route_targets: @@ -129,7 +129,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.13:10 route_targets: @@ -148,7 +148,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan3009 - name: Tenant_A_WEB_Zone rd: 192.168.255.13:11 route_targets: @@ -167,7 +167,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.13:20 route_targets: @@ -186,7 +186,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan3019 - name: Tenant_C_OP_Zone rd: 192.168.255.13:30 route_targets: @@ -205,7 +205,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65106' - description: DC1-LEAF3A + description: DC1-LEAF3A_Vlan2 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.13:12 @@ -377,12 +377,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -392,7 +392,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -403,7 +403,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -414,7 +414,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -425,7 +425,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -442,7 +442,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -453,18 +453,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -490,7 +490,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -515,7 +515,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -543,7 +543,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -573,7 +573,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -597,7 +597,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -621,7 +621,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -658,7 +658,7 @@ ethernet_interfaces: peer: DC1-SPINE5 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE5_Ethernet2 + description: P2P_DC1-SPINE5_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -668,7 +668,7 @@ ethernet_interfaces: peer: DC1-SPINE5 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE5_Ethernet4 + description: P2P_DC1-SPINE5_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4A.yml index 3228755db45..b1ba4e61e02 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4A.yml @@ -63,7 +63,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF4B remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -84,7 +84,7 @@ router_bgp: - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE6 - description: DC1-SPINE6 + description: DC1-SPINE6_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -105,7 +105,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.14:13 route_targets: @@ -124,7 +124,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.14:10 route_targets: @@ -143,7 +143,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan3009 - name: Tenant_A_WEB_Zone rd: 192.168.255.14:11 route_targets: @@ -162,7 +162,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.14:20 route_targets: @@ -181,7 +181,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan3019 - name: Tenant_C_OP_Zone rd: 192.168.255.14:30 route_targets: @@ -200,7 +200,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4B + description: DC1-LEAF4B_Vlan2 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.14:12 @@ -372,12 +372,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -387,7 +387,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -398,7 +398,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -409,7 +409,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -420,7 +420,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -437,7 +437,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -448,18 +448,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -485,7 +485,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -510,7 +510,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -538,7 +538,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -568,7 +568,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -592,7 +592,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -616,7 +616,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -653,7 +653,7 @@ ethernet_interfaces: peer: DC1-SPINE6 peer_interface: Ethernet1 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE6_Ethernet1 + description: P2P_DC1-SPINE6_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4B.yml index 6d733910785..d1e2577248e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF4B.yml @@ -63,7 +63,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-LEAF4A remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -84,7 +84,7 @@ router_bgp: - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE6 - description: DC1-SPINE6 + description: DC1-SPINE6_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -105,7 +105,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.15:13 route_targets: @@ -124,7 +124,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.15:10 route_targets: @@ -143,7 +143,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan3009 - name: Tenant_A_WEB_Zone rd: 192.168.255.15:11 route_targets: @@ -162,7 +162,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.15:20 route_targets: @@ -181,7 +181,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan3019 - name: Tenant_C_OP_Zone rd: 192.168.255.15:30 route_targets: @@ -200,7 +200,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65107' - description: DC1-LEAF4A + description: DC1-LEAF4A_Vlan2 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.15:12 @@ -372,12 +372,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -387,7 +387,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -398,7 +398,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -409,7 +409,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -420,7 +420,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -437,7 +437,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -448,18 +448,18 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -485,7 +485,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -510,7 +510,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -538,7 +538,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -568,7 +568,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -592,7 +592,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -616,7 +616,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -653,7 +653,7 @@ ethernet_interfaces: peer: DC1-SPINE6 peer_interface: Ethernet2 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE6_Ethernet2 + description: P2P_DC1-SPINE6_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml index 143ce195d4f..c0bb4499ba5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE1.yml @@ -85,37 +85,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet1 + description: P2P_DC1-LEAF1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -199,7 +199,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet1 + description: P2P_DC1-LEAF2A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -209,7 +209,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet1 + description: P2P_DC1-LEAF2B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -219,7 +219,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet1 + description: P2P_DC1-SVC3A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -229,7 +229,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet1 + description: P2P_DC1-SVC3B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -239,7 +239,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet1 + description: P2P_DC1-BL1A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -249,7 +249,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet1 + description: P2P_DC1-BL1B_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml index 37ba31fe1de..3c6f10aefe9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE2.yml @@ -85,37 +85,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet2 + description: P2P_DC1-LEAF1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -199,7 +199,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet2 + description: P2P_DC1-LEAF2A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -209,7 +209,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet2 + description: P2P_DC1-LEAF2B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -219,7 +219,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet2 + description: P2P_DC1-SVC3A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -229,7 +229,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet2 + description: P2P_DC1-SVC3B_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -239,7 +239,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet2 + description: P2P_DC1-BL1A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -249,7 +249,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet2 + description: P2P_DC1-BL1B_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml index 61ccb791825..d63d703cdbd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE3.yml @@ -85,37 +85,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet3 + description: P2P_DC1-LEAF1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -199,7 +199,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet3 + description: P2P_DC1-LEAF2A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -209,7 +209,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet3 + description: P2P_DC1-LEAF2B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -219,7 +219,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet3 + description: P2P_DC1-SVC3A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -229,7 +229,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet3 + description: P2P_DC1-SVC3B_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -239,7 +239,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet3 + description: P2P_DC1-BL1A_Ethernet3 shutdown: false mtu: 1500 switchport: @@ -249,7 +249,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet3 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet3 + description: P2P_DC1-BL1B_Ethernet3 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml index 6b81b158087..c53b13dc4e0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE4.yml @@ -85,37 +85,37 @@ router_bgp: - ip_address: 192.168.255.10 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1A - description: DC1-BL1A + description: DC1-BL1A_Loopback0 remote_as: '65104' - ip_address: 192.168.255.11 peer_group: EVPN-OVERLAY-PEERS peer: DC1-BL1B - description: DC1-BL1B + description: DC1-BL1B_Loopback0 remote_as: '65105' - ip_address: 192.168.255.5 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF1A - description: DC1-LEAF1A + description: DC1-LEAF1A_Loopback0 remote_as: '65101' - ip_address: 192.168.255.6 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2A - description: DC1-LEAF2A + description: DC1-LEAF2A_Loopback0 remote_as: '65102' - ip_address: 192.168.255.7 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF2B - description: DC1-LEAF2B + description: DC1-LEAF2B_Loopback0 remote_as: '65102' - ip_address: 192.168.255.8 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3A - description: DC1-SVC3A + description: DC1-SVC3A_Loopback0 remote_as: '65103' - ip_address: 192.168.255.9 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SVC3B - description: DC1-SVC3B + description: DC1-SVC3B_Loopback0 remote_as: '65103' static_routes: - vrf: MGMT @@ -189,7 +189,7 @@ ethernet_interfaces: peer: DC1-LEAF1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF1A_Ethernet4 + description: P2P_DC1-LEAF1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -199,7 +199,7 @@ ethernet_interfaces: peer: DC1-LEAF2A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2A_Ethernet4 + description: P2P_DC1-LEAF2A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -209,7 +209,7 @@ ethernet_interfaces: peer: DC1-LEAF2B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF2B_Ethernet4 + description: P2P_DC1-LEAF2B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -219,7 +219,7 @@ ethernet_interfaces: peer: DC1-SVC3A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3A_Ethernet4 + description: P2P_DC1-SVC3A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -229,7 +229,7 @@ ethernet_interfaces: peer: DC1-SVC3B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-SVC3B_Ethernet4 + description: P2P_DC1-SVC3B_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -239,7 +239,7 @@ ethernet_interfaces: peer: DC1-BL1A peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1A_Ethernet4 + description: P2P_DC1-BL1A_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -249,7 +249,7 @@ ethernet_interfaces: peer: DC1-BL1B peer_interface: Ethernet4 peer_type: l3leaf - description: P2P_LINK_TO_DC1-BL1B_Ethernet4 + description: P2P_DC1-BL1B_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE5.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE5.yml index 43fa909a024..137180a9036 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE5.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE5.yml @@ -74,12 +74,12 @@ router_bgp: - ip_address: 2001:1::c peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF3A - description: DC1-LEAF3A + description: DC1-LEAF3A_Loopback0 remote_as: '65106' - ip_address: 2001:1::d peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF3B - description: DC1-LEAF3B + description: DC1-LEAF3B_Loopback0 remote_as: '65106' static_routes: - vrf: MGMT @@ -153,7 +153,7 @@ ethernet_interfaces: peer: DC1-LEAF3A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF3A_Ethernet1 + description: P2P_DC1-LEAF3A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -163,7 +163,7 @@ ethernet_interfaces: peer: DC1-LEAF3B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF3B_Ethernet1 + description: P2P_DC1-LEAF3B_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -173,7 +173,7 @@ ethernet_interfaces: peer: DC1-LEAF3A peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF3A_Ethernet2 + description: P2P_DC1-LEAF3A_Ethernet2 shutdown: false mtu: 1500 switchport: @@ -183,7 +183,7 @@ ethernet_interfaces: peer: DC1-LEAF3B peer_interface: Ethernet2 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF3B_Ethernet2 + description: P2P_DC1-LEAF3B_Ethernet2 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE6.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE6.yml index 113ae4ed650..ec1833ec136 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE6.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SPINE6.yml @@ -64,12 +64,12 @@ router_bgp: - ip_address: 192.168.255.14 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF4A - description: DC1-LEAF4A + description: DC1-LEAF4A_Loopback0 remote_as: '65107' - ip_address: 192.168.255.15 peer_group: EVPN-OVERLAY-PEERS peer: DC1-LEAF4B - description: DC1-LEAF4B + description: DC1-LEAF4B_Loopback0 remote_as: '65107' static_routes: - vrf: MGMT @@ -143,7 +143,7 @@ ethernet_interfaces: peer: DC1-LEAF4A peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF4A_Ethernet1 + description: P2P_DC1-LEAF4A_Ethernet1 shutdown: false mtu: 1500 switchport: @@ -153,7 +153,7 @@ ethernet_interfaces: peer: DC1-LEAF4B peer_interface: Ethernet1 peer_type: l3leaf - description: P2P_LINK_TO_DC1-LEAF4B_Ethernet1 + description: P2P_DC1-LEAF4B_Ethernet1 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index 6d10b60043f..a1524a6b5c0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -57,7 +57,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-SVC3B remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -93,22 +93,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -129,7 +129,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.8:13 route_targets: @@ -148,7 +148,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.8:10 route_targets: @@ -167,7 +167,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3009 - name: Tenant_A_WAN_Zone rd: 192.168.255.8:14 route_targets: @@ -186,7 +186,7 @@ router_bgp: - name: Vlan3013 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3013 - name: Tenant_A_WEB_Zone rd: 192.168.255.8:11 route_targets: @@ -205,7 +205,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.8:20 route_targets: @@ -224,7 +224,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3019 - name: Tenant_B_WAN_Zone rd: 192.168.255.8:21 route_targets: @@ -243,7 +243,7 @@ router_bgp: - name: Vlan3020 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3020 - name: Tenant_C_OP_Zone rd: 192.168.255.8:30 route_targets: @@ -262,7 +262,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan2 - name: Tenant_C_WAN_Zone rd: 192.168.255.8:31 route_targets: @@ -281,7 +281,7 @@ router_bgp: - name: Vlan3030 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3B + description: DC1-SVC3B_Vlan3030 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.8:12 @@ -489,12 +489,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -504,7 +504,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -515,7 +515,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -526,7 +526,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -534,7 +534,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -545,7 +545,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -562,7 +562,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -570,7 +570,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -581,7 +581,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -589,18 +589,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -626,7 +626,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -651,7 +651,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -679,7 +679,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -695,7 +695,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ipv6_enable: true @@ -725,7 +725,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -749,7 +749,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -765,7 +765,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ipv6_enable: true @@ -789,7 +789,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -805,7 +805,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ipv6_enable: true @@ -913,7 +913,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet4 + description: P2P_DC1-SPINE1_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -923,7 +923,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet4 + description: P2P_DC1-SPINE2_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -933,7 +933,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet4 + description: P2P_DC1-SPINE3_Ethernet4 shutdown: false mtu: 1500 switchport: @@ -943,7 +943,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet4 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet4 + description: P2P_DC1-SPINE4_Ethernet4 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 16d093f741d..847a9aa2b22 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -57,7 +57,7 @@ router_bgp: peer_group: MLAG_PEER peer: DC1-SVC3A remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan4093 - name: Ethernet1 peer_group: UNDERLAY_PEERS remote_as: '65001' @@ -93,22 +93,22 @@ router_bgp: - ip_address: 192.168.255.1 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE1 - description: DC1-SPINE1 + description: DC1-SPINE1_Loopback0 remote_as: '65001' - ip_address: 192.168.255.2 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE2 - description: DC1-SPINE2 + description: DC1-SPINE2_Loopback0 remote_as: '65001' - ip_address: 192.168.255.3 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE3 - description: DC1-SPINE3 + description: DC1-SPINE3_Loopback0 remote_as: '65001' - ip_address: 192.168.255.4 peer_group: EVPN-OVERLAY-PEERS peer: DC1-SPINE4 - description: DC1-SPINE4 + description: DC1-SPINE4_Loopback0 remote_as: '65001' vrfs: - name: Tenant_A_APP_Zone @@ -129,7 +129,7 @@ router_bgp: - name: Vlan3011 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3011 - name: Tenant_A_DB_Zone rd: 192.168.255.9:13 route_targets: @@ -148,7 +148,7 @@ router_bgp: - name: Vlan3012 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3012 - name: Tenant_A_OP_Zone rd: 192.168.255.9:10 route_targets: @@ -167,7 +167,7 @@ router_bgp: - name: Vlan3009 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3009 - name: Tenant_A_WAN_Zone rd: 192.168.255.9:14 route_targets: @@ -186,7 +186,7 @@ router_bgp: - name: Vlan3013 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3013 - name: Tenant_A_WEB_Zone rd: 192.168.255.9:11 route_targets: @@ -205,7 +205,7 @@ router_bgp: - name: Vlan3010 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3010 - name: Tenant_B_OP_Zone rd: 192.168.255.9:20 route_targets: @@ -224,7 +224,7 @@ router_bgp: - name: Vlan3019 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3019 - name: Tenant_B_WAN_Zone rd: 192.168.255.9:21 route_targets: @@ -243,7 +243,7 @@ router_bgp: - name: Vlan3020 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3020 - name: Tenant_C_OP_Zone rd: 192.168.255.9:30 route_targets: @@ -262,7 +262,7 @@ router_bgp: - name: Vlan2 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan2 - name: Tenant_C_WAN_Zone rd: 192.168.255.9:31 route_targets: @@ -281,7 +281,7 @@ router_bgp: - name: Vlan3030 peer_group: MLAG_PEER remote_as: '65103' - description: DC1-SVC3A + description: DC1-SVC3A_Vlan3030 vlan_aware_bundles: - name: Tenant_A_APP_Zone rd: 192.168.255.9:12 @@ -489,12 +489,12 @@ ntp: vlans: - id: 4093 tenant: system - name: LEAF_PEER_L3 + name: MLAG_L3 trunk_groups: - MLAG - id: 4094 tenant: system - name: MLAG_PEER + name: MLAG trunk_groups: - MLAG - id: 130 @@ -504,7 +504,7 @@ vlans: name: Tenant_A_APP_Zone_2 tenant: Tenant_A - id: 3011 - name: MLAG_iBGP_Tenant_A_APP_Zone + name: MLAG_L3_VRF_Tenant_A_APP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -515,7 +515,7 @@ vlans: name: Tenant_A_DB_Zone_2 tenant: Tenant_A - id: 3012 - name: MLAG_iBGP_Tenant_A_DB_Zone + name: MLAG_L3_VRF_Tenant_A_DB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -526,7 +526,7 @@ vlans: name: Tenant_A_OP_Zone_2 tenant: Tenant_A - id: 3009 - name: MLAG_iBGP_Tenant_A_OP_Zone + name: MLAG_L3_VRF_Tenant_A_OP_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -534,7 +534,7 @@ vlans: name: Tenant_A_WAN_Zone_1 tenant: Tenant_A - id: 3013 - name: MLAG_iBGP_Tenant_A_WAN_Zone + name: MLAG_L3_VRF_Tenant_A_WAN_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -545,7 +545,7 @@ vlans: name: Tenant_A_WEBZone_2 tenant: Tenant_A - id: 3010 - name: MLAG_iBGP_Tenant_A_WEB_Zone + name: MLAG_L3_VRF_Tenant_A_WEB_Zone trunk_groups: - MLAG tenant: Tenant_A @@ -562,7 +562,7 @@ vlans: name: Tenant_B_OP_Zone_2 tenant: Tenant_B - id: 3019 - name: MLAG_iBGP_Tenant_B_OP_Zone + name: MLAG_L3_VRF_Tenant_B_OP_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -570,7 +570,7 @@ vlans: name: Tenant_B_WAN_Zone_1 tenant: Tenant_B - id: 3020 - name: MLAG_iBGP_Tenant_B_WAN_Zone + name: MLAG_L3_VRF_Tenant_B_WAN_Zone trunk_groups: - MLAG tenant: Tenant_B @@ -581,7 +581,7 @@ vlans: name: Tenant_C_OP_Zone_2 tenant: Tenant_C - id: 2 - name: MLAG_iBGP_Tenant_C_OP_Zone + name: MLAG_L3_VRF_Tenant_C_OP_Zone trunk_groups: - MLAG tenant: Tenant_C @@ -589,18 +589,18 @@ vlans: name: Tenant_C_WAN_Zone_1 tenant: Tenant_C - id: 3030 - name: MLAG_iBGP_Tenant_C_WAN_Zone + name: MLAG_L3_VRF_Tenant_C_WAN_Zone trunk_groups: - MLAG tenant: Tenant_C vlan_interfaces: - name: Vlan4093 - description: MLAG_PEER_L3_PEERING + description: MLAG_L3 shutdown: false mtu: 1500 ipv6_enable: true - name: Vlan4094 - description: MLAG_PEER + description: MLAG shutdown: false no_autostate: true mtu: 1500 @@ -626,7 +626,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_APP_Zone' + description: MLAG_L3_VRF_Tenant_A_APP_Zone vrf: Tenant_A_APP_Zone mtu: 1500 ipv6_enable: true @@ -651,7 +651,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_DB_Zone' + description: MLAG_L3_VRF_Tenant_A_DB_Zone vrf: Tenant_A_DB_Zone mtu: 1500 ipv6_enable: true @@ -679,7 +679,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_OP_Zone' + description: MLAG_L3_VRF_Tenant_A_OP_Zone vrf: Tenant_A_OP_Zone mtu: 1500 ipv6_enable: true @@ -695,7 +695,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WAN_Zone' + description: MLAG_L3_VRF_Tenant_A_WAN_Zone vrf: Tenant_A_WAN_Zone mtu: 1500 ipv6_enable: true @@ -725,7 +725,7 @@ vlan_interfaces: tenant: Tenant_A type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_A_WEB_Zone' + description: MLAG_L3_VRF_Tenant_A_WEB_Zone vrf: Tenant_A_WEB_Zone mtu: 1500 ipv6_enable: true @@ -749,7 +749,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_OP_Zone' + description: MLAG_L3_VRF_Tenant_B_OP_Zone vrf: Tenant_B_OP_Zone mtu: 1500 ipv6_enable: true @@ -765,7 +765,7 @@ vlan_interfaces: tenant: Tenant_B type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_B_WAN_Zone' + description: MLAG_L3_VRF_Tenant_B_WAN_Zone vrf: Tenant_B_WAN_Zone mtu: 1500 ipv6_enable: true @@ -789,7 +789,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_OP_Zone' + description: MLAG_L3_VRF_Tenant_C_OP_Zone vrf: Tenant_C_OP_Zone mtu: 1500 ipv6_enable: true @@ -805,7 +805,7 @@ vlan_interfaces: tenant: Tenant_C type: underlay_peering shutdown: false - description: 'MLAG_PEER_L3_iBGP: vrf Tenant_C_WAN_Zone' + description: MLAG_L3_VRF_Tenant_C_WAN_Zone vrf: Tenant_C_WAN_Zone mtu: 1500 ipv6_enable: true @@ -901,7 +901,7 @@ ethernet_interfaces: peer: DC1-SPINE1 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE1_Ethernet5 + description: P2P_DC1-SPINE1_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -911,7 +911,7 @@ ethernet_interfaces: peer: DC1-SPINE2 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE2_Ethernet5 + description: P2P_DC1-SPINE2_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -921,7 +921,7 @@ ethernet_interfaces: peer: DC1-SPINE3 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE3_Ethernet5 + description: P2P_DC1-SPINE3_Ethernet5 shutdown: false mtu: 1500 switchport: @@ -931,7 +931,7 @@ ethernet_interfaces: peer: DC1-SPINE4 peer_interface: Ethernet5 peer_type: spine - description: P2P_LINK_TO_DC1-SPINE4_Ethernet5 + description: P2P_DC1-SPINE4_Ethernet5 shutdown: false mtu: 1500 switchport: diff --git a/ansible_collections/arista/avd/requirements.txt b/ansible_collections/arista/avd/requirements.txt index 805c3396439..c11f623ce78 100644 --- a/ansible_collections/arista/avd/requirements.txt +++ b/ansible_collections/arista/avd/requirements.txt @@ -1,3 +1,3 @@ # PyAVD must follow the exact same version as the Ansible collection. # For development this should be installed as an editable install as specified in requirement-dev.txt -pyavd[ansible-collection]==5.0.0.dev7 +pyavd[ansible-collection]==5.0.0.dev8 diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-adaptive-virtual-topology.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-adaptive-virtual-topology.md index 674b00b1bb1..0075e201822 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-adaptive-virtual-topology.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-adaptive-virtual-topology.md @@ -9,6 +9,7 @@ | -------- | ---- | -------- | ------- | ------------------ | ----------- | | [router_adaptive_virtual_topology](## "router_adaptive_virtual_topology") | Dictionary | | | | | | [  topology_role](## "router_adaptive_virtual_topology.topology_role") | String | | | Valid Values:
- edge
- pathfinder
- transit region
- transit zone | Role name. | + | [  gateway_vxlan](## "router_adaptive_virtual_topology.gateway_vxlan") | Boolean | | | | Enables VXLAN gateway router profile.
Only applicable for `topology_role: edge`, `topology_role: transit region` or `topology_role: transit zone`. | | [  region](## "router_adaptive_virtual_topology.region") | Dictionary | | | | Region name and ID. | | [    name](## "router_adaptive_virtual_topology.region.name") | String | Required | | Pattern: `^[A-Za-z0-9_.:{}\[\]-]+$` | | | [    id](## "router_adaptive_virtual_topology.region.id") | Integer | Required | | Min: 1
Max: 255 | | @@ -44,6 +45,10 @@ # Role name. topology_role: + # Enables VXLAN gateway router profile. + # Only applicable for `topology_role: edge`, `topology_role: transit region` or `topology_role: transit zone`. + gateway_vxlan: + # Region name and ID. region: name: diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md index d0bc0b68596..1ad806b3e10 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md @@ -41,6 +41,11 @@ | [      always](## "router_bgp.bgp.route_reflector_preserve_attributes.always") | Boolean | | | | | | [    bestpath](## "router_bgp.bgp.bestpath") | Dictionary | | | | | | [      d_path](## "router_bgp.bgp.bestpath.d_path") | Boolean | | | | | + | [    additional_paths](## "router_bgp.bgp.additional_paths") | Dictionary | | | | | + | [      receive](## "router_bgp.bgp.additional_paths.receive") | Boolean | | | | Enable or disable reception of additional-paths. | + | [      send](## "router_bgp.bgp.additional_paths.send") | String | | | Valid Values:
- any
- backup
- ecmp
- limit
- disabled | Select an option to send multiple paths for same prefix through bgp updates.
any: Send any eligible path.
backup: Best path and installed backup path.
ecmp: All paths in best path ECMP group.
limit: Limit to n eligible paths.
disabled: Disable sending any path. | + | [      send_ecmp_limit](## "router_bgp.bgp.additional_paths.send_ecmp_limit") | Integer | | | Min: 2
Max: 64 | Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. | + | [      send_limit](## "router_bgp.bgp.additional_paths.send_limit") | Integer | | | Min: 2
Max: 64 | Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. | | [    redistribute_internal](## "router_bgp.bgp.redistribute_internal") | Boolean | | | | Allow redistribution of iBGP routes into an Interior Gateway Protocol (IGP). EOS default is true. | | [  listen_ranges](## "router_bgp.listen_ranges") | List, items: Dictionary | | | | Improved "listen_ranges" data model to support multiple listen ranges and additional filter capabilities.
| | [    - prefix](## "router_bgp.listen_ranges.[].prefix") | String | | | | IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". | @@ -275,7 +280,7 @@ | [  address_family_evpn](## "router_bgp.address_family_evpn") | Dictionary | | | | | | [    domain_identifier](## "router_bgp.address_family_evpn.domain_identifier") | String | | | | | | [    neighbor_default](## "router_bgp.address_family_evpn.neighbor_default") | Dictionary | | | | | - | [      encapsulation](## "router_bgp.address_family_evpn.neighbor_default.encapsulation") | String | | | Valid Values:
- vxlan
- mpls | | + | [      encapsulation](## "router_bgp.address_family_evpn.neighbor_default.encapsulation") | String | | | Valid Values:
- vxlan
- mpls
- path-selection | Transport encapsulation for neighbor. | | [      next_hop_self_source_interface](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_source_interface") | String | | | | Source interface name. | | [      next_hop_self_received_evpn_routes](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_received_evpn_routes") | Dictionary | | | | | | [        enable](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_received_evpn_routes.enable") | Boolean | | | | | @@ -292,6 +297,7 @@ | [          enabled](## "router_bgp.address_family_evpn.neighbors.[].default_route.enabled") | Boolean | | | | | | [          rcf](## "router_bgp.address_family_evpn.neighbors.[].default_route.rcf") | String | | | | RCF function name with parenthesis.
Example: MyFunction(myarg). | | [          route_map](## "router_bgp.address_family_evpn.neighbors.[].default_route.route_map") | String | | | | | + | [        encapsulation](## "router_bgp.address_family_evpn.neighbors.[].encapsulation") | String | | | Valid Values:
- vxlan
- mpls
- path-selection | Transport encapsulation for the neighbor. | | [    peer_groups](## "router_bgp.address_family_evpn.peer_groups") | List, items: Dictionary | | | | | | [      - name](## "router_bgp.address_family_evpn.peer_groups.[].name") | String | Required, Unique | | | Peer-group name. | | [        activate](## "router_bgp.address_family_evpn.peer_groups.[].activate") | Boolean | | | | | @@ -304,7 +310,7 @@ | [          rcf](## "router_bgp.address_family_evpn.peer_groups.[].default_route.rcf") | String | | | | RCF function name with parenthesis.
Example: MyFunction(myarg). | | [          route_map](## "router_bgp.address_family_evpn.peer_groups.[].default_route.route_map") | String | | | | | | [        domain_remote](## "router_bgp.address_family_evpn.peer_groups.[].domain_remote") | Boolean | | | | | - | [        encapsulation](## "router_bgp.address_family_evpn.peer_groups.[].encapsulation") | String | | | Valid Values:
- vxlan
- mpls | | + | [        encapsulation](## "router_bgp.address_family_evpn.peer_groups.[].encapsulation") | String | | | Valid Values:
- vxlan
- mpls
- path-selection | Transport encapsulation for the peer-group. | | [        additional_paths](## "router_bgp.address_family_evpn.peer_groups.[].additional_paths") | Dictionary | | | | | | [          receive](## "router_bgp.address_family_evpn.peer_groups.[].additional_paths.receive") | Boolean | | | | | | [          send](## "router_bgp.address_family_evpn.peer_groups.[].additional_paths.send") | Dictionary | | | | | @@ -385,6 +391,119 @@ | [        include_leaked](## "router_bgp.address_family_ipv4.redistribute_routes.[].include_leaked") | Boolean | | | | Only applicable if `source_protocol` is one of `connected`, `static`, `isis`, `ospf`, `ospfv3`. | | [        rcf](## "router_bgp.address_family_ipv4.redistribute_routes.[].rcf") | String | | | | RCF function name with parenthesis.
Example: MyFunction(myarg).
`route_map` and `rcf` are mutually exclusive. `route_map` takes precedence.
Only applicable if `source_protocol` is one of `connected`, `static`, `isis`, `user`, `dynamic`. | | [        ospf_route_type](## "router_bgp.address_family_ipv4.redistribute_routes.[].ospf_route_type") | String | | | Valid Values:
- external
- internal
- nssa-external
- nssa-external 1
- nssa-external 2 | Routes learned by the OSPF protocol.
The `ospf_route_type` is valid for source_protocols 'ospf' and 'ospfv3'.
| + | [  address_family_ipv4_labeled_unicast](## "router_bgp.address_family_ipv4_labeled_unicast") | Dictionary | | | | | + | [    aigp_session](## "router_bgp.address_family_ipv4_labeled_unicast.aigp_session") | Dictionary | | | | | + | [      confederation](## "router_bgp.address_family_ipv4_labeled_unicast.aigp_session.confederation") | Boolean | | | | | + | [      ebgp](## "router_bgp.address_family_ipv4_labeled_unicast.aigp_session.ebgp") | Boolean | | | | | + | [      ibgp](## "router_bgp.address_family_ipv4_labeled_unicast.aigp_session.ibgp") | Boolean | | | | | + | [    bgp](## "router_bgp.address_family_ipv4_labeled_unicast.bgp") | Dictionary | | | | | + | [      additional_paths](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths") | Dictionary | | | | | + | [        receive](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.receive") | Boolean | | | | Enable or disable reception of additional-paths. | + | [        send](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send") | String | | | Valid Values:
- any
- backup
- ecmp
- limit
- disabled | Select an option to send multiple paths for same prefix through bgp updates.
any: Send any eligible path.
backup: Best path and installed backup path.
ecmp: All paths in best path ECMP group.
limit: Limit to n eligible paths.
disabled: Disable sending any path. | + | [        send_ecmp_limit](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_ecmp_limit") | Integer | | | Min: 2
Max: 64 | Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. | + | [        send_limit](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_limit") | Integer | | | Min: 2
Max: 64 | Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. | + | [      missing_policy](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy") | Dictionary | | | | Missing policy configuration for all address-families. | + | [        direction_in](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_in") | Dictionary | | | | Missing policy inbound direction. | + | [          action](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_in.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [          include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_in.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [          include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_in.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [          include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_in.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [        direction_out](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_out") | Dictionary | | | | Missing policy outbound direction. | + | [          action](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_out.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [          include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_out.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [          include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_out.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [          include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy.direction_out.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [      next_hop_unchanged](## "router_bgp.address_family_ipv4_labeled_unicast.bgp.next_hop_unchanged") | Boolean | | | | | + | [    graceful_restart](## "router_bgp.address_family_ipv4_labeled_unicast.graceful_restart") | Boolean | | | | | + | [    label_local_termination](## "router_bgp.address_family_ipv4_labeled_unicast.label_local_termination") | String | | | Valid Values:
- explicit-null
- implicit-null | | + | [    lfib_entry_installation_skipped](## "router_bgp.address_family_ipv4_labeled_unicast.lfib_entry_installation_skipped") | Boolean | | | | Skip LFIB entry installation and next hop self route advertisements. | + | [    neighbor_default](## "router_bgp.address_family_ipv4_labeled_unicast.neighbor_default") | Dictionary | | | | | + | [      next_hop_self](## "router_bgp.address_family_ipv4_labeled_unicast.neighbor_default.next_hop_self") | Boolean | | | | | + | [    peer_groups](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups") | List, items: Dictionary | | | | | + | [      - name](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].name") | String | Required, Unique | | | Peer-group name. | + | [        activate](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].activate") | Boolean | | | | | + | [        additional_paths](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].additional_paths") | Dictionary | | | | | + | [          receive](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].additional_paths.receive") | Boolean | | | | Enable or disable reception of additional-paths. | + | [          send](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].additional_paths.send") | String | | | Valid Values:
- any
- backup
- ecmp
- limit
- disabled | Select an option to send multiple paths for same prefix through bgp updates.
any: Send any eligible path.
backup: Best path and installed backup path.
ecmp: All paths in best path ECMP group.
limit: Limit to n eligible paths.
disabled: Disable sending any path. | + | [          send_ecmp_limit](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].additional_paths.send_ecmp_limit") | Integer | | | Min: 2
Max: 64 | Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. | + | [          send_limit](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].additional_paths.send_limit") | Integer | | | Min: 2
Max: 64 | Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. | + | [        aigp_session](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].aigp_session") | Boolean | | | | | + | [        graceful_restart](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].graceful_restart") | Boolean | | | | | + | [        graceful_restart_helper](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].graceful_restart_helper") | Dictionary | | | | | + | [          stale_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].graceful_restart_helper.stale_route_map") | String | | | | | + | [        maximum_advertised_routes](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].maximum_advertised_routes") | Integer | | | Min: 0
Max: 4294967294 | Maximum number of routes (0 means unlimited). | + | [        maximum_advertised_routes_warning_limit](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].maximum_advertised_routes_warning_limit") | String | | | | Maximum number of routes after which a warning is issued (0 means never warn) or
Percentage of maximum number of routes at which to warn ("<1-100> percent").
| + | [        missing_policy](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy") | Dictionary | | | | Missing policy configuration for BGP Labeled-Unicast neighbor. | + | [          direction_in](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_in") | Dictionary | | | | Missing policy inbound direction. | + | [            action](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_in.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [            include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_in.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [            include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_in.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [            include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_in.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [          direction_out](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_out") | Dictionary | | | | Missing policy outbound direction. | + | [            action](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_out.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [            include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_out.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [            include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_out.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [            include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].missing_policy.direction_out.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [        multi_path](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].multi_path") | Boolean | | | | | + | [        next_hop_resolution](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_resolution") | Dictionary | | | | | + | [          v4_mapped_v6_translation](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_resolution.v4_mapped_v6_translation") | Boolean | | | | | + | [        next_hop_self](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_self") | Boolean | | | | | + | [        next_hop_self_source_interface](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_self_source_interface") | String | | | | Source interface name. | + | [        next_hop_self_v4_mapped_v6_source_interface](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_self_v4_mapped_v6_source_interface") | String | | | | v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. | + | [        next_hop_unchanged](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].next_hop_unchanged") | Boolean | | | | | + | [        rcf_in](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].rcf_in") | String | | | | Inbound RCF function name with parenthesis.
Example: MyFunction(myarg). | + | [        rcf_out](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].rcf_out") | String | | | | Outbound RCF function name with parenthesis.
Example: MyFunction(myarg). | + | [        route_map_in](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].route_map_in") | String | | | | Inbound route-map name. | + | [        route_map_out](## "router_bgp.address_family_ipv4_labeled_unicast.peer_groups.[].route_map_out") | String | | | | Outbound route-map name. | + | [    neighbors](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors") | List, items: Dictionary | | | | | + | [      - ip_address](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].ip_address") | String | Required, Unique | | | | + | [        activate](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].activate") | Boolean | | | | | + | [        additional_paths](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].additional_paths") | Dictionary | | | | | + | [          receive](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].additional_paths.receive") | Boolean | | | | Enable or disable reception of additional-paths. | + | [          send](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].additional_paths.send") | String | | | Valid Values:
- any
- backup
- ecmp
- limit
- disabled | Select an option to send multiple paths for same prefix through bgp updates.
any: Send any eligible path.
backup: Best path and installed backup path.
ecmp: All paths in best path ECMP group.
limit: Limit to n eligible paths.
disabled: Disable sending any path. | + | [          send_ecmp_limit](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].additional_paths.send_ecmp_limit") | Integer | | | Min: 2
Max: 64 | Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. | + | [          send_limit](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].additional_paths.send_limit") | Integer | | | Min: 2
Max: 64 | Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. | + | [        aigp_session](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].aigp_session") | Boolean | | | | | + | [        graceful_restart](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].graceful_restart") | Boolean | | | | | + | [        graceful_restart_helper](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].graceful_restart_helper") | Dictionary | | | | | + | [          stale_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].graceful_restart_helper.stale_route_map") | String | | | | | + | [        maximum_advertised_routes](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].maximum_advertised_routes") | Integer | | | Min: 0
Max: 4294967294 | Maximum number of routes (0 means unlimited). | + | [        maximum_advertised_routes_warning_limit](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].maximum_advertised_routes_warning_limit") | String | | | | Maximum number of routes after which a warning is issued (0 means never warn) or
Percentage of maximum number of routes at which to warn ("<1-100> percent").
| + | [        missing_policy](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy") | Dictionary | | | | Missing policy configuration for BGP Labeled-Unicast neighbor. | + | [          direction_in](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_in") | Dictionary | | | | Missing policy inbound direction. | + | [            action](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_in.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [            include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_in.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [            include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_in.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [            include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_in.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [          direction_out](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_out") | Dictionary | | | | Missing policy outbound direction. | + | [            action](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_out.action") | String | Required | | Valid Values:
- deny
- permit
- deny-in-out | Missing policy action. | + | [            include_community_list](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_out.include_community_list") | Boolean | | | | Include community-list references in missing policy decision. | + | [            include_prefix_list](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_out.include_prefix_list") | Boolean | | | | Include prefix-list references in missing policy decision. | + | [            include_sub_route_map](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].missing_policy.direction_out.include_sub_route_map") | Boolean | | | | Include sub-route-map references in missing policy decision. | + | [        multi_path](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].multi_path") | Boolean | | | | | + | [        next_hop_resolution](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_resolution") | Dictionary | | | | | + | [          v4_mapped_v6_translation](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_resolution.v4_mapped_v6_translation") | Boolean | | | | | + | [        next_hop_self](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_self") | Boolean | | | | | + | [        next_hop_self_source_interface](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_self_source_interface") | String | | | | Source interface name. | + | [        next_hop_self_v4_mapped_v6_source_interface](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_self_v4_mapped_v6_source_interface") | String | | | | v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. | + | [        next_hop_unchanged](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].next_hop_unchanged") | Boolean | | | | | + | [        rcf_in](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].rcf_in") | String | | | | Inbound RCF function name with parenthesis.
Example: MyFunction(myarg). | + | [        rcf_out](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].rcf_out") | String | | | | Outbound RCF function name with parenthesis.
Example: MyFunction(myarg). | + | [        route_map_in](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].route_map_in") | String | | | | Inbound route-map name. | + | [        route_map_out](## "router_bgp.address_family_ipv4_labeled_unicast.neighbors.[].route_map_out") | String | | | | Outbound route-map name. | + | [    networks](## "router_bgp.address_family_ipv4_labeled_unicast.networks") | List, items: Dictionary | | | Min Length: 1 | | + | [      - prefix](## "router_bgp.address_family_ipv4_labeled_unicast.networks.[].prefix") | String | Required, Unique | | | IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". | + | [        route_map](## "router_bgp.address_family_ipv4_labeled_unicast.networks.[].route_map") | String | | | | Route-map name. | + | [    next_hops](## "router_bgp.address_family_ipv4_labeled_unicast.next_hops") | List, items: Dictionary | | | Min Length: 1 | | + | [      - ip_address](## "router_bgp.address_family_ipv4_labeled_unicast.next_hops.[].ip_address") | String | Required, Unique | | | | + | [        lfib_backup_ip_forwarding](## "router_bgp.address_family_ipv4_labeled_unicast.next_hops.[].lfib_backup_ip_forwarding") | Boolean | | | | | + | [    next_hop_resolution_ribs](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs") | List, items: Dictionary | | | Min Length: 1
Max Length: 3 | Specify the RIBs used to resolve next-hops. The order of this list determines the order of RIB lookups. | + | [      - rib_type](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs.[].rib_type") | String | Required | | Valid Values:
- system-connected
- tunnel-rib-colored
- tunnel-rib | Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. | + | [        rib_name](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs.[].rib_name") | String | | | | The name of the tunnel-rib to use when using 'tunnel-rib' type. | + | [    tunnel_source_protocols](## "router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols") | List, items: Dictionary | | | Min Length: 1
Max Length: 2 | | + | [      - protocol](## "router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols.[].protocol") | String | Required, Unique | | Valid Values:
- isis segment-routing
- ldp | | + | [        rcf](## "router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols.[].rcf") | String | | | | Optional RCF function name with parenthesis.
Example: MyFunction(myarg). | + | [    update_wait_for_convergence](## "router_bgp.address_family_ipv4_labeled_unicast.update_wait_for_convergence") | Boolean | | | | Wait for BGP to converge before sending out any route updates. | | [  address_family_ipv4_multicast](## "router_bgp.address_family_ipv4_multicast") | Dictionary | | | | | | [    peer_groups](## "router_bgp.address_family_ipv4_multicast.peer_groups") | List, items: Dictionary | | | | | | [      - name](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].name") | String | Required, Unique | | | Peer-group name. | @@ -932,6 +1051,24 @@ always: bestpath: d_path: + additional_paths: + + # Enable or disable reception of additional-paths. + receive: + + # Select an option to send multiple paths for same prefix through bgp updates. + # any: Send any eligible path. + # backup: Best path and installed backup path. + # ecmp: All paths in best path ECMP group. + # limit: Limit to n eligible paths. + # disabled: Disable sending any path. + send: + + # Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. + send_ecmp_limit: + + # Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. + send_limit: # Allow redistribution of iBGP routes into an Interior Gateway Protocol (IGP). EOS default is true. redistribute_internal: @@ -1388,7 +1525,9 @@ address_family_evpn: domain_identifier: neighbor_default: - encapsulation: + + # Transport encapsulation for neighbor. + encapsulation: # Source interface name. next_hop_self_source_interface: @@ -1422,6 +1561,9 @@ # Example: MyFunction(myarg). rcf: route_map: + + # Transport encapsulation for the neighbor. + encapsulation: peer_groups: # Peer-group name. @@ -1449,7 +1591,9 @@ rcf: route_map: domain_remote: - encapsulation: + + # Transport encapsulation for the peer-group. + encapsulation: additional_paths: receive: send: @@ -1609,6 +1753,281 @@ # Routes learned by the OSPF protocol. # The `ospf_route_type` is valid for source_protocols 'ospf' and 'ospfv3'. ospf_route_type: + address_family_ipv4_labeled_unicast: + aigp_session: + confederation: + ebgp: + ibgp: + bgp: + additional_paths: + + # Enable or disable reception of additional-paths. + receive: + + # Select an option to send multiple paths for same prefix through bgp updates. + # any: Send any eligible path. + # backup: Best path and installed backup path. + # ecmp: All paths in best path ECMP group. + # limit: Limit to n eligible paths. + # disabled: Disable sending any path. + send: + + # Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. + send_ecmp_limit: + + # Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. + send_limit: + + # Missing policy configuration for all address-families. + missing_policy: + + # Missing policy inbound direction. + direction_in: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + + # Missing policy outbound direction. + direction_out: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + next_hop_unchanged: + graceful_restart: + label_local_termination: + + # Skip LFIB entry installation and next hop self route advertisements. + lfib_entry_installation_skipped: + neighbor_default: + next_hop_self: + peer_groups: + + # Peer-group name. + - name: + activate: + additional_paths: + + # Enable or disable reception of additional-paths. + receive: + + # Select an option to send multiple paths for same prefix through bgp updates. + # any: Send any eligible path. + # backup: Best path and installed backup path. + # ecmp: All paths in best path ECMP group. + # limit: Limit to n eligible paths. + # disabled: Disable sending any path. + send: + + # Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. + send_ecmp_limit: + + # Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. + send_limit: + aigp_session: + graceful_restart: + graceful_restart_helper: + stale_route_map: + + # Maximum number of routes (0 means unlimited). + maximum_advertised_routes: + + # Maximum number of routes after which a warning is issued (0 means never warn) or + # Percentage of maximum number of routes at which to warn ("<1-100> percent"). + maximum_advertised_routes_warning_limit: + + # Missing policy configuration for BGP Labeled-Unicast neighbor. + missing_policy: + + # Missing policy inbound direction. + direction_in: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + + # Missing policy outbound direction. + direction_out: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + multi_path: + next_hop_resolution: + v4_mapped_v6_translation: + next_hop_self: + + # Source interface name. + next_hop_self_source_interface: + + # v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. + next_hop_self_v4_mapped_v6_source_interface: + next_hop_unchanged: + + # Inbound RCF function name with parenthesis. + # Example: MyFunction(myarg). + rcf_in: + + # Outbound RCF function name with parenthesis. + # Example: MyFunction(myarg). + rcf_out: + + # Inbound route-map name. + route_map_in: + + # Outbound route-map name. + route_map_out: + neighbors: + - ip_address: + activate: + additional_paths: + + # Enable or disable reception of additional-paths. + receive: + + # Select an option to send multiple paths for same prefix through bgp updates. + # any: Send any eligible path. + # backup: Best path and installed backup path. + # ecmp: All paths in best path ECMP group. + # limit: Limit to n eligible paths. + # disabled: Disable sending any path. + send: + + # Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. + send_ecmp_limit: + + # Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. + send_limit: + aigp_session: + graceful_restart: + graceful_restart_helper: + stale_route_map: + + # Maximum number of routes (0 means unlimited). + maximum_advertised_routes: + + # Maximum number of routes after which a warning is issued (0 means never warn) or + # Percentage of maximum number of routes at which to warn ("<1-100> percent"). + maximum_advertised_routes_warning_limit: + + # Missing policy configuration for BGP Labeled-Unicast neighbor. + missing_policy: + + # Missing policy inbound direction. + direction_in: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + + # Missing policy outbound direction. + direction_out: + + # Missing policy action. + action: + + # Include community-list references in missing policy decision. + include_community_list: + + # Include prefix-list references in missing policy decision. + include_prefix_list: + + # Include sub-route-map references in missing policy decision. + include_sub_route_map: + multi_path: + next_hop_resolution: + v4_mapped_v6_translation: + next_hop_self: + + # Source interface name. + next_hop_self_source_interface: + + # v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. + next_hop_self_v4_mapped_v6_source_interface: + next_hop_unchanged: + + # Inbound RCF function name with parenthesis. + # Example: MyFunction(myarg). + rcf_in: + + # Outbound RCF function name with parenthesis. + # Example: MyFunction(myarg). + rcf_out: + + # Inbound route-map name. + route_map_in: + + # Outbound route-map name. + route_map_out: + networks: # >=1 items + + # IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". + - prefix: + + # Route-map name. + route_map: + next_hops: # >=1 items + - ip_address: + lfib_backup_ip_forwarding: + + # Specify the RIBs used to resolve next-hops. The order of this list determines the order of RIB lookups. + next_hop_resolution_ribs: # 1-3 items + + # Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. + - rib_type: + + # The name of the tunnel-rib to use when using 'tunnel-rib' type. + rib_name: + tunnel_source_protocols: # 1-2 items + - protocol: + + # Optional RCF function name with parenthesis. + # Example: MyFunction(myarg). + rcf: + + # Wait for BGP to converge before sending out any route updates. + update_wait_for_convergence: address_family_ipv4_multicast: peer_groups: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md b/ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md index 0a44e8e918f..d5e6ee50fc2 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md @@ -107,6 +107,7 @@ The following table list the `eos_designs` top level keys used for WAN and how t | Key | Must be the same for all the WAN routers | Comment | | --- | ---------------------------------------- | ------- | | `wan_mode` | ✅ | Two possible modes, `legacy-autovpn` and `cv-pathfinder` (default). | +| `wan_encapsulation` | ✅ | Two possible encapsulations, `vxlan` and `path-selection` (default). | | `wan_virtual_topologies` | ✅ | to define the Policies and the VRF to policy mappings. | | `wan_path_groups` | ✅ | to define the list of path-groups in the network. | | `wan_carriers` | ✅ | to define the list of carriers in the network, each carrier is assigned to a path-group. | @@ -144,6 +145,24 @@ By default the mode is set to `cv-pathfinder` and can be changed using: wan_mode: legacy-autovpn | cv-pathfinder # default: cv-pathfinder ``` +#### WAN encapsulation + +BGP peerings for the WAN can use two different encapsulation for EVPN address family: + +- path-selection +- vxlan + +By default the mode is set to `path-selection` and can be changed using: + +```yaml +--- +wan_encapsulaton: vxlan | path-selection # default: path-selection +``` + +!!! note + + All routers participating to the WAN _must_ have the same encapsulation defined. + #### WAN node_types There are two built-in node types for WAN: @@ -690,13 +709,32 @@ reused when adding LAN protocols to help understand the changes. #### LAN HA common configuration -EOS (and hence AVD) supports maximum 2 routers for HA. To establish LAN HA the requirements are the following: +EOS (and hence AVD) supports maximum 2 routers for HA. To be considered as HA nodes, they need to belong to the same node_group as below: + +```yaml +wan_router: + node_groups: + - group: Site42 + cv_pathfinder_region: AVD_Land_West + cv_pathfinder_site: Site42 + wan_ha: + enabled: true + nodes: + - name: node1 + id: 1 + [...] + - name: node2 + id: 1 + [...] +``` + +To establish LAN HA the requirements are the following: - The HA tunnels can be established only in the default VRF (EOS limitation) - The HA interfaces must be able to establish IPSec tunnels between each other. This implies that if the interfaces are on different subnet, the LAN must be able to route traffic between each interface. - EVPN Gateway is used to exchange the routes between the HA peers configured as follow - the advantage is that it caters for all VRFs and the default VRF export route-map is still valid. -By default, AVD uses the uplinks as the HA links. It is possible to override this by setting a single interface to be used as the *Direct HA link*: +By default, AVD uses the uplinks as the HA links. It is possible to override this by setting a list of interfaces to be used as the *Direct HA links*: ```yaml wan_router: @@ -710,12 +748,17 @@ wan_router: ha_ipv4_pool: 10.10.10.0/24 # (2)! ``` -1. Select the interface for HA, it can either be a way to select ONE interface for Direct HA, or to filter some of the uplink HA interfaces. +1. Select the interface for HA, it can either be a way to select one or more interface(s) for Direct HA, or to filter some of the uplink HA interfaces. 2. Prefix to use to allocate the IP address for the direct HA link. !!! warning - Only one interface can be used for Direct HA today in AVD. + For direct HA, AVD will configure a port-channel by default. + This feature was introduced recently in EOS and may not be supported on your version. + + If it is the case, only one interface can be used for Direct HA, and the port-channel creation can be disabled using `wan_ha.use_port_channel_for_direct_ha: false`. + + It is *not* possible to use multiple direct HA links while disabling the port-channel. From a configuration standpoint: @@ -790,6 +833,15 @@ In the situation where the LAN is EBGP but HA is configured over a direct link, WAN eBGP LAN with Direct HA link +!!! warning + + For direct HA, AVD will configure a port-channel by default. + This feature was introduced recently in EOS and may not be supported on your version. + + If it is the case, only one interface can be used for Direct HA, and the port-channel creation can be disabled using `wan_ha.use_port_channel_for_direct_ha: false`. + + It is *not* possible to use multiple direct HA links while disabling the port-channel. + #### OSPF LAN (NOT SUPPORTED) !!! danger "NOT SUPPORTED" diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/core-interfaces.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/core-interfaces.md index 2ded1723cab..d7f6b026c42 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/core-interfaces.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/core-interfaces.md @@ -27,8 +27,8 @@ | [        - <str>](## "core_interfaces.p2p_links_profiles.[].interfaces.[]") | String | | | | The value can be like < node_a_interface >, < node_b_interface >.
ex. - [ Ethernet2, Ethernet2 ].
| | [      as](## "core_interfaces.p2p_links_profiles.[].as") | List, items: String | | | | AS numbers for BGP.
Required with bgp peering.
| | [        - <str>](## "core_interfaces.p2p_links_profiles.[].as.[]") | String | | | | The values can be like ["node_a_as", "node_b_as"]. | - | [      descriptions](## "core_interfaces.p2p_links_profiles.[].descriptions") | List, items: String | | | | Interface description. | - | [        - <str>](## "core_interfaces.p2p_links_profiles.[].descriptions.[]") | String | | | | | + | [      descriptions](## "core_interfaces.p2p_links_profiles.[].descriptions") | List, items: String | | | | Interface descriptions. | + | [        - <str>](## "core_interfaces.p2p_links_profiles.[].descriptions.[]") | String | | | | Description or description template to be used on the ethernet interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.

The default description is set by `default_underlay_p2p_ethernet_description`.
By default the description is templated from the name and interface of the peer. | | [      include_in_underlay_protocol](## "core_interfaces.p2p_links_profiles.[].include_in_underlay_protocol") | Boolean | | `True` | | Add this interface to underlay routing protocol. | | [      isis_hello_padding](## "core_interfaces.p2p_links_profiles.[].isis_hello_padding") | Boolean | | `False` | | | | [      isis_metric](## "core_interfaces.p2p_links_profiles.[].isis_metric") | Integer | | | | | @@ -49,6 +49,7 @@ | [      qos_profile](## "core_interfaces.p2p_links_profiles.[].qos_profile") | String | | | | QOS service profile. | | [      macsec_profile](## "core_interfaces.p2p_links_profiles.[].macsec_profile") | String | | | | MAC security profile. | | [      port_channel](## "core_interfaces.p2p_links_profiles.[].port_channel") | Dictionary | | | | Port-channel parameters. | + | [        description](## "core_interfaces.p2p_links_profiles.[].port_channel.description") | String | | | | Description or description template to be used on the port-channel interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local port-channel interface name.
- `peer_interface`: The port-channel interface on the peer.
- `port_channel_id`: The local port-channel ID.
- `peer_port_channel_id`: The ID of the port-channel on the peer.

Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`.
By default the description is templated from the name and port_channel interface of the peer. | | [        mode](## "core_interfaces.p2p_links_profiles.[].port_channel.mode") | String | | `active` | | | | [        nodes_child_interfaces](## "core_interfaces.p2p_links_profiles.[].port_channel.nodes_child_interfaces") | List, items: Dictionary | | | | | | [          - node](## "core_interfaces.p2p_links_profiles.[].port_channel.nodes_child_interfaces.[].node") | String | Required, Unique | | | | @@ -73,8 +74,8 @@ | [        - <str>](## "core_interfaces.p2p_links.[].interfaces.[]") | String | | | | The value can be like < node_a_interface >, < node_b_interface >.
ex. - [ Ethernet2, Ethernet2 ].
| | [      as](## "core_interfaces.p2p_links.[].as") | List, items: String | | | | AS numbers for BGP.
Required with bgp peering.
| | [        - <str>](## "core_interfaces.p2p_links.[].as.[]") | String | | | | The values can be like ["node_a_as", "node_b_as"]. | - | [      descriptions](## "core_interfaces.p2p_links.[].descriptions") | List, items: String | | | | Interface description. | - | [        - <str>](## "core_interfaces.p2p_links.[].descriptions.[]") | String | | | | | + | [      descriptions](## "core_interfaces.p2p_links.[].descriptions") | List, items: String | | | | Interface descriptions. | + | [        - <str>](## "core_interfaces.p2p_links.[].descriptions.[]") | String | | | | Description or description template to be used on the ethernet interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.

The default description is set by `default_underlay_p2p_ethernet_description`.
By default the description is templated from the name and interface of the peer. | | [      include_in_underlay_protocol](## "core_interfaces.p2p_links.[].include_in_underlay_protocol") | Boolean | | `True` | | Add this interface to underlay routing protocol. | | [      isis_hello_padding](## "core_interfaces.p2p_links.[].isis_hello_padding") | Boolean | | `False` | | | | [      isis_metric](## "core_interfaces.p2p_links.[].isis_metric") | Integer | | | | | @@ -95,6 +96,7 @@ | [      qos_profile](## "core_interfaces.p2p_links.[].qos_profile") | String | | | | QOS service profile. | | [      macsec_profile](## "core_interfaces.p2p_links.[].macsec_profile") | String | | | | MAC security profile. | | [      port_channel](## "core_interfaces.p2p_links.[].port_channel") | Dictionary | | | | Port-channel parameters. | + | [        description](## "core_interfaces.p2p_links.[].port_channel.description") | String | | | | Description or description template to be used on the port-channel interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local port-channel interface name.
- `peer_interface`: The port-channel interface on the peer.
- `port_channel_id`: The local port-channel ID.
- `peer_port_channel_id`: The ID of the port-channel on the peer.

Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`.
By default the description is templated from the name and port_channel interface of the peer. | | [        mode](## "core_interfaces.p2p_links.[].port_channel.mode") | String | | `active` | | | | [        nodes_child_interfaces](## "core_interfaces.p2p_links.[].port_channel.nodes_child_interfaces") | List, items: Dictionary | | | | | | [          - node](## "core_interfaces.p2p_links.[].port_channel.nodes_child_interfaces.[].node") | String | Required, Unique | | | | @@ -167,8 +169,18 @@ # The values can be like ["node_a_as", "node_b_as"]. - - # Interface description. + # Interface descriptions. descriptions: + + # Description or description template to be used on the ethernet interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # + # The default description is set by `default_underlay_p2p_ethernet_description`. + # By default the description is templated from the name and interface of the peer. - # Add this interface to underlay routing protocol. @@ -220,6 +232,19 @@ # Port-channel parameters. port_channel: + + # Description or description template to be used on the port-channel interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local port-channel interface name. + # - `peer_interface`: The port-channel interface on the peer. + # - `port_channel_id`: The local port-channel ID. + # - `peer_port_channel_id`: The ID of the port-channel on the peer. + # + # Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`. + # By default the description is templated from the name and port_channel interface of the peer. + description: mode: nodes_child_interfaces: - node: @@ -289,8 +314,18 @@ # The values can be like ["node_a_as", "node_b_as"]. - - # Interface description. + # Interface descriptions. descriptions: + + # Description or description template to be used on the ethernet interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # + # The default description is set by `default_underlay_p2p_ethernet_description`. + # By default the description is templated from the name and interface of the peer. - # Add this interface to underlay routing protocol. @@ -342,6 +377,19 @@ # Port-channel parameters. port_channel: + + # Description or description template to be used on the port-channel interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local port-channel interface name. + # - `peer_interface`: The port-channel interface on the peer. + # - `port_channel_id`: The local port-channel ID. + # - `peer_port_channel_id`: The ID of the port-channel on the peer. + # + # Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`. + # By default the description is templated from the name and port_channel interface of the peer. + description: mode: nodes_child_interfaces: - node: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-ip-addressing.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-ip-addressing.md index 5a31cd414eb..a636aad54f2 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-ip-addressing.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-ip-addressing.md @@ -14,6 +14,8 @@ | [    ipv6_prefix_length](## "fabric_ip_addressing.mlag.ipv6_prefix_length") | Integer | | `64` | Min: 1
Max: 127 | IPv6 prefix length used for MLAG peer-vlan and L3 point-to-point SVIs over the MLAG peer-link. | | [  p2p_uplinks](## "fabric_ip_addressing.p2p_uplinks") | Dictionary | | | | | | [    ipv4_prefix_length](## "fabric_ip_addressing.p2p_uplinks.ipv4_prefix_length") | Integer | | `31` | Min: 1
Max: 31 | IPv4 prefix length used for L3 point-to-point uplinks. | + | [  wan_ha](## "fabric_ip_addressing.wan_ha") | Dictionary | | | | Allow to manipulate the IP addressing scheme for WAN HA direct subnets. | + | [    ipv4_prefix_length](## "fabric_ip_addressing.wan_ha.ipv4_prefix_length") | Integer | | `31` | Min: 1
Max: 31 | IPv4 prefix length used for point-to-point interface for direct WAN HA link. | === "YAML" @@ -41,4 +43,10 @@ # IPv4 prefix length used for L3 point-to-point uplinks. ipv4_prefix_length: + + # Allow to manipulate the IP addressing scheme for WAN HA direct subnets. + wan_ha: + + # IPv4 prefix length used for point-to-point interface for direct WAN HA link. + ipv4_prefix_length: ``` diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md index 3ef1aabe19b..eae07d946a1 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md @@ -7,9 +7,19 @@ | Variable | Type | Required | Default | Value Restrictions | Description | | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [default_underlay_p2p_ethernet_description](## "default_underlay_p2p_ethernet_description") | String | | `P2P_{peer}_{peer_interface}{vrf?<_VRF_}` | | The default description or description template to be used on L3 point-to-point ethernet interfaces.
The interfaces using this are the routed uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.
- `vrf`: The name of the VRF if set (Only applicable for `uplink_type: p2p-vrfs`).

By default the description is templated from the name and interface of the peer. | + | [default_underlay_p2p_port_channel_description](## "default_underlay_p2p_port_channel_description") | String | | `P2P_{peer}_{peer_interface}` | | The default description or description template to be used on L3 point-to-point port-channel interfaces.
The port-channels using this are `p2p_links` defined under `l3_edge` or `core_interfaces`.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.
- `port_channel_id`: The local port-channel ID.
- `peer_port_channel_id`: The ID of the port-channel on the peer.

By default the description is templated from the name and interface of the peer. | | [enable_trunk_groups](## "enable_trunk_groups") | Boolean | | `False` | | Enable Trunk Group support across eos_designs.
Warning: Because of the nature of the EOS Trunk Group feature, enabling this is "all or nothing".
*All* vlans and *all* trunks towards connected endpoints must be using trunk groups as well.
If trunk groups are not assigned to a trunk, no vlans will be enabled on that trunk.
See "Details on enable_trunk_groups" below before enabling this feature.
| + | [mlag_bgp_peer_description](## "mlag_bgp_peer_description") | String | | `{mlag_peer}_{peer_interface}` | | Description or description template to be used on the MLAG BGP peers including those in VRFs.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The local MLAG L3 VLAN interface.
- `peer_interface`: The MLAG L3 VLAN interface on the MLAG peer.
- `vrf`: The name of the VRF. Not available for the underlay peering.

The default description is built from the name and interface of the MLAG peer and optionally the VRF. | + | [mlag_bgp_peer_group_description](## "mlag_bgp_peer_group_description") | String | | `{mlag_peer}` | | Description or description template to be used on the MLAG BGP peer-group.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.

The default description is the name of the MLAG peers. | | [mlag_member_description](## "mlag_member_description") | String | | `MLAG_{mlag_peer}_{peer_interface}` | | Description or description template to be used on MLAG peer-link ethernet interfaces.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The local MLAG port-channel interface.
- `peer_interface`: The port-channel interface on the MLAG peer.
- `mlag_port_channel_id`: The local MLAG port-channel ID.
- `mlag_peer_port_channel_id`: The port-channel ID on the MLAG peer.

By default the description is templated from the name and interface of the MLAG peer. | | [mlag_on_orphan_port_channel_downlink](## "mlag_on_orphan_port_channel_downlink") | Boolean | | `False` | | If `true` an MLAG ID will always be configured on a Port-Channel downlink even if the downlink is only on one node in the MLAG pair.
If `false` (default) an MLAG ID will only be configured on Port-Channel downlinks dual-homed to two MLAG switches. | + | [mlag_peer_l3_svi_description](## "mlag_peer_l3_svi_description") | String | | `MLAG_L3` | | Description or description template to be used on MLAG L3 peering SVI (Interface Vlan4093 by default).
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The MLAG L3 peering SVI name.
- `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. | + | [mlag_peer_l3_vlan_name](## "mlag_peer_l3_vlan_name") | String | | `MLAG_L3` | | Name or name template to be used on MLAG L3 VLAN (VLAN 4093 by default).
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. | + | [mlag_peer_l3_vrf_svi_description](## "mlag_peer_l3_vrf_svi_description") | String | | `MLAG_L3_VRF_{vrf}` | | Description or description template to be used on MLAG L3 peering SVI for VRFs.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The MLAG L3 VRF peering SVI name.
- `vlan`: The MLAG L3 VRF peering VLAN ID.
- `vrf`: The VRF name. | + | [mlag_peer_l3_vrf_vlan_name](## "mlag_peer_l3_vrf_vlan_name") | String | | `MLAG_L3_VRF_{vrf}` | | Name or name template to be used on MLAG L3 peering VLAN for VRFs.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `vlan`: The MLAG L3 VRF peering VLAN ID.
- `vrf`: The VRF name. | + | [mlag_peer_svi_description](## "mlag_peer_svi_description") | String | | `MLAG` | | Description or description template to be used on MLAG peering SVI (Interface Vlan4094 by default).
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The MLAG peering SVI name.
- `mlag_peer_vlan`: The MLAG peering VLAN ID. | + | [mlag_peer_vlan_name](## "mlag_peer_vlan_name") | String | | `MLAG` | | Name or name template to be used on MLAG peering VLAN (VLAN 4094 by default).
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `mlag_peer_vlan`: The MLAG peering VLAN ID. | | [mlag_port_channel_description](## "mlag_port_channel_description") | String | | `MLAG_{mlag_peer}_{peer_interface}` | | Description or description template to be used on MLAG peer-link port-channel interfaces.
This can be a template using the format string syntax.
The available template fields are:
- `mlag_peer`: The name of the MLAG peer.
- `interface`: The local MLAG port-channel interface.
- `peer_interface`: The port-channel interface on the MLAG peer.
- `mlag_port_channel_id`: The local MLAG port-channel ID.
- `mlag_peer_port_channel_id`: The port-channel ID on the MLAG peer.

By default the description is templated from the name and port-channel interface of the MLAG peer. | | [only_local_vlan_trunk_groups](## "only_local_vlan_trunk_groups") | Boolean | | `False` | | A vlan can have many trunk_groups assigned.
To avoid unneeded configuration changes on all leaf switches when a new trunk group is added,
this feature will only configure the vlan trunk groups matched with local connected_endpoints.
See "Details on only_local_vlan_trunk_groups" below.
Requires "enable_trunk_groups: true".
| | [p2p_uplinks_mtu](## "p2p_uplinks_mtu") | Integer | | `9214` | Min: 68
Max: 65535 | Point to Point Links MTU.
Precedence: .uplink_mtu -> platform_settings.p2p_uplinks_mtu -> p2p_uplinks_mtu -> 9214 | @@ -46,6 +56,31 @@ === "YAML" ```yaml + # The default description or description template to be used on L3 point-to-point ethernet interfaces. + # The interfaces using this are the routed uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # - `vrf`: The name of the VRF if set (Only applicable for `uplink_type: p2p-vrfs`). + # + # By default the description is templated from the name and interface of the peer. + default_underlay_p2p_ethernet_description: + + # The default description or description template to be used on L3 point-to-point port-channel interfaces. + # The port-channels using this are `p2p_links` defined under `l3_edge` or `core_interfaces`. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # - `port_channel_id`: The local port-channel ID. + # - `peer_port_channel_id`: The ID of the port-channel on the peer. + # + # By default the description is templated from the name and interface of the peer. + default_underlay_p2p_port_channel_description: + # Enable Trunk Group support across eos_designs. # Warning: Because of the nature of the EOS Trunk Group feature, enabling this is "all or nothing". # *All* vlans and *all* trunks towards connected endpoints must be using trunk groups as well. @@ -53,6 +88,25 @@ # See "Details on enable_trunk_groups" below before enabling this feature. enable_trunk_groups: + # Description or description template to be used on the MLAG BGP peers including those in VRFs. + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `interface`: The local MLAG L3 VLAN interface. + # - `peer_interface`: The MLAG L3 VLAN interface on the MLAG peer. + # - `vrf`: The name of the VRF. Not available for the underlay peering. + # + # The default description is built from the name and interface of the MLAG peer and optionally the VRF. + mlag_bgp_peer_description: + + # Description or description template to be used on the MLAG BGP peer-group. + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # + # The default description is the name of the MLAG peers. + mlag_bgp_peer_group_description: + # Description or description template to be used on MLAG peer-link ethernet interfaces. # This can be a template using the format string syntax. # The available template fields are: @@ -69,6 +123,53 @@ # If `false` (default) an MLAG ID will only be configured on Port-Channel downlinks dual-homed to two MLAG switches. mlag_on_orphan_port_channel_downlink: + # Description or description template to be used on MLAG L3 peering SVI (Interface Vlan4093 by default). + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `interface`: The MLAG L3 peering SVI name. + # - `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. + mlag_peer_l3_svi_description: + + # Name or name template to be used on MLAG L3 VLAN (VLAN 4093 by default). + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. + mlag_peer_l3_vlan_name: + + # Description or description template to be used on MLAG L3 peering SVI for VRFs. + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `interface`: The MLAG L3 VRF peering SVI name. + # - `vlan`: The MLAG L3 VRF peering VLAN ID. + # - `vrf`: The VRF name. + mlag_peer_l3_vrf_svi_description: + + # Name or name template to be used on MLAG L3 peering VLAN for VRFs. + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `vlan`: The MLAG L3 VRF peering VLAN ID. + # - `vrf`: The VRF name. + mlag_peer_l3_vrf_vlan_name: + + # Description or description template to be used on MLAG peering SVI (Interface Vlan4094 by default). + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `interface`: The MLAG peering SVI name. + # - `mlag_peer_vlan`: The MLAG peering VLAN ID. + mlag_peer_svi_description: + + # Name or name template to be used on MLAG peering VLAN (VLAN 4094 by default). + # This can be a template using the format string syntax. + # The available template fields are: + # - `mlag_peer`: The name of the MLAG peer. + # - `mlag_peer_vlan`: The MLAG peering VLAN ID. + mlag_peer_vlan_name: + # Description or description template to be used on MLAG peer-link port-channel interfaces. # This can be a template using the format string syntax. # The available template fields are: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/l3-edge.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/l3-edge.md index db7b4be549a..46f0ff8481c 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/l3-edge.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/l3-edge.md @@ -27,8 +27,8 @@ | [        - <str>](## "l3_edge.p2p_links_profiles.[].interfaces.[]") | String | | | | The value can be like < node_a_interface >, < node_b_interface >.
ex. - [ Ethernet2, Ethernet2 ].
| | [      as](## "l3_edge.p2p_links_profiles.[].as") | List, items: String | | | | AS numbers for BGP.
Required with bgp peering.
| | [        - <str>](## "l3_edge.p2p_links_profiles.[].as.[]") | String | | | | The values can be like ["node_a_as", "node_b_as"]. | - | [      descriptions](## "l3_edge.p2p_links_profiles.[].descriptions") | List, items: String | | | | Interface description. | - | [        - <str>](## "l3_edge.p2p_links_profiles.[].descriptions.[]") | String | | | | | + | [      descriptions](## "l3_edge.p2p_links_profiles.[].descriptions") | List, items: String | | | | Interface descriptions. | + | [        - <str>](## "l3_edge.p2p_links_profiles.[].descriptions.[]") | String | | | | Description or description template to be used on the ethernet interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.

The default description is set by `default_underlay_p2p_ethernet_description`.
By default the description is templated from the name and interface of the peer. | | [      include_in_underlay_protocol](## "l3_edge.p2p_links_profiles.[].include_in_underlay_protocol") | Boolean | | `True` | | Add this interface to underlay routing protocol. | | [      isis_hello_padding](## "l3_edge.p2p_links_profiles.[].isis_hello_padding") | Boolean | | `False` | | | | [      isis_metric](## "l3_edge.p2p_links_profiles.[].isis_metric") | Integer | | | | | @@ -49,6 +49,7 @@ | [      qos_profile](## "l3_edge.p2p_links_profiles.[].qos_profile") | String | | | | QOS service profile. | | [      macsec_profile](## "l3_edge.p2p_links_profiles.[].macsec_profile") | String | | | | MAC security profile. | | [      port_channel](## "l3_edge.p2p_links_profiles.[].port_channel") | Dictionary | | | | Port-channel parameters. | + | [        description](## "l3_edge.p2p_links_profiles.[].port_channel.description") | String | | | | Description or description template to be used on the port-channel interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local port-channel interface name.
- `peer_interface`: The port-channel interface on the peer.
- `port_channel_id`: The local port-channel ID.
- `peer_port_channel_id`: The ID of the port-channel on the peer.

Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`.
By default the description is templated from the name and port_channel interface of the peer. | | [        mode](## "l3_edge.p2p_links_profiles.[].port_channel.mode") | String | | `active` | | | | [        nodes_child_interfaces](## "l3_edge.p2p_links_profiles.[].port_channel.nodes_child_interfaces") | List, items: Dictionary | | | | | | [          - node](## "l3_edge.p2p_links_profiles.[].port_channel.nodes_child_interfaces.[].node") | String | Required, Unique | | | | @@ -73,8 +74,8 @@ | [        - <str>](## "l3_edge.p2p_links.[].interfaces.[]") | String | | | | The value can be like < node_a_interface >, < node_b_interface >.
ex. - [ Ethernet2, Ethernet2 ].
| | [      as](## "l3_edge.p2p_links.[].as") | List, items: String | | | | AS numbers for BGP.
Required with bgp peering.
| | [        - <str>](## "l3_edge.p2p_links.[].as.[]") | String | | | | The values can be like ["node_a_as", "node_b_as"]. | - | [      descriptions](## "l3_edge.p2p_links.[].descriptions") | List, items: String | | | | Interface description. | - | [        - <str>](## "l3_edge.p2p_links.[].descriptions.[]") | String | | | | | + | [      descriptions](## "l3_edge.p2p_links.[].descriptions") | List, items: String | | | | Interface descriptions. | + | [        - <str>](## "l3_edge.p2p_links.[].descriptions.[]") | String | | | | Description or description template to be used on the ethernet interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local interface name.
- `peer_interface`: The interface on the peer.

The default description is set by `default_underlay_p2p_ethernet_description`.
By default the description is templated from the name and interface of the peer. | | [      include_in_underlay_protocol](## "l3_edge.p2p_links.[].include_in_underlay_protocol") | Boolean | | `True` | | Add this interface to underlay routing protocol. | | [      isis_hello_padding](## "l3_edge.p2p_links.[].isis_hello_padding") | Boolean | | `False` | | | | [      isis_metric](## "l3_edge.p2p_links.[].isis_metric") | Integer | | | | | @@ -95,6 +96,7 @@ | [      qos_profile](## "l3_edge.p2p_links.[].qos_profile") | String | | | | QOS service profile. | | [      macsec_profile](## "l3_edge.p2p_links.[].macsec_profile") | String | | | | MAC security profile. | | [      port_channel](## "l3_edge.p2p_links.[].port_channel") | Dictionary | | | | Port-channel parameters. | + | [        description](## "l3_edge.p2p_links.[].port_channel.description") | String | | | | Description or description template to be used on the port-channel interface.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the peer.
- `interface`: The local port-channel interface name.
- `peer_interface`: The port-channel interface on the peer.
- `port_channel_id`: The local port-channel ID.
- `peer_port_channel_id`: The ID of the port-channel on the peer.

Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`.
By default the description is templated from the name and port_channel interface of the peer. | | [        mode](## "l3_edge.p2p_links.[].port_channel.mode") | String | | `active` | | | | [        nodes_child_interfaces](## "l3_edge.p2p_links.[].port_channel.nodes_child_interfaces") | List, items: Dictionary | | | | | | [          - node](## "l3_edge.p2p_links.[].port_channel.nodes_child_interfaces.[].node") | String | Required, Unique | | | | @@ -167,8 +169,18 @@ # The values can be like ["node_a_as", "node_b_as"]. - - # Interface description. + # Interface descriptions. descriptions: + + # Description or description template to be used on the ethernet interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # + # The default description is set by `default_underlay_p2p_ethernet_description`. + # By default the description is templated from the name and interface of the peer. - # Add this interface to underlay routing protocol. @@ -220,6 +232,19 @@ # Port-channel parameters. port_channel: + + # Description or description template to be used on the port-channel interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local port-channel interface name. + # - `peer_interface`: The port-channel interface on the peer. + # - `port_channel_id`: The local port-channel ID. + # - `peer_port_channel_id`: The ID of the port-channel on the peer. + # + # Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`. + # By default the description is templated from the name and port_channel interface of the peer. + description: mode: nodes_child_interfaces: - node: @@ -289,8 +314,18 @@ # The values can be like ["node_a_as", "node_b_as"]. - - # Interface description. + # Interface descriptions. descriptions: + + # Description or description template to be used on the ethernet interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local interface name. + # - `peer_interface`: The interface on the peer. + # + # The default description is set by `default_underlay_p2p_ethernet_description`. + # By default the description is templated from the name and interface of the peer. - # Add this interface to underlay routing protocol. @@ -342,6 +377,19 @@ # Port-channel parameters. port_channel: + + # Description or description template to be used on the port-channel interface. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the peer. + # - `interface`: The local port-channel interface name. + # - `peer_interface`: The port-channel interface on the peer. + # - `port_channel_id`: The local port-channel ID. + # - `peer_port_channel_id`: The ID of the port-channel on the peer. + # + # Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`. + # By default the description is templated from the name and port_channel interface of the peer. + description: mode: nodes_child_interfaces: - node: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/node-type-wan-configuration.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/node-type-wan-configuration.md index b396664d70a..1a1a0a5d0ea 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/node-type-wan-configuration.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/node-type-wan-configuration.md @@ -21,6 +21,8 @@ | [        - <str>](## ".defaults.wan_ha.ha_interfaces.[]") | String | | | Pattern: `Ethernet[\d/]+` | | | [      ha_ipv4_pool](## ".defaults.wan_ha.ha_ipv4_pool") | String | | | Format: ipv4_cidr | IP address pool used for WAN HA connectivity.
IP is derived from the node ID.
Not used for uplink interfaces. | | [      max_ha_interfaces](## ".defaults.wan_ha.max_ha_interfaces") | Integer | | | | Number of parallel links towards HA switches.
Can be used to reserve IP addresses for future parallel HA links. | + | [      port_channel_id](## ".defaults.wan_ha.port_channel_id") | Integer | | | | Port-channel ID to use for direct HA. | + | [      use_port_channel_for_direct_ha](## ".defaults.wan_ha.use_port_channel_for_direct_ha") | Boolean | | `True` | | Enable or disable using a port-channel interface for direct HA when there is only one interface.
This feature was introduced in EOS 4.33.0F. | | [      flow_tracking](## ".defaults.wan_ha.flow_tracking") | Dictionary | | | | Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. | | [        enabled](## ".defaults.wan_ha.flow_tracking.enabled") | Boolean | | | | | | [        name](## ".defaults.wan_ha.flow_tracking.name") | String | | | | Flow tracker name as defined in flow_tracking_settings. | @@ -41,6 +43,8 @@ | [              - <str>](## ".node_groups.[].nodes.[].wan_ha.ha_interfaces.[]") | String | | | Pattern: `Ethernet[\d/]+` | | | [            ha_ipv4_pool](## ".node_groups.[].nodes.[].wan_ha.ha_ipv4_pool") | String | | | Format: ipv4_cidr | IP address pool used for WAN HA connectivity.
IP is derived from the node ID.
Not used for uplink interfaces. | | [            max_ha_interfaces](## ".node_groups.[].nodes.[].wan_ha.max_ha_interfaces") | Integer | | | | Number of parallel links towards HA switches.
Can be used to reserve IP addresses for future parallel HA links. | + | [            port_channel_id](## ".node_groups.[].nodes.[].wan_ha.port_channel_id") | Integer | | | | Port-channel ID to use for direct HA. | + | [            use_port_channel_for_direct_ha](## ".node_groups.[].nodes.[].wan_ha.use_port_channel_for_direct_ha") | Boolean | | `True` | | Enable or disable using a port-channel interface for direct HA when there is only one interface.
This feature was introduced in EOS 4.33.0F. | | [            flow_tracking](## ".node_groups.[].nodes.[].wan_ha.flow_tracking") | Dictionary | | | | Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. | | [              enabled](## ".node_groups.[].nodes.[].wan_ha.flow_tracking.enabled") | Boolean | | | | | | [              name](## ".node_groups.[].nodes.[].wan_ha.flow_tracking.name") | String | | | | Flow tracker name as defined in flow_tracking_settings. | @@ -57,6 +61,8 @@ | [          - <str>](## ".node_groups.[].wan_ha.ha_interfaces.[]") | String | | | Pattern: `Ethernet[\d/]+` | | | [        ha_ipv4_pool](## ".node_groups.[].wan_ha.ha_ipv4_pool") | String | | | Format: ipv4_cidr | IP address pool used for WAN HA connectivity.
IP is derived from the node ID.
Not used for uplink interfaces. | | [        max_ha_interfaces](## ".node_groups.[].wan_ha.max_ha_interfaces") | Integer | | | | Number of parallel links towards HA switches.
Can be used to reserve IP addresses for future parallel HA links. | + | [        port_channel_id](## ".node_groups.[].wan_ha.port_channel_id") | Integer | | | | Port-channel ID to use for direct HA. | + | [        use_port_channel_for_direct_ha](## ".node_groups.[].wan_ha.use_port_channel_for_direct_ha") | Boolean | | `True` | | Enable or disable using a port-channel interface for direct HA when there is only one interface.
This feature was introduced in EOS 4.33.0F. | | [        flow_tracking](## ".node_groups.[].wan_ha.flow_tracking") | Dictionary | | | | Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. | | [          enabled](## ".node_groups.[].wan_ha.flow_tracking.enabled") | Boolean | | | | | | [          name](## ".node_groups.[].wan_ha.flow_tracking.name") | String | | | | Flow tracker name as defined in flow_tracking_settings. | @@ -75,6 +81,8 @@ | [          - <str>](## ".nodes.[].wan_ha.ha_interfaces.[]") | String | | | Pattern: `Ethernet[\d/]+` | | | [        ha_ipv4_pool](## ".nodes.[].wan_ha.ha_ipv4_pool") | String | | | Format: ipv4_cidr | IP address pool used for WAN HA connectivity.
IP is derived from the node ID.
Not used for uplink interfaces. | | [        max_ha_interfaces](## ".nodes.[].wan_ha.max_ha_interfaces") | Integer | | | | Number of parallel links towards HA switches.
Can be used to reserve IP addresses for future parallel HA links. | + | [        port_channel_id](## ".nodes.[].wan_ha.port_channel_id") | Integer | | | | Port-channel ID to use for direct HA. | + | [        use_port_channel_for_direct_ha](## ".nodes.[].wan_ha.use_port_channel_for_direct_ha") | Boolean | | `True` | | Enable or disable using a port-channel interface for direct HA when there is only one interface.
This feature was introduced in EOS 4.33.0F. | | [        flow_tracking](## ".nodes.[].wan_ha.flow_tracking") | Dictionary | | | | Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. | | [          enabled](## ".nodes.[].wan_ha.flow_tracking.enabled") | Boolean | | | | | | [          name](## ".nodes.[].wan_ha.flow_tracking.name") | String | | | | Flow tracker name as defined in flow_tracking_settings. | @@ -149,6 +157,13 @@ # Can be used to reserve IP addresses for future parallel HA links. max_ha_interfaces: + # Port-channel ID to use for direct HA. + port_channel_id: + + # Enable or disable using a port-channel interface for direct HA when there is only one interface. + # This feature was introduced in EOS 4.33.0F. + use_port_channel_for_direct_ha: + # Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. flow_tracking: enabled: @@ -233,6 +248,13 @@ # Can be used to reserve IP addresses for future parallel HA links. max_ha_interfaces: + # Port-channel ID to use for direct HA. + port_channel_id: + + # Enable or disable using a port-channel interface for direct HA when there is only one interface. + # This feature was introduced in EOS 4.33.0F. + use_port_channel_for_direct_ha: + # Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. flow_tracking: enabled: @@ -304,6 +326,13 @@ # Can be used to reserve IP addresses for future parallel HA links. max_ha_interfaces: + # Port-channel ID to use for direct HA. + port_channel_id: + + # Enable or disable using a port-channel interface for direct HA when there is only one interface. + # This feature was introduced in EOS 4.33.0F. + use_port_channel_for_direct_ha: + # Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. flow_tracking: enabled: @@ -381,6 +410,13 @@ # Can be used to reserve IP addresses for future parallel HA links. max_ha_interfaces: + # Port-channel ID to use for direct HA. + port_channel_id: + + # Enable or disable using a port-channel interface for direct HA when there is only one interface. + # This feature was introduced in EOS 4.33.0F. + use_port_channel_for_direct_ha: + # Configures flow-tracking on the HA interfaces. Overrides `fabric_flow_tracking.wan_ha_links` setting. flow_tracking: enabled: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/overlay-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/overlay-settings.md index fae2f4b6394..961ac389d23 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/overlay-settings.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/overlay-settings.md @@ -8,6 +8,7 @@ | Variable | Type | Required | Default | Value Restrictions | Description | | -------- | ---- | -------- | ------- | ------------------ | ----------- | | [bgp_mesh_pes](## "bgp_mesh_pes") | Boolean | | `False` | | Configure an iBGP full mesh between PEs, either because there is no RR used or other reasons.
Only supported in combination with MPLS overlay.
| + | [overlay_bgp_peer_description](## "overlay_bgp_peer_description") | String | | `{peer}{peer_interface?<_}` | | Description or description template to be used on the overlay BGP peers.
This can be a template using the format string syntax.
The available template fields are:
- `peer`: The name of the BGP peer.
- `peer_interface`: The interface on the BGP peer if available.

The default description is built from the name and interface of the BGP peer. | | [overlay_cvx_servers](## "overlay_cvx_servers") | List, items: String | | | | List of CVX vxlan overlay controllers.
Required if overlay_routing_protocol == CVX.
CVX servers (VMs) are peering using their management interface, so mgmt_ip must be set for all CVX servers.
| | [  - <str>](## "overlay_cvx_servers.[]") | String | | | | 'inventory_hostname' of CVX server.
| | [overlay_her_flood_list_per_vni](## "overlay_her_flood_list_per_vni") | Boolean | | `False` | | When using Head-End Replication, configure flood-lists per VNI.
By default HER will be configured with a common flood-list containing all VTEPs.
This behavior can be changed to per-VNI flood-lists by setting `overlay_her_flood_list_per_vni: true`.
This will make `eos_designs` consider configured VLANs per VTEP, and only include the relevant VTEPs to each VNI's flood-list.
| @@ -37,6 +38,15 @@ # Only supported in combination with MPLS overlay. bgp_mesh_pes: + # Description or description template to be used on the overlay BGP peers. + # This can be a template using the format string syntax. + # The available template fields are: + # - `peer`: The name of the BGP peer. + # - `peer_interface`: The interface on the BGP peer if available. + # + # The default description is built from the name and interface of the BGP peer. + overlay_bgp_peer_description: + # List of CVX vxlan overlay controllers. # Required if overlay_routing_protocol == CVX. # CVX servers (VMs) are peering using their management interface, so mgmt_ip must be set for all CVX servers. diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-settings.md index 3aaa8d0c344..5e6cb5c6206 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-settings.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-settings.md @@ -7,6 +7,7 @@ | Variable | Type | Required | Default | Value Restrictions | Description | | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [wan_encapsulation](## "wan_encapsulation") | String | | `path-selection` | Valid Values:
- path-selection
- vxlan | Select the encapsulation to use for EVPN peerings for WAN BGP peers. | | [wan_ha](## "wan_ha") | Dictionary | | | | PREVIEW: The `wan_ha` key is currently not supported. | | [  lan_ha_path_group_name](## "wan_ha.lan_ha_path_group_name") | String | | `LAN_HA` | | When WAN HA is enabled for a site if `wan_mode: cv-pathfinder`, a default path-group is injected to form DPS tunnels over LAN.
This key allows to overwrite the default LAN HA path-group name. | | [wan_ipsec_profiles](## "wan_ipsec_profiles") | Dictionary | | | | Define IPsec profiles parameters for WAN configuration. | @@ -27,6 +28,9 @@ === "YAML" ```yaml + # Select the encapsulation to use for EVPN peerings for WAN BGP peers. + wan_encapsulation: + # PREVIEW: The `wan_ha` key is currently not supported. wan_ha: diff --git a/pyproject.toml b/pyproject.toml index 229b1dad987..dd21ae7a02f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,7 +85,7 @@ convention = "google" [tool.ruff.lint.pylint] -max-args = 13 +max-args = 15 max-branches = 54 max-returns = 10 max-statements = 148 diff --git a/python-avd/pyavd/__init__.py b/python-avd/pyavd/__init__.py index da50afab45f..1084aa0d509 100644 --- a/python-avd/pyavd/__init__.py +++ b/python-avd/pyavd/__init__.py @@ -17,7 +17,7 @@ __author__ = "Arista Networks" __copyright__ = "Copyright 2023-2024 Arista Networks" __license__ = "Apache 2.0" -__version__ = "5.0.0.dev7" +__version__ = "5.0.0.dev8" __all__ = [ "get_avd_facts", diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-adaptive-virtual-topology.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-adaptive-virtual-topology.j2 index 5010ce0f733..cd0bf4760d3 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-adaptive-virtual-topology.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-adaptive-virtual-topology.j2 @@ -12,6 +12,10 @@ {% if router_adaptive_virtual_topology.topology_role is arista.avd.defined %} Topology role: {{ router_adaptive_virtual_topology.topology_role }} +{% if router_adaptive_virtual_topology.gateway_vxlan is arista.avd.defined(true) and router_adaptive_virtual_topology.topology_role in ["edge", "transit zone", "transit region"] %} + +VXLAN gateway: Enabled +{% endif %} {% endif %} {% if router_adaptive_virtual_topology.region is arista.avd.defined or router_adaptive_virtual_topology.zone is arista.avd.defined or router_adaptive_virtual_topology.site is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 index 6e8223bc899..c280ff1b317 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 @@ -49,6 +49,27 @@ ASN Notation: {{ router_bgp.as_notation | arista.avd.default('asplain') }} {% if router_bgp.bgp.bestpath.d_path is arista.avd.defined(true) %} | bgp bestpath d-path | {% endif %} +{% if router_bgp.bgp.additional_paths.receive is arista.avd.defined(true) %} +| bgp additional-paths receive | +{% endif %} +{% if router_bgp.bgp.additional_paths.receive is arista.avd.defined(false) %} +| no bgp additional-paths receive | +{% endif %} +{% if router_bgp.bgp.additional_paths.send is arista.avd.defined %} +{% if router_bgp.bgp.additional_paths.send is arista.avd.defined('disabled') %} +| no bgp additional-paths send | +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('any') %} +| bgp additional-paths send any | +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('backup') %} +| bgp additional-paths send backup | +{% elif router_bgp.bgp.additional_paths.send_ecmp_limit is arista.avd.defined and router_bgp.bgp.additional_paths.send is arista.avd.defined('ecmp') %} +| bgp additional-paths send ecmp limit {{ router_bgp.bgp.additional_paths.send_ecmp_limit }} | +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('ecmp') %} +| bgp additional-paths send ecmp | +{% elif router_bgp.bgp.additional_paths.send_limit is arista.avd.defined and router_bgp.bgp.additional_paths.send is arista.avd.defined('limit') %} +| bgp additional-paths send {{ router_bgp.bgp.additional_paths.send_limit }} | +{% endif %} +{% endif %} {% if router_bgp.updates.wait_for_convergence is arista.avd.defined(true) %} | update wait-for-convergence | {% endif %} @@ -557,6 +578,16 @@ ASN Notation: {{ router_bgp.as_notation | arista.avd.default('asplain') }} | {{ peer_group.name }} | {{ peer_group.activate | arista.avd.default(false) }} | {{ peer_group.encapsulation | arista.avd.default("default") }} | {% endfor %} {% endif %} +{% if router_bgp.address_family_evpn.neighbors is arista.avd.defined %} + +##### EVPN Neighbors + +| Neighbor | Activate | Encapsulation | +| -------- | -------- | ------------- | +{% for neighbor in router_bgp.address_family_evpn.neighbors | arista.avd.natural_sort('ip_address') %} +| {{ neighbor.ip_address }} | {{ neighbor.activate | arista.avd.default(false) }} | {{ neighbor.encapsulation | arista.avd.default("default") }} | +{% endfor %} +{% endif %} {% if router_bgp.address_family_evpn.neighbor_default.encapsulation is arista.avd.defined %} ##### EVPN Neighbor Default Encapsulation @@ -624,6 +655,61 @@ ASN Notation: {{ router_bgp.as_notation | arista.avd.default('asplain') }} | L3 Gateway Inter-domain | True | {% endif %} {% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast is arista.avd.defined %} + +#### Router BGP IPv4 Labeled Unicast + +##### General Settings + +| Settings | Value | +| -------- | ----- | +{% if router_bgp.address_family_ipv4_labeled_unicast.update_wait_for_convergence is arista.avd.defined(true) %} +| Update wait-for-convergence | Enabled | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.next_hop_unchanged is arista.avd.defined(true) %} +| Next-hop Unchanged | True | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.lfib_entry_installation_skipped is arista.avd.defined(true) %} +| LFIB entry installation skipped | True | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.label_local_termination is arista.avd.defined %} +| Label local-termination | {{ router_bgp.address_family_ipv4_labeled_unicast.label_local_termination }} | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.graceful_restart is arista.avd.defined(true) %} +| Graceful-restart | Enabled | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.neighbor_default.next_hop_self is arista.avd.defined(true) %} +| Neighbor default next-hop-self | True | +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.peer_groups is arista.avd.defined %} + +##### IPv4 BGP-LU Peer-groups + +| Peer-group | Activate | Route-map In | Route-map Out | RCF In | RCF Out | +| ---------- | -------- | ------------ | ------------- | ------ | ------- | +{% for peer in router_bgp.address_family_ipv4_labeled_unicast.peer_groups | arista.avd.natural_sort('name') %} +{% set route_map_in = peer.route_map_in | arista.avd.default("-") %} +{% set route_map_out = peer.route_map_out | arista.avd.default("-") %} +{% set rcf_in = peer.rcf_in | arista.avd.default("-") %} +{% set rcf_out = peer.rcf_out | arista.avd.default("-") %} +| {{ peer.name }} | {{ peer.activate | arista.avd.default(false) }} | {{ route_map_in }} | {{ route_map_out }} | {{ rcf_in }} | {{ rcf_out }} | +{% endfor %} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.neighbors is arista.avd.defined %} + +##### IPv4 BGP-LU Neighbors + +| Neighbor | Activate | Route-map In | Route-map Out | RCF In | RCF Out | +| -------- | -------- | ------------ | ------------- | ------ | ------- | +{% for neighbor in router_bgp.address_family_ipv4_labeled_unicast.neighbors | arista.avd.natural_sort('ip_address') %} +{% set route_map_in = neighbor.route_map_in | arista.avd.default("-") %} +{% set route_map_out = neighbor.route_map_out | arista.avd.default("-") %} +{% set rcf_in = neighbor.rcf_in | arista.avd.default("-") %} +{% set rcf_out = neighbor.rcf_out | arista.avd.default("-") %} +| {{ neighbor.ip_address }} | {{ neighbor.activate | arista.avd.default(false) }} | {{ route_map_in }} | {{ route_map_out }} | {{ rcf_in }} | {{ rcf_out }} | +{% endfor %} +{% endif %} +{% endif %} {% if router_bgp.address_family_ipv4_sr_te is arista.avd.defined %} #### Router BGP IPv4 SR-TE Address Family diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/management-tech-support.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/management-tech-support.j2 index 8e5e40c8d5a..bc1cc137e86 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/management-tech-support.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/management-tech-support.j2 @@ -9,21 +9,17 @@ management tech-support {% if management_tech_support.policy_show_tech_support is arista.avd.defined %} policy show tech-support -{% if management_tech_support.policy_show_tech_support.exclude_commands is arista.avd.defined %} -{% for exclude_command in management_tech_support.policy_show_tech_support.exclude_commands %} -{% set exclude_cli = "" %} -{% if exclude_command.type is arista.avd.defined('json') %} -{% set exclude_cli = "json " %} -{% endif %} -{% set exclude_cli = exclude_cli ~ exclude_command.command %} +{% for exclude_command in management_tech_support.policy_show_tech_support.exclude_commands | arista.avd.natural_sort %} +{% set exclude_cli = "" %} +{% if exclude_command.type is arista.avd.defined('json') %} +{% set exclude_cli = "json " %} +{% endif %} +{% set exclude_cli = exclude_cli ~ exclude_command.command %} exclude command {{ exclude_cli }} -{% endfor %} -{% endif %} -{% if management_tech_support.policy_show_tech_support.include_commands is arista.avd.defined %} -{% for include_command in management_tech_support.policy_show_tech_support.include_commands %} +{% endfor %} +{% for include_command in management_tech_support.policy_show_tech_support.include_commands | arista.avd.natural_sort %} include command {{ include_command.command }} -{% endfor %} -{% endif %} +{% endfor %} exit {% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/match-list-input.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/match-list-input.j2 index c6be88d112f..91d101f20fd 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/match-list-input.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/match-list-input.j2 @@ -5,6 +5,17 @@ #} {# eos - match list input #} {% if match_list_input is arista.avd.defined %} +{% if match_list_input.string is arista.avd.defined %} +! +{% for match_list in match_list_input.string | arista.avd.natural_sort('name') %} +match-list input string {{ match_list.name }} +{% for sequence in match_list.sequence_numbers | arista.avd.natural_sort('sequence') %} +{% if sequence.match_regex is arista.avd.defined %} + {{ sequence.sequence }} match regex {{ sequence.match_regex }} +{% endif %} +{% endfor %} +{% endfor %} +{% endif %} {% if match_list_input.prefix_ipv4 is arista.avd.defined %} ! {% for match_list in match_list_input.prefix_ipv4 | arista.avd.natural_sort('name') %} @@ -23,15 +34,4 @@ match-list input prefix-ipv6 {{ match_list.name }} {% endfor %} {% endfor %} {% endif %} -{% if match_list_input.string is arista.avd.defined %} -! -{% for match_list in match_list_input.string | arista.avd.natural_sort('name') %} -match-list input string {{ match_list.name }} -{% for sequence in match_list.sequence_numbers | arista.avd.natural_sort('sequence') %} -{% if sequence.match_regex is arista.avd.defined %} - {{ sequence.sequence }} match regex {{ sequence.match_regex }} -{% endif %} -{% endfor %} -{% endfor %} -{% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2 index 3078a12e4ef..1a4e86055ca 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2 @@ -7,6 +7,53 @@ {% if monitor_connectivity is arista.avd.defined %} ! monitor connectivity +{% for vrf in monitor_connectivity.vrfs | arista.avd.natural_sort('name') %} +{% if vrf.name is arista.avd.defined %} +{% if not loop.first %} + ! +{% endif %} + vrf {{ vrf.name }} +{% for interface_set in vrf.interface_sets | arista.avd.natural_sort('name') %} +{% if interface_set.name is arista.avd.defined and interface_set.interfaces is arista.avd.defined %} + interface set {{ interface_set.name }} {{ interface_set.interfaces }} +{% endif %} +{% endfor %} +{% if vrf.description is arista.avd.defined %} + description + {{ vrf.description }} +{% endif %} +{% if vrf.local_interfaces is arista.avd.defined %} +{% set local_interfaces_cli = "local-interfaces " ~ vrf.local_interfaces %} +{% if vrf.address_only | arista.avd.default(true) %} +{% set local_interfaces_cli = local_interfaces_cli ~ " address-only" %} +{% endif %} + {{ local_interfaces_cli }} default +{% endif %} +{% for host in vrf.hosts | arista.avd.natural_sort('name') %} +{% if host.name is arista.avd.defined %} + ! + host {{ host.name }} +{% if host.description is arista.avd.defined %} + description + {{ host.description }} +{% endif %} +{% if host.local_interfaces is arista.avd.defined %} +{% set local_interfaces_cli = "local-interfaces " ~ host.local_interfaces %} +{% if host.address_only | arista.avd.default(true) %} +{% set local_interfaces_cli = local_interfaces_cli ~ " address-only" %} +{% endif %} + {{ local_interfaces_cli }} +{% endif %} +{% if host.ip is arista.avd.defined %} + ip {{ host.ip }} +{% endif %} +{% if host.url is arista.avd.defined %} + url {{ host.url }} +{% endif %} +{% endif %} +{% endfor %} +{% endif %} +{% endfor %} {% if monitor_connectivity.interval is arista.avd.defined %} interval {{ monitor_connectivity.interval }} {% endif %} @@ -50,48 +97,4 @@ monitor connectivity {% endif %} {% endif %} {% endfor %} -{% for vrf in monitor_connectivity.vrfs | arista.avd.natural_sort('name') %} -{% if vrf.name is arista.avd.defined %} - vrf {{ vrf.name }} -{% for interface_set in vrf.interface_sets | arista.avd.natural_sort('name') %} -{% if interface_set.name is arista.avd.defined and interface_set.interfaces is arista.avd.defined %} - interface set {{ interface_set.name }} {{ interface_set.interfaces }} -{% endif %} -{% endfor %} -{% if vrf.local_interfaces is arista.avd.defined %} -{% set local_interfaces_cli = "local-interfaces " ~ vrf.local_interfaces %} -{% if vrf.address_only | arista.avd.default(true) %} -{% set local_interfaces_cli = local_interfaces_cli ~ " address-only" %} -{% endif %} - {{ local_interfaces_cli }} default -{% endif %} -{% if vrf.description is arista.avd.defined %} - description - {{ vrf.description }} -{% endif %} -{% for host in vrf.hosts | arista.avd.natural_sort('name') %} -{% if host.name is arista.avd.defined %} - ! - host {{ host.name }} -{% if host.description is arista.avd.defined %} - description - {{ host.description }} -{% endif %} -{% if host.local_interfaces is arista.avd.defined %} -{% set local_interfaces_cli = "local-interfaces " ~ host.local_interfaces %} -{% if host.address_only | arista.avd.default(true) %} -{% set local_interfaces_cli = local_interfaces_cli ~ " address-only" %} -{% endif %} - {{ local_interfaces_cli }} -{% endif %} -{% if host.ip is arista.avd.defined %} - ip {{ host.ip }} -{% endif %} -{% if host.url is arista.avd.defined %} - url {{ host.url }} -{% endif %} -{% endif %} -{% endfor %} -{% endif %} -{% endfor %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-sessions.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-sessions.j2 index 09aad1feb21..fc07083b0fc 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-sessions.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-sessions.j2 @@ -7,6 +7,9 @@ {% if monitor_sessions is arista.avd.defined %} ! {% for monitor_session in monitor_sessions | arista.avd.natural_sort('name') %} +{% if monitor_session.access_group.type is arista.avd.defined and monitor_session.access_group.name is arista.avd.defined %} +monitor session {{ monitor_session.name }} {{ monitor_session.access_group.type }} access-group {{ monitor_session.access_group.name }} +{% endif %} {% for source in monitor_session.sources | arista.avd.natural_sort('name') %} {% set source_cli = "monitor session " ~ monitor_session.name ~ " source " ~ source.name %} {% if source.direction is arista.avd.defined %} @@ -23,14 +26,15 @@ {% for destination in monitor_session.destinations | arista.avd.natural_sort %} monitor session {{ monitor_session.name }} destination {{ destination }} {% endfor %} -{% if monitor_session.encapsulation_gre_metadata_tx is arista.avd.defined(true) %} -monitor session {{ monitor_session.name }} encapsulation gre metadata tx -{% endif %} -{% if monitor_session.header_remove_size is arista.avd.defined %} -monitor session {{ monitor_session.name }} header remove size {{ monitor_session.header_remove_size }} +{% if monitor_session.truncate.enabled is arista.avd.defined(true) %} +{% set truncate_cli = "monitor session " ~ monitor_session.name ~ " truncate" %} +{% if monitor_session.truncate.size is arista.avd.defined %} +{% set truncate_cli = truncate_cli ~ " size " ~ monitor_session.truncate.size %} +{% endif %} +{{ truncate_cli }} {% endif %} -{% if monitor_session.access_group.type is arista.avd.defined and monitor_session.access_group.name is arista.avd.defined %} -monitor session {{ monitor_session.name }} {{ monitor_session.access_group.type }} access-group {{ monitor_session.access_group.name }} +{% if monitor_session.sample is arista.avd.defined %} +monitor session {{ monitor_session.name }} sample {{ monitor_session.sample }} {% endif %} {% if monitor_session.rate_limit_per_ingress_chip is arista.avd.defined %} monitor session {{ monitor_session.name }} rate-limit per-ingress-chip {{ monitor_session.rate_limit_per_ingress_chip }} @@ -38,15 +42,11 @@ monitor session {{ monitor_session.name }} rate-limit per-ingress-chip {{ monito {% if monitor_session.rate_limit_per_egress_chip is arista.avd.defined %} monitor session {{ monitor_session.name }} rate-limit per-egress-chip {{ monitor_session.rate_limit_per_egress_chip }} {% endif %} -{% if monitor_session.sample is arista.avd.defined %} -monitor session {{ monitor_session.name }} sample {{ monitor_session.sample }} +{% if monitor_session.header_remove_size is arista.avd.defined %} +monitor session {{ monitor_session.name }} header remove size {{ monitor_session.header_remove_size }} {% endif %} -{% if monitor_session.truncate.enabled is arista.avd.defined(true) %} -{% set truncate_cli = "monitor session " ~ monitor_session.name ~ " truncate" %} -{% if monitor_session.truncate.size is arista.avd.defined %} -{% set truncate_cli = truncate_cli ~ " size " ~ monitor_session.truncate.size %} -{% endif %} -{{ truncate_cli }} +{% if monitor_session.encapsulation_gre_metadata_tx is arista.avd.defined(true) %} +monitor session {{ monitor_session.name }} encapsulation gre metadata tx {% endif %} {% endfor %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 index 6fce879299b..659a1b1c88e 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 @@ -11,20 +11,20 @@ mpls ip {% if mpls.ldp is arista.avd.defined %} ! mpls ldp -{% if mpls.ldp.interface_disabled_default is arista.avd.defined(true) %} - interface disabled default -{% endif %} {% if mpls.ldp.router_id is arista.avd.defined %} router-id {{ mpls.ldp.router_id }} {% endif %} +{% if mpls.ldp.transport_address_interface is arista.avd.defined %} + transport-address interface {{ mpls.ldp.transport_address_interface }} +{% endif %} +{% if mpls.ldp.interface_disabled_default is arista.avd.defined(true) %} + interface disabled default +{% endif %} {% if mpls.ldp.shutdown is arista.avd.defined(true) %} shutdown {% elif mpls.ldp.shutdown is arista.avd.defined(false) %} no shutdown {% endif %} -{% if mpls.ldp.transport_address_interface is arista.avd.defined %} - transport-address interface {{ mpls.ldp.transport_address_interface }} -{% endif %} {% endif %} {% if mpls.icmp.fragmentation_needed_tunneling is arista.avd.defined(true) or mpls.icmp.ttl_exceeded_tunneling is arista.avd.defined(true) %} ! diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/patch-panel.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/patch-panel.j2 index 846e2f19671..86116f3eac4 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/patch-panel.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/patch-panel.j2 @@ -16,7 +16,7 @@ patch panel {% endif %} ! {% endif %} -{% for patch in patch_panel.patches | arista.avd.default([]) %} +{% for patch in patch_panel.patches | arista.avd.natural_sort("name") %} {% if patch.name is arista.avd.defined %} patch {{ patch.name }} {% if patch.enabled is arista.avd.defined(false) %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/priority-flow-control.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/priority-flow-control.j2 index d341846fa89..88df76b71a5 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/priority-flow-control.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/priority-flow-control.j2 @@ -9,17 +9,17 @@ {% if priority_flow_control.all_off is arista.avd.defined(true) %} priority-flow-control all off {% endif %} -{% if priority_flow_control.watchdog.action is arista.avd.defined %} -priority-flow-control pause watchdog action {{ priority_flow_control.watchdog.action }} -{% endif %} {% if priority_flow_control.watchdog.timeout is arista.avd.defined %} priority-flow-control pause watchdog default timeout {{ priority_flow_control.watchdog.timeout }} {% endif %} +{% if priority_flow_control.watchdog.recovery_time is arista.avd.defined %} +priority-flow-control pause watchdog default recovery-time {{ priority_flow_control.watchdog.recovery_time }} +{% endif %} {% if priority_flow_control.watchdog.polling_interval is arista.avd.defined %} priority-flow-control pause watchdog default polling-interval {{ priority_flow_control.watchdog.polling_interval }} {% endif %} -{% if priority_flow_control.watchdog.recovery_time is arista.avd.defined %} -priority-flow-control pause watchdog default recovery-time {{ priority_flow_control.watchdog.recovery_time }} +{% if priority_flow_control.watchdog.action is arista.avd.defined %} +priority-flow-control pause watchdog action {{ priority_flow_control.watchdog.action }} {% endif %} {% if priority_flow_control.watchdog.override_action_drop is arista.avd.defined(true) %} priority-flow-control pause watchdog override action drop diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ptp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ptp.j2 index 6de323d2996..b10f8e2410a 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ptp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ptp.j2 @@ -9,30 +9,15 @@ {% if ptp.clock_identity is arista.avd.defined %} ptp clock-identity {{ ptp.clock_identity }} {% endif %} -{% if ptp.source.ip is arista.avd.defined %} -ptp source ip {{ ptp.source.ip }} -{% endif %} -{% if ptp.priority1 is arista.avd.defined %} -ptp priority1 {{ ptp.priority1 }} -{% endif %} -{% if ptp.priority2 is arista.avd.defined %} -ptp priority2 {{ ptp.priority2 }} -{% endif %} -{% if ptp.profile is arista.avd.defined %} -ptp profile {{ ptp.profile }} -{% endif %} -{% if ptp.ttl is arista.avd.defined %} -ptp ttl {{ ptp.ttl }} -{% endif %} {% if ptp.domain is arista.avd.defined %} ptp domain {{ ptp.domain }} {% endif %} -{% if ptp.message_type.general.dscp is arista.avd.defined %} -ptp message-type general dscp {{ ptp.message_type.general.dscp }} default -{% endif %} {% if ptp.message_type.event.dscp is arista.avd.defined %} ptp message-type event dscp {{ ptp.message_type.event.dscp }} default {% endif %} +{% if ptp.message_type.general.dscp is arista.avd.defined %} +ptp message-type general dscp {{ ptp.message_type.general.dscp }} default +{% endif %} {% if ptp.mode is arista.avd.defined %} {% if ptp.mode_one_step is arista.avd.defined(true) and ptp.mode in ["boundary", "e2etransparent"] %} ptp mode {{ ptp.mode }} one-step @@ -40,6 +25,21 @@ ptp mode {{ ptp.mode }} one-step ptp mode {{ ptp.mode }} {% endif %} {% endif %} +{% if ptp.priority1 is arista.avd.defined %} +ptp priority1 {{ ptp.priority1 }} +{% endif %} +{% if ptp.priority2 is arista.avd.defined %} +ptp priority2 {{ ptp.priority2 }} +{% endif %} +{% if ptp.profile is arista.avd.defined %} +ptp profile {{ ptp.profile }} +{% endif %} +{% if ptp.source.ip is arista.avd.defined %} +ptp source ip {{ ptp.source.ip }} +{% endif %} +{% if ptp.ttl is arista.avd.defined %} +ptp ttl {{ ptp.ttl }} +{% endif %} {% if ptp.forward_unicast is arista.avd.defined(true) %} ptp forward-unicast {% endif %} @@ -52,38 +52,38 @@ ptp monitor threshold offset-from-master {{ ptp.monitor.threshold.offset_from_ma {% if ptp.monitor.threshold.mean_path_delay is arista.avd.defined %} ptp monitor threshold mean-path-delay {{ ptp.monitor.threshold.mean_path_delay }} {% endif %} -{% if ptp.monitor.threshold.drop.offset_from_master is arista.avd.defined %} -ptp monitor threshold offset-from-master {{ ptp.monitor.threshold.drop.offset_from_master }} nanoseconds drop -{% endif %} {% if ptp.monitor.threshold.drop.mean_path_delay is arista.avd.defined %} ptp monitor threshold mean-path-delay {{ ptp.monitor.threshold.drop.mean_path_delay }} nanoseconds drop {% endif %} +{% if ptp.monitor.threshold.drop.offset_from_master is arista.avd.defined %} +ptp monitor threshold offset-from-master {{ ptp.monitor.threshold.drop.offset_from_master }} nanoseconds drop +{% endif %} {% if ptp.monitor.missing_message.intervals is arista.avd.defined %} -{% if ptp.monitor.missing_message.intervals.announce is arista.avd.defined %} -ptp monitor threshold missing-message announce {{ ptp.monitor.missing_message.intervals.announce }} intervals +{% if ptp.monitor.missing_message.intervals.sync is arista.avd.defined %} +ptp monitor threshold missing-message sync {{ ptp.monitor.missing_message.intervals.sync }} intervals {% endif %} {% if ptp.monitor.missing_message.intervals.follow_up is arista.avd.defined %} ptp monitor threshold missing-message follow-up {{ ptp.monitor.missing_message.intervals.follow_up }} intervals {% endif %} -{% if ptp.monitor.missing_message.intervals.sync is arista.avd.defined %} -ptp monitor threshold missing-message sync {{ ptp.monitor.missing_message.intervals.sync }} intervals +{% if ptp.monitor.missing_message.intervals.announce is arista.avd.defined %} +ptp monitor threshold missing-message announce {{ ptp.monitor.missing_message.intervals.announce }} intervals {% endif %} {% endif %} {% if ptp.monitor.missing_message.sequence_ids.enabled is arista.avd.defined(false) %} no ptp monitor sequence-id {% elif ptp.monitor.missing_message.sequence_ids.enabled is arista.avd.defined(true) %} ptp monitor sequence-id -{% if ptp.monitor.missing_message.sequence_ids.announce is arista.avd.defined %} -ptp monitor threshold missing-message announce {{ ptp.monitor.missing_message.sequence_ids.announce }} sequence-ids -{% endif %} -{% if ptp.monitor.missing_message.sequence_ids.delay_resp is arista.avd.defined %} -ptp monitor threshold missing-message delay-resp {{ ptp.monitor.missing_message.sequence_ids.delay_resp }} sequence-ids +{% if ptp.monitor.missing_message.sequence_ids.sync is arista.avd.defined %} +ptp monitor threshold missing-message sync {{ ptp.monitor.missing_message.sequence_ids.sync }} sequence-ids {% endif %} {% if ptp.monitor.missing_message.sequence_ids.follow_up is arista.avd.defined %} ptp monitor threshold missing-message follow-up {{ ptp.monitor.missing_message.sequence_ids.follow_up }} sequence-ids {% endif %} -{% if ptp.monitor.missing_message.sequence_ids.sync is arista.avd.defined %} -ptp monitor threshold missing-message sync {{ ptp.monitor.missing_message.sequence_ids.sync }} sequence-ids +{% if ptp.monitor.missing_message.sequence_ids.delay_resp is arista.avd.defined %} +ptp monitor threshold missing-message delay-resp {{ ptp.monitor.missing_message.sequence_ids.delay_resp }} sequence-ids +{% endif %} +{% if ptp.monitor.missing_message.sequence_ids.announce is arista.avd.defined %} +ptp monitor threshold missing-message announce {{ ptp.monitor.missing_message.sequence_ids.announce }} sequence-ids {% endif %} {% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/queue-monitor-length.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/queue-monitor-length.j2 index 89dd7d4f1cc..27f8ca0c48c 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/queue-monitor-length.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/queue-monitor-length.j2 @@ -7,6 +7,14 @@ {% if queue_monitor_length.enabled is arista.avd.defined(true) %} ! queue-monitor length +{% if queue_monitor_length.notifying is arista.avd.defined(true) %} +queue-monitor length notifying +{% elif queue_monitor_length.notifying is arista.avd.defined(false) %} +no queue-monitor length notifying +{% endif %} +{% if queue_monitor_length.tx_latency is arista.avd.defined(true) %} +queue-monitor length tx-latency +{% endif %} {% if queue_monitor_length.default_thresholds.high is arista.avd.defined %} {% set default_thresholds_cli = "queue-monitor length default threshold" %} {% if queue_monitor_length.default_thresholds.low is arista.avd.defined %} @@ -16,17 +24,6 @@ queue-monitor length {% endif %} {{ default_thresholds_cli }} {% endif %} -{% if queue_monitor_length.log is arista.avd.defined %} -queue-monitor length log {{ queue_monitor_length.log }} -{% endif %} -{% if queue_monitor_length.notifying is arista.avd.defined(true) %} -queue-monitor length notifying -{% elif queue_monitor_length.notifying is arista.avd.defined(false) %} -no queue-monitor length notifying -{% endif %} -{% if queue_monitor_length.tx_latency is arista.avd.defined(true) %} -queue-monitor length tx-latency -{% endif %} {% if queue_monitor_length.cpu.thresholds.high is arista.avd.defined %} {% if queue_monitor_length.cpu.thresholds.low is arista.avd.defined %} queue-monitor length cpu thresholds {{ queue_monitor_length.cpu.thresholds.high }} {{ queue_monitor_length.cpu.thresholds.low }} @@ -34,4 +31,8 @@ queue-monitor length cpu thresholds {{ queue_monitor_length.cpu.thresholds.high queue-monitor length cpu threshold {{ queue_monitor_length.cpu.thresholds.high }} {% endif %} {% endif %} +{% if queue_monitor_length.log is arista.avd.defined %} +! +queue-monitor length log {{ queue_monitor_length.log }} +{% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-adaptive-virtual-topology.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-adaptive-virtual-topology.j2 index 3a8ed90d9f3..9c281b8cfcb 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-adaptive-virtual-topology.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-adaptive-virtual-topology.j2 @@ -8,7 +8,11 @@ ! router adaptive-virtual-topology {% if router_adaptive_virtual_topology.topology_role is arista.avd.defined %} - topology role {{ router_adaptive_virtual_topology.topology_role }} +{% set topology_role = "topology role " ~ router_adaptive_virtual_topology.topology_role %} +{% if router_adaptive_virtual_topology.gateway_vxlan is arista.avd.defined(true) and router_adaptive_virtual_topology.topology_role in ["edge", "transit zone", "transit region"] %} +{% set topology_role = topology_role ~ " gateway vxlan" %} +{% endif %} + {{ topology_role }} {% endif %} {% if router_adaptive_virtual_topology.region.name is arista.avd.defined and router_adaptive_virtual_topology.region.id %} region {{ router_adaptive_virtual_topology.region.name }} id {{ router_adaptive_virtual_topology.region.id }} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 index 8e64c10007c..8a4e8cc83e6 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 @@ -77,6 +77,27 @@ router bgp {{ router_bgp.as }} {% if router_bgp.bgp.bestpath.d_path is arista.avd.defined(true) %} bgp bestpath d-path {% endif %} +{% if router_bgp.bgp.additional_paths.receive is arista.avd.defined(true) %} + bgp additional-paths receive +{% endif %} +{% if router_bgp.bgp.additional_paths.receive is arista.avd.defined(false) %} + no bgp additional-paths receive +{% endif %} +{% if router_bgp.bgp.additional_paths.send is arista.avd.defined %} +{% if router_bgp.bgp.additional_paths.send is arista.avd.defined('disabled') %} + no bgp additional-paths send +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('any') %} + bgp additional-paths send any +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('backup') %} + bgp additional-paths send backup +{% elif router_bgp.bgp.additional_paths.send_ecmp_limit is arista.avd.defined and router_bgp.bgp.additional_paths.send is arista.avd.defined('ecmp') %} + bgp additional-paths send ecmp limit {{ router_bgp.bgp.additional_paths.send_ecmp_limit }} +{% elif router_bgp.bgp.additional_paths.send is arista.avd.defined('ecmp') %} + bgp additional-paths send ecmp +{% elif router_bgp.bgp.additional_paths.send_limit is arista.avd.defined and router_bgp.bgp.additional_paths.send is arista.avd.defined('limit') %} + bgp additional-paths send {{ router_bgp.bgp.additional_paths.send_limit }} +{% endif %} +{% endif %} {% if router_bgp.listen_ranges is arista.avd.defined %} {% for listen_range in router_bgp.listen_ranges | arista.avd.natural_sort('peer_group') if listen_range.peer_group is arista.avd.defined and listen_range.prefix is arista.avd.defined and (listen_range.peer_filter is arista.avd.defined or listen_range.remote_as is arista.avd.defined) %} @@ -643,6 +664,8 @@ router bgp {{ router_bgp.as }} {% set evpn_neighbor_default_encap_cli = evpn_neighbor_default_encap_cli ~ " next-hop-self source-interface " ~ router_bgp.address_family_evpn.neighbor_default.next_hop_self_source_interface %} {% endif %} {{ evpn_neighbor_default_encap_cli }} +{% elif router_bgp.address_family_evpn.neighbor_default.encapsulation is arista.avd.defined("path-selection") %} + neighbor default encapsulation path-selection {% endif %} {% if router_bgp.address_family_evpn.next_hop_mpls_resolution_ribs is arista.avd.defined %} {% set evpn_mpls_resolution_ribs = [] %} @@ -730,6 +753,9 @@ router bgp {{ router_bgp.as }} {% endif %} {{ neighbor_default_route_cli }} {% endif %} +{% if neighbor.encapsulation is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} encapsulation {{ neighbor.encapsulation }} +{% endif %} {% endfor %} {% if router_bgp.address_family_evpn.next_hop.resolution_disabled is arista.avd.defined(true) %} next-hop resolution disabled @@ -946,6 +972,293 @@ router bgp {{ router_bgp.as }} {% endif %} {% endfor %} {% endif %} +{# address family ipv4 BGP Labeled-Unicast activation #} +{% if router_bgp.address_family_ipv4_labeled_unicast is arista.avd.defined %} + ! + address-family ipv4 labeled-unicast +{% if router_bgp.address_family_ipv4_labeled_unicast.update_wait_for_convergence is arista.avd.defined(true) %} + update wait-for-convergence +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy is arista.avd.defined %} +{% for direction in ['in', 'out'] %} +{% set dir = 'direction_' ~ direction %} +{% set policy = router_bgp.address_family_ipv4_labeled_unicast.bgp.missing_policy[dir] %} +{% if policy.action is arista.avd.defined %} +{% set missing_policy_cli = "bgp missing-policy" %} +{% if policy.include_community_list is arista.avd.defined(true) or policy.include_prefix_list is arista.avd.defined(true) or policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " include" %} +{% if policy.include_community_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " community-list" %} +{% endif %} +{% if policy.include_prefix_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " prefix-list" %} +{% endif %} +{% if policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " sub-route-map" %} +{% endif %} +{% endif %} +{% set missing_policy_cli = missing_policy_cli ~ " direction " ~ direction ~ " action " ~ policy.action %} + {{ missing_policy_cli }} +{% endif %} +{% endfor %} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.receive is arista.avd.defined(true) %} + bgp additional-paths receive +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send is arista.avd.defined %} +{% set ipv4lu_add_path = "bgp additional-paths send " ~ router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_ecmp_limit is arista.avd.defined and router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send == "ecmp" %} +{% set ipv4lu_add_path = ipv4lu_add_path ~ " limit " ~ router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_ecmp_limit %} +{% elif router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_limit is arista.avd.defined and router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send == "limit" %} +{% set ipv4lu_add_path = ipv4lu_add_path ~ " " ~ router_bgp.address_family_ipv4_labeled_unicast.bgp.additional_paths.send_limit %} +{% endif %} + {{ ipv4lu_add_path }} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.bgp.next_hop_unchanged is arista.avd.defined(true) %} + bgp next-hop-unchanged +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs is arista.avd.defined %} +{% set v4_bgp_lu_resolution_ribs = [] %} +{% for rib in router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs %} +{% if rib.rib_type is arista.avd.defined("tunnel-rib-colored") %} +{% do v4_bgp_lu_resolution_ribs.append("tunnel-rib colored system-colored-tunnel-rib") %} +{% elif rib.rib_type is arista.avd.defined("tunnel-rib") %} +{% if rib.rib_name is arista.avd.defined %} +{% do v4_bgp_lu_resolution_ribs.append("tunnel-rib " ~ rib.rib_name) %} +{% endif %} +{% elif rib.rib_type is arista.avd.defined %} +{% do v4_bgp_lu_resolution_ribs.append(rib.rib_type) %} +{% endif %} +{% endfor %} +{% if v4_bgp_lu_resolution_ribs %} + next-hop resolution ribs {{ v4_bgp_lu_resolution_ribs | join(" ") }} +{% endif %} +{% endif %} +{% for peer in router_bgp.address_family_ipv4_labeled_unicast.peer_groups | arista.avd.natural_sort('name') %} +{% if peer.activate is arista.avd.defined(true) %} + neighbor {{ peer.name }} activate +{% else %} + no neighbor {{ peer.name }} activate +{% endif %} +{% if peer.additional_paths.receive is arista.avd.defined(true) %} + neighbor {{ peer.name }} additional-paths receive +{% endif %} +{% if peer.graceful_restart is arista.avd.defined(true) %} + neighbor {{ peer.name }} graceful-restart +{% endif %} +{% if peer.graceful_restart_helper.stale_route_map is arista.avd.defined %} + neighbor {{ peer.name }} graceful-restart-helper stale-route route-map {{ peer.graceful_restart_helper.stale_route_map }} +{% endif %} +{% if peer.route_map_in is arista.avd.defined %} + neighbor {{ peer.name }} route-map {{ peer.route_map_in }} in +{% endif %} +{% if peer.route_map_out is arista.avd.defined %} + neighbor {{ peer.name }} route-map {{ peer.route_map_out }} out +{% endif %} +{% if peer.rcf_in is arista.avd.defined %} + neighbor {{ peer.name }} rcf in {{ peer.rcf_in }} +{% endif %} +{% if peer.rcf_out is arista.avd.defined %} + neighbor {{ peer.name }} rcf out {{ peer.rcf_out }} +{% endif %} +{% if peer.additional_paths.send is arista.avd.defined %} +{% set lu_peer_add_path = "neighbor " ~ peer.name ~ " additional-paths send " ~ peer.additional_paths.send %} +{% if peer.additional_paths.send_ecmp_limit is arista.avd.defined and peer.additional_paths.send == "ecmp" %} +{% set lu_peer_add_path = lu_peer_add_path ~ " limit " ~ peer.additional_paths.send_ecmp_limit %} +{% elif peer.additional_paths.send_limit is arista.avd.defined and peer.additional_paths.send == "limit" %} +{% set lu_peer_add_path = lu_peer_add_path~ " " ~ peer.additional_paths.send_limit %} +{% endif %} + {{ lu_peer_add_path }} +{% endif %} +{% if peer.next_hop_unchanged is arista.avd.defined(true) %} + neighbor {{ peer.name }} next-hop-unchanged +{% endif %} +{% if peer.next_hop_self is arista.avd.defined(true) %} + neighbor {{ peer.name }} next-hop-self +{% endif %} +{% if peer.next_hop_self_v4_mapped_v6_source_interface is arista.avd.defined %} + neighbor {{ peer.name }} next-hop-self v4-mapped-v6 source-interface {{ peer.next_hop_self_v4_mapped_v6_source_interface }} +{% elif peer.next_hop_self_source_interface is arista.avd.defined %} + neighbor {{ peer.name }} next-hop-self source-interface {{ peer.next_hop_self_source_interface }} +{% endif %} +{% if peer.maximum_advertised_routes is arista.avd.defined %} +{% set maximum_routes_cli = "neighbor " ~peer.name ~ " maximum-routes " ~peer.maximum_advertised_routes %} +{% if peer.maximum_advertised_routes_warning_limit is arista.avd.defined %} +{% set maximum_routes_cli = maximum_routes_cli ~ " warning-limit " ~ peer.maximum_advertised_routes_warning_limit %} +{% endif %} + {{ maximum_routes_cli }} +{% endif %} +{% if peer.missing_policy is arista.avd.defined %} +{% for direction in ['in', 'out'] %} +{% set dir = 'direction_' ~ direction %} +{% set policy = peer.missing_policy[dir] %} +{% if policy.action is arista.avd.defined %} +{% set missing_policy_cli = "neighbor " ~ peer.name ~ " missing-policy" %} +{% if policy.include_community_list is arista.avd.defined(true) or policy.include_prefix_list is arista.avd.defined(true) or policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " include" %} +{% if policy.include_community_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " community-list" %} +{% endif %} +{% if policy.include_prefix_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " prefix-list" %} +{% endif %} +{% if policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " sub-route-map" %} +{% endif %} +{% endif %} +{% set missing_policy_cli = missing_policy_cli ~ " direction " ~ direction ~ " action " ~ policy.action %} + {{ missing_policy_cli }} +{% endif %} +{% endfor %} +{% endif %} +{% if peer.aigp_session is arista.avd.defined(true) %} + neighbor {{ peer.name }} aigp-session +{% endif %} +{% if peer.multi_path is arista.avd.defined(true) %} + neighbor {{ peer.name }} multi-path +{% endif %} +{% if peer.next_hop_resolution.v4_mapped_v6_translation is arista.avd.defined(true) %} + neighbor {{ peer.name }} next-hop resolution v4-mapped-v6 translation +{% elif peer.next_hop_resolution.v4_mapped_v6_translation is arista.avd.defined(false) %} + neighbor {{ peer.name }} next-hop resolution v4-mapped-v6 translation disabled +{% endif %} +{% endfor %} +{% for neighbor in router_bgp.address_family_ipv4_labeled_unicast.neighbors | arista.avd.natural_sort('ip_address') %} +{% if neighbor.activate is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} activate +{% else %} + no neighbor {{ neighbor.ip_address }} activate +{% endif %} +{% if neighbor.additional_paths.receive is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} additional-paths receive +{% endif %} +{% if neighbor.graceful_restart is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} graceful-restart +{% endif %} +{% if neighbor.graceful_restart_helper.stale_route_map is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} graceful-restart-helper stale-route route-map {{ neighbor.graceful_restart_helper.stale_route_map }} +{% endif %} +{% if neighbor.route_map_in is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} route-map {{ neighbor.route_map_in }} in +{% endif %} +{% if neighbor.route_map_out is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} route-map {{ neighbor.route_map_out }} out +{% endif %} +{% if neighbor.rcf_in is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} rcf in {{ neighbor.rcf_in }} +{% endif %} +{% if neighbor.rcf_out is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} rcf out {{ neighbor.rcf_out }} +{% endif %} +{% if neighbor.additional_paths.send is arista.avd.defined %} +{% set lu_neighbor_add_path = "neighbor " ~ neighbor.ip_address ~ " additional-paths send " ~ neighbor.additional_paths.send %} +{% if neighbor.additional_paths.send_ecmp_limit is arista.avd.defined and neighbor.additional_paths.send == "ecmp" %} +{% set lu_neighbor_add_path = lu_neighbor_add_path ~ " limit " ~ neighbor.additional_paths.send_ecmp_limit %} +{% elif neighbor.additional_paths.send_limit is arista.avd.defined and neighbor.additional_paths.send == "limit" %} +{% set lu_neighbor_add_path = lu_neighbor_add_path~ " " ~ neighbor.additional_paths.send_limit %} +{% endif %} + {{ lu_neighbor_add_path }} +{% endif %} +{% if neighbor.next_hop_unchanged is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} next-hop-unchanged +{% endif %} +{% if neighbor.next_hop_self is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} next-hop-self +{% endif %} +{% if neighbor.next_hop_self_v4_mapped_v6_source_interface is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} next-hop-self v4-mapped-v6 source-interface {{ neighbor.next_hop_self_v4_mapped_v6_source_interface }} +{% elif neighbor.next_hop_self_source_interface is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} next-hop-self source-interface {{ neighbor.next_hop_self_source_interface }} +{% endif %} +{% if neighbor.maximum_advertised_routes is arista.avd.defined %} +{% set maximum_routes_cli = "neighbor " ~neighbor.ip_address ~ " maximum-advertised-routes " ~neighbor.maximum_advertised_routes %} +{% if neighbor.maximum_advertised_routes_warning_limit is arista.avd.defined %} +{% set maximum_routes_cli = maximum_routes_cli ~ " warning-limit " ~ neighbor.maximum_advertised_routes_warning_limit %} +{% endif %} + {{ maximum_routes_cli }} +{% endif %} +{% if neighbor.missing_policy is arista.avd.defined %} +{% for direction in ['in', 'out'] %} +{% set dir = 'direction_' ~ direction %} +{% set policy = neighbor.missing_policy[dir] %} +{% if policy.action is arista.avd.defined %} +{% set missing_policy_cli = "neighbor " ~ neighbor.ip_address ~ " missing-policy " %} +{% if policy.include_community_list is arista.avd.defined(true) or policy.include_prefix_list is arista.avd.defined(true) or policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " include" %} +{% if policy.include_community_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " community-list" %} +{% endif %} +{% if policy.include_prefix_list is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " prefix-list" %} +{% endif %} +{% if policy.include_sub_route_map is arista.avd.defined(true) %} +{% set missing_policy_cli = missing_policy_cli ~ " sub-route-map" %} +{% endif %} +{% endif %} +{% set missing_policy_cli = missing_policy_cli ~ " direction " ~ direction ~ " action " ~ policy.action %} + {{ missing_policy_cli }} +{% endif %} +{% endfor %} +{% endif %} +{% if neighbor.aigp_session is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} aigp-session +{% endif %} +{% if neighbor.multi_path is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} multi-path +{% endif %} +{% if neighbor.next_hop_resolution.v4_mapped_v6_translation is arista.avd.defined(true) %} + neighbor {{ neighbor.ip_address }} next-hop resolution v4-mapped-v6 translation +{% elif neighbor.next_hop_resolution.v4_mapped_v6_translation is arista.avd.defined(false) %} + neighbor {{ neighbor.ip_address }} next-hop resolution v4-mapped-v6 translation disabled +{% endif %} +{% endfor %} +{% if router_bgp.address_family_ipv4_labeled_unicast.networks is arista.avd.defined %} +{% for network in router_bgp.address_family_ipv4_labeled_unicast.networks %} +{% set network_cli = "network " ~ network.prefix %} +{% if network.route_map is arista.avd.defined %} +{% set network_cli = network_cli ~ " route-map " ~ network.route_map %} +{% endif %} + {{ network_cli }} +{% endfor %} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.next_hops is arista.avd.defined %} +{% for next_hop in router_bgp.address_family_ipv4_labeled_unicast.next_hops %} +{% set next_hop_cli = "next-hop " ~ next_hop.ip_address ~ " originate" %} +{% if next_hop.lfib_backup_ip_forwarding is arista.avd.defined(true) %} +{% set next_hop_cli = next_hop_cli ~ " lfib-backup ip-forwarding" %} +{% endif %} + {{ next_hop_cli }} +{% endfor %} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.lfib_entry_installation_skipped is arista.avd.defined(true) %} + lfib entry installation skipped +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.label_local_termination is arista.avd.defined %} + label local-termination {{ router_bgp.address_family_ipv4_labeled_unicast.label_local_termination }} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.graceful_restart is arista.avd.defined(true) %} + graceful-restart +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.neighbor_default.next_hop_self is arista.avd.defined(true) %} + neighbor default next-hop-self +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols is arista.avd.defined %} +{% for tunnel_source_protocol in router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols %} +{% set tunnel_source_protocol_cli = "tunnel source-protocol " ~ tunnel_source_protocol.protocol %} +{% if tunnel_source_protocol.rcf is arista.avd.defined %} +{% set tunnel_source_protocol_cli = tunnel_source_protocol_cli ~ " rcf " ~ tunnel_source_protocol.rcf %} +{% endif %} + {{ tunnel_source_protocol_cli }} +{% endfor %} +{% endif %} +{% if router_bgp.address_family_ipv4_labeled_unicast.aigp_session is arista.avd.defined %} +{% for aigp_session_type in ['ibgp','confederation','ebgp'] %} +{% if router_bgp.address_family_ipv4_labeled_unicast.aigp_session[aigp_session_type] is arista.avd.defined(true) %} + aigp-session {{ aigp_session_type }} +{% endif %} +{% endfor %} +{% endif %} +{% endif %} {# address family ipv4 multicast activation #} {% if router_bgp.address_family_ipv4_multicast is arista.avd.defined %} ! diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-internet-exit.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-internet-exit.j2 index 71a3c78460c..74edcba72c4 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-internet-exit.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-internet-exit.j2 @@ -8,23 +8,30 @@ ! router internet-exit {% for exit_group in router_internet_exit.exit_groups | arista.avd.natural_sort('name') %} - ! - exit-group {{ exit_group.name }} + exit-group {{ exit_group.name }} {% for local_connection in exit_group.local_connections | arista.avd.natural_sort('name') %} - local connection {{ local_connection.name }} + local connection {{ local_connection.name }} {% endfor %} {% if exit_group.fib_default is arista.avd.defined(true) %} - fib-default + fib-default +{% endif %} +{% if not loop.last %} + ! {% endif %} {% endfor %} +{% if router_internet_exit.policies is arista.avd.defined %} + ! +{% endif %} {% for policy in router_internet_exit.policies | arista.avd.natural_sort('name') %} - ! - policy {{ policy.name }} + policy {{ policy.name }} {# Order of exit-groups MUST be preserved #} {% for exit_group in policy.exit_groups | arista.avd.default([]) %} {% if exit_group.name is arista.avd.defined %} - exit-group {{ exit_group.name }} + exit-group {{ exit_group.name }} {% endif %} {% endfor %} +{% if not loop.last %} + ! +{% endif %} {% endfor %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-msdp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-msdp.j2 index 6c474631c04..aa90bebf80e 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-msdp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-msdp.j2 @@ -22,7 +22,7 @@ router msdp {% if router_msdp.connection_retry_interval is arista.avd.defined %} connection retry interval {{ router_msdp.connection_retry_interval }} {% endif %} -{% for peer in router_msdp.peers | arista.avd.default([]) %} +{% for peer in router_msdp.peers | arista.avd.default([]) | arista.avd.natural_sort('ipv4_address') %} {% if peer.ipv4_address is arista.avd.defined %} ! peer {{ peer.ipv4_address }} @@ -33,7 +33,7 @@ router msdp {% endif %} {{ default_peer_cli }} {% endif %} -{% for mesh_group in peer.mesh_groups | arista.avd.default([]) %} +{% for mesh_group in peer.mesh_groups | arista.avd.default([]) | arista.avd.natural_sort('name') %} {% if mesh_group.name is arista.avd.defined %} mesh-group {{ mesh_group.name }} {% endif %} @@ -61,11 +61,11 @@ router msdp {% endif %} {% endif %} {% endfor %} -{% for vrf in router_msdp.vrfs | arista.avd.default([]) %} +{% for vrf in router_msdp.vrfs | arista.avd.default([]) | arista.avd.natural_sort('name') %} {% if vrf.name is arista.avd.defined and vrf.name != "default" %} ! vrf {{ vrf.name }} -{% for group_limit in vrf.group_limits | arista.avd.default([]) %} +{% for group_limit in vrf.group_limits | arista.avd.default([]) | arista.avd.natural_sort('source_prefix') %} group-limit {{ group_limit.limit }} source {{ group_limit.source_prefix }} {% endfor %} {% if vrf.originator_id_local_interface is arista.avd.defined %} @@ -80,43 +80,41 @@ router msdp {% if vrf.connection_retry_interval is arista.avd.defined %} connection retry interval {{ vrf.connection_retry_interval }} {% endif %} -{% for peer in vrf.peers | arista.avd.default([]) %} -{% if peer.ipv4_address is arista.avd.defined %} +{% for peer in vrf.peers | arista.avd.default([]) | arista.avd.natural_sort('ipv4_address') %} ! peer {{ peer.ipv4_address }} -{% if peer.default_peer.enabled is arista.avd.defined(true) %} -{% set default_peer_cli = "default-peer" %} -{% if peer.default_peer.prefix_list is arista.avd.defined %} -{% set default_peer_cli = default_peer_cli ~ " prefix-list " ~ peer.default_peer.prefix_list %} -{% endif %} - {{ default_peer_cli }} +{% if peer.default_peer.enabled is arista.avd.defined(true) %} +{% set default_peer_cli = "default-peer" %} +{% if peer.default_peer.prefix_list is arista.avd.defined %} +{% set default_peer_cli = default_peer_cli ~ " prefix-list " ~ peer.default_peer.prefix_list %} {% endif %} -{% for mesh_group in peer.mesh_groups | arista.avd.default([]) %} -{% if mesh_group.name is arista.avd.defined %} + {{ default_peer_cli }} +{% endif %} +{% for mesh_group in peer.mesh_groups | arista.avd.default([]) %} +{% if mesh_group.name is arista.avd.defined %} mesh-group {{ mesh_group.name }} -{% endif %} -{% endfor %} -{% if peer.local_interface is arista.avd.defined %} - local-interface {{ peer.local_interface }} {% endif %} -{% if peer.keepalive.keepalive_timer is arista.avd.defined and peer.keepalive.hold_timer is arista.avd.defined %} +{% endfor %} +{% if peer.local_interface is arista.avd.defined %} + local-interface {{ peer.local_interface }} +{% endif %} +{% if peer.keepalive.keepalive_timer is arista.avd.defined and peer.keepalive.hold_timer is arista.avd.defined %} keepalive {{ peer.keepalive.keepalive_timer }} {{ peer.keepalive.hold_timer }} -{% endif %} -{% if peer.sa_filter.in_list is arista.avd.defined %} +{% endif %} +{% if peer.sa_filter.in_list is arista.avd.defined %} sa-filter in list {{ peer.sa_filter.in_list }} -{% endif %} -{% if peer.sa_filter.out_list is arista.avd.defined %} +{% endif %} +{% if peer.sa_filter.out_list is arista.avd.defined %} sa-filter out list {{ peer.sa_filter.out_list }} -{% endif %} -{% if peer.description is arista.avd.defined %} +{% endif %} +{% if peer.description is arista.avd.defined %} description {{ peer.description }} -{% endif %} -{% if peer.disabled is arista.avd.defined(true) %} +{% endif %} +{% if peer.disabled is arista.avd.defined(true) %} disabled -{% endif %} -{% if peer.sa_limit is arista.avd.defined %} +{% endif %} +{% if peer.sa_limit is arista.avd.defined %} sa-limit {{ peer.sa_limit }} -{% endif %} {% endif %} {% endfor %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-path-selection.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-path-selection.j2 index 15923e512ee..8952d0a81db 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-path-selection.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-path-selection.j2 @@ -58,7 +58,8 @@ router path-selection ! {{ local_ip_def }} {% if local_ip.stun.server_profiles is arista.avd.defined %} - stun server-profile {{ local_ip.stun.server_profiles | join(" ") }} +{% set server_profiles = local_ip.stun.server_profiles | arista.avd.natural_sort %} + stun server-profile {{ server_profiles | join(" ") }} {% endif %} {% endfor %} {# peer dynamic #} @@ -91,18 +92,18 @@ router path-selection {% for load_balance_policy in router_path_selection.load_balance_policies | arista.avd.natural_sort('name') %} ! load-balance policy {{ load_balance_policy.name }} -{% if load_balance_policy.lowest_hop_count is arista.avd.defined(true) %} - hop count lowest +{% if load_balance_policy.latency is arista.avd.defined %} + latency {{ load_balance_policy.latency }} {% endif %} {% if load_balance_policy.jitter is arista.avd.defined %} jitter {{ load_balance_policy.jitter }} {% endif %} -{% if load_balance_policy.latency is arista.avd.defined %} - latency {{ load_balance_policy.latency }} -{% endif %} {% if load_balance_policy.loss_rate is arista.avd.defined %} loss-rate {{ load_balance_policy.loss_rate }} {% endif %} +{% if load_balance_policy.lowest_hop_count is arista.avd.defined(true) %} + hop count lowest +{% endif %} {% for priority, entries in load_balance_policy.path_groups | arista.avd.default([]) | groupby("priority", default=1) %} {% for entry in entries | arista.avd.natural_sort("name") %} {% set path_group_cli = "path-group " ~ entry.name %} @@ -125,6 +126,9 @@ router path-selection {% endif %} {% for rule in policy.rules | arista.avd.natural_sort('id') %} {% if rule.application_profile is arista.avd.defined %} +{% if policy.default_match is arista.avd.defined or not loop.first %} + ! +{% endif %} {{ rule.id }} application-profile {{ rule.application_profile }} {% if rule.load_balance is arista.avd.defined %} load-balance {{ rule.load_balance }} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-pim-sparse-mode.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-pim-sparse-mode.j2 index 183d19657f2..84875e9ae39 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-pim-sparse-mode.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-pim-sparse-mode.j2 @@ -9,6 +9,9 @@ router pim sparse-mode {% if router_pim_sparse_mode.ipv4 is arista.avd.defined %} ipv4 +{% if router_pim_sparse_mode.ipv4.ssm_range is arista.avd.defined %} + ssm range {{ router_pim_sparse_mode.ipv4.ssm_range }} +{% endif %} {% if router_pim_sparse_mode.ipv4.bfd is arista.avd.defined(true) %} bfd {% endif %} @@ -47,9 +50,6 @@ router pim sparse-mode {{ other_anycast_rp_addresses_cli }} {% endfor %} {% endfor %} -{% if router_pim_sparse_mode.ipv4.ssm_range is arista.avd.defined %} - ssm range {{ router_pim_sparse_mode.ipv4.ssm_range }} -{% endif %} {% endif %} {% for vrf in router_pim_sparse_mode.vrfs | arista.avd.natural_sort('name') %} ! diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/sflow.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/sflow.j2 index a5fd9587041..6494a86710c 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/sflow.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/sflow.j2 @@ -14,9 +14,6 @@ {% set sample_cli = sample_cli ~ sflow.sample %} {{ sample_cli }} {% endif %} -{% if sflow.sample_input_subinterface is arista.avd.defined(true) %} -sflow sample input subinterface -{% endif %} {% if sflow.polling_interval is arista.avd.defined %} sflow polling-interval {{ sflow.polling_interval }} {% endif %} @@ -46,6 +43,9 @@ sflow source-interface {{ sflow.source_interface }} {% elif sflow.source is arista.avd.defined %} sflow source {{ sflow.source }} {% endif %} +{% if sflow.sample_input_subinterface is arista.avd.defined(true) %} +sflow sample input subinterface +{% endif %} {% if sflow.sample_output_subinterface is arista.avd.defined(true) %} sflow sample output subinterface {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2 index ef8e9747aa9..cde4d09c54b 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2 @@ -6,27 +6,7 @@ {# eos - snmp server #} {% if snmp_server is arista.avd.defined %} ! -{% if snmp_server.engine_ids.local is arista.avd.defined %} -snmp-server engineID local {{ snmp_server.engine_ids.local }} -{% endif %} -{% if snmp_server.contact is arista.avd.defined %} -snmp-server contact {{ snmp_server.contact }} -{% endif %} -{% if snmp_server.location is arista.avd.defined %} -snmp-server location {{ snmp_server.location }} -{% endif %} -{% if snmp_server.engine_ids.remotes is arista.avd.defined %} -{% for engine_id in snmp_server.engine_ids.remotes %} -{% if engine_id.id is arista.avd.defined and engine_id.address is arista.avd.defined %} -{% set remote_engine_ids_cli = "snmp-server engineID remote " ~ engine_id.address %} -{% if engine_id.udp_port is arista.avd.defined %} -{% set remote_engine_ids_cli = remote_engine_ids_cli ~ " udp-port " ~ engine_id.udp_port %} -{% endif %} -{% set remote_engine_ids_cli = remote_engine_ids_cli ~ " " ~ engine_id.id %} -{{ remote_engine_ids_cli }} -{% endif %} -{% endfor %} -{% endif %} +{# TODO IPv4/IPv6 access list config order is not correct as per EOS #} {% if snmp_server.ipv4_acls is arista.avd.defined %} {% for acl in snmp_server.ipv4_acls %} {% set acl_cli = "snmp-server ipv4 access-list " ~ acl.name %} @@ -45,8 +25,18 @@ snmp-server location {{ snmp_server.location }} {{ acl_cli }} {% endfor %} {% endif %} +{% if snmp_server.engine_ids.local is arista.avd.defined %} +snmp-server engineID local {{ snmp_server.engine_ids.local }} +{% endif %} +{% if snmp_server.contact is arista.avd.defined %} +snmp-server contact {{ snmp_server.contact }} +{% endif %} +{% if snmp_server.location is arista.avd.defined %} +snmp-server location {{ snmp_server.location }} +{% endif %} +{# TODO local interfaces config order is not correct as per EOS #} {% if snmp_server.local_interfaces is arista.avd.defined %} -{% for local_interface in snmp_server.local_interfaces %} +{% for local_interface in snmp_server.local_interfaces | arista.avd.natural_sort('name') %} {% set interface_snmp_cli = "snmp-server" %} {% if local_interface.vrf is arista.avd.defined %} {% set interface_snmp_cli = interface_snmp_cli ~ " vrf " ~ local_interface.vrf %} @@ -56,7 +46,7 @@ snmp-server location {{ snmp_server.location }} {% endfor %} {% endif %} {% if snmp_server.views is arista.avd.defined %} -{% for view in snmp_server.views %} +{% for view in snmp_server.views | arista.avd.natural_sort('name') %} {% if view.name is arista.avd.defined %} {% set view_cli = "snmp-server view " ~ view.name %} {% endif %} @@ -92,7 +82,7 @@ snmp-server location {{ snmp_server.location }} {% endfor %} {% endif %} {% if snmp_server.groups is arista.avd.defined %} -{% for group in snmp_server.groups %} +{% for group in snmp_server.groups | arista.avd.natural_sort('name') %} {% if group.name is arista.avd.defined %} {% set group_cli = "snmp-server group " ~ group.name %} {% endif %} @@ -115,7 +105,7 @@ snmp-server location {{ snmp_server.location }} {% endfor %} {% endif %} {% if snmp_server.users is arista.avd.defined %} -{% for user in snmp_server.users %} +{% for user in snmp_server.users | arista.avd.natural_sort('name') %} {% if user.name is arista.avd.defined %} {% set user_cli = "snmp-server user " ~ user.name %} {% endif %} @@ -146,8 +136,20 @@ snmp-server location {{ snmp_server.location }} {{ user_cli }} {% endfor %} {% endif %} +{% if snmp_server.engine_ids.remotes is arista.avd.defined %} +{% for engine_id in snmp_server.engine_ids.remotes | arista.avd.natural_sort('address') %} +{% if engine_id.id is arista.avd.defined and engine_id.address is arista.avd.defined %} +{% set remote_engine_ids_cli = "snmp-server engineID remote " ~ engine_id.address %} +{% if engine_id.udp_port is arista.avd.defined %} +{% set remote_engine_ids_cli = remote_engine_ids_cli ~ " udp-port " ~ engine_id.udp_port %} +{% endif %} +{% set remote_engine_ids_cli = remote_engine_ids_cli ~ " " ~ engine_id.id %} +{{ remote_engine_ids_cli }} +{% endif %} +{% endfor %} +{% endif %} {% if snmp_server.hosts is arista.avd.defined %} -{% for host in snmp_server.hosts %} +{% for host in snmp_server.hosts | arista.avd.natural_sort('host') %} {% if host.host is arista.avd.defined %} {% set host_cli = "snmp-server host " ~ host.host %} {% if host.vrf is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/spanning-tree.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/spanning-tree.j2 index b878418abb0..5aafb098bf9 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/spanning-tree.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/spanning-tree.j2 @@ -6,9 +6,6 @@ {# eos - spanning-tree #} {% if spanning_tree is arista.avd.defined %} ! -{% if spanning_tree.root_super is arista.avd.defined(true) %} -spanning-tree root super -{% endif %} {% if spanning_tree.mode is arista.avd.defined() %} spanning-tree mode {{ spanning_tree.mode }} {% endif %} @@ -38,6 +35,9 @@ spanning-tree bpduguard rate-limit default spanning-tree bpduguard rate-limit count {{ spanning_tree.bpduguard_rate_limit.count }} {% endif %} {% endif %} +{% if spanning_tree.root_super is arista.avd.defined(true) %} +spanning-tree root super +{% endif %} {% if spanning_tree.mode is arista.avd.defined('mstp') %} {% for mst_instance in spanning_tree.mst_instances | arista.avd.natural_sort('id') %} {% if mst_instance.priority is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tacacs-servers.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tacacs-servers.j2 index ff12468a8f9..587c3354702 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tacacs-servers.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tacacs-servers.j2 @@ -6,6 +6,12 @@ {# eos - tacacs servers #} {% if tacacs_servers is arista.avd.defined %} ! +{% if tacacs_servers.timeout is arista.avd.defined %} +tacacs-server timeout {{ tacacs_servers.timeout }} +{% endif %} +{% if tacacs_servers.policy_unknown_mandatory_attribute_ignore is arista.avd.defined(true) %} +tacacs-server policy unknown-mandatory-attribute ignore +{% endif %} {% for host in tacacs_servers.hosts %} {% if host.host is arista.avd.defined %} {% set host_cli = "tacacs-server host " ~ host.host %} @@ -26,10 +32,4 @@ {% endif %} {{ host_cli }} {% endfor %} -{% if tacacs_servers.policy_unknown_mandatory_attribute_ignore is arista.avd.defined(true) %} -tacacs-server policy unknown-mandatory-attribute ignore -{% endif %} -{% if tacacs_servers.timeout is arista.avd.defined %} -tacacs-server timeout {{ tacacs_servers.timeout }} -{% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/terminal.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/terminal.j2 index feb1bcd8306..7d8daa82f17 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/terminal.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/terminal.j2 @@ -6,10 +6,10 @@ {# eos - terminal #} {% if terminal is arista.avd.defined %} ! -{% if terminal.width is arista.avd.defined %} -terminal width {{ terminal.width }} -{% endif %} {% if terminal.length is arista.avd.defined %} terminal length {{ terminal.length }} {% endif %} +{% if terminal.width is arista.avd.defined %} +terminal width {{ terminal.width }} +{% endif %} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vxlan-interface.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vxlan-interface.j2 index 0468fface33..23484b76e3f 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vxlan-interface.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vxlan-interface.j2 @@ -34,9 +34,6 @@ interface Vxlan1 {% if vlan.vni is arista.avd.defined %} vxlan vlan {{ vlan.id }} vni {{ vlan.vni }} {% endif %} -{% if vlan.flood_vteps is arista.avd.defined %} - vxlan vlan {{ vlan.id }} flood vtep {{ vlan.flood_vteps | join(' ') }} -{% endif %} {% endfor %} {% for vrf in vxlan_config.vxlan.vrfs | arista.avd.natural_sort('name') %} {% if vrf.vni is arista.avd.defined %} @@ -59,30 +56,35 @@ interface Vxlan1 {% if vxlan_config.vxlan.flood_vteps is arista.avd.defined %} vxlan flood vtep {{ vxlan_config.vxlan.flood_vteps | join(' ') }} {% endif %} -{% if vxlan_config.vxlan.qos.dscp_propagation_encapsulation is arista.avd.defined(true) %} - vxlan qos dscp propagation encapsulation -{% elif vxlan_config.vxlan.qos.dscp_propagation_encapsulation is arista.avd.defined(false) %} - no vxlan qos dscp propagation encapsulation +{% for vlan in vxlan_config.vxlan.vlans | arista.avd.natural_sort('id') %} +{% if vlan.flood_vteps is arista.avd.defined %} + vxlan vlan {{ vlan.id }} flood vtep {{ vlan.flood_vteps | join(' ') }} +{% endif %} +{% endfor %} +{% for vlan in vxlan_config.vxlan.vlans | arista.avd.natural_sort('id') if vlan.multicast_group is arista.avd.defined %} + vxlan vlan {{ vlan.id }} multicast group {{ vlan.multicast_group }} +{% endfor %} +{% for vrf in vxlan_config.vxlan.vrfs | arista.avd.natural_sort('name') if vrf.multicast_group is arista.avd.defined %} + vxlan vrf {{ vrf.name }} multicast group {{ vrf.multicast_group }} +{% endfor %} +{% if vxlan_config.vxlan.multicast.headend_replication is arista.avd.defined(true) %} + vxlan multicast headend-replication {% endif %} {% if vxlan_config.vxlan.qos.ecn_propagation is arista.avd.defined(true) %} vxlan qos ecn propagation {% elif vxlan_config.vxlan.qos.ecn_propagation is arista.avd.defined(false) %} no vxlan qos ecn propagation {% endif %} +{% if vxlan_config.vxlan.qos.dscp_propagation_encapsulation is arista.avd.defined(true) %} + vxlan qos dscp propagation encapsulation +{% elif vxlan_config.vxlan.qos.dscp_propagation_encapsulation is arista.avd.defined(false) %} + no vxlan qos dscp propagation encapsulation +{% endif %} {% if vxlan_config.vxlan.qos.map_dscp_to_traffic_class_decapsulation is arista.avd.defined(true) %} vxlan qos map dscp to traffic-class decapsulation {% elif vxlan_config.vxlan.qos.map_dscp_to_traffic_class_decapsulation is arista.avd.defined(false) %} no vxlan qos map dscp to traffic-class decapsulation {% endif %} -{% for vlan in vxlan_config.vxlan.vlans | arista.avd.natural_sort('id') if vlan.multicast_group is arista.avd.defined %} - vxlan vlan {{ vlan.id }} multicast group {{ vlan.multicast_group }} -{% endfor %} -{% for vrf in vxlan_config.vxlan.vrfs | arista.avd.natural_sort('name') if vrf.multicast_group is arista.avd.defined %} - vxlan vrf {{ vrf.name }} multicast group {{ vrf.multicast_group }} -{% endfor %} -{% if vxlan_config.vxlan.multicast.headend_replication is arista.avd.defined(true) %} - vxlan multicast headend-replication -{% endif %} {% if vxlan_config.eos_cli is arista.avd.defined %} {{ vxlan_config.eos_cli | indent(3, false) }} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 1ecd00017bb..b447ba23a96 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -11560,6 +11560,12 @@ keys: - pathfinder - transit region - transit zone + gateway_vxlan: + description: 'Enables VXLAN gateway router profile. + + Only applicable for `topology_role: edge`, `topology_role: transit region` + or `topology_role: transit zone`.' + type: bool region: type: dict description: Region name and ID. @@ -11923,6 +11929,9 @@ keys: keys: d_path: type: bool + additional_paths: + type: dict + $ref: eos_cli_config_gen#/$defs/bgp_additional_paths redistribute_internal: type: bool description: Allow redistribution of iBGP routes into an Interior Gateway @@ -12843,6 +12852,8 @@ keys: valid_values: - vxlan - mpls + - path-selection + description: Transport encapsulation for neighbor. next_hop_self_source_interface: description: Source interface name. type: str @@ -12907,6 +12918,13 @@ keys: Example: MyFunction(myarg).' route_map: type: str + encapsulation: + type: str + valid_values: + - vxlan + - mpls + - path-selection + description: Transport encapsulation for the neighbor. peer_groups: type: list primary_key: name @@ -12953,6 +12971,8 @@ keys: valid_values: - vxlan - mpls + - path-selection + description: Transport encapsulation for the peer-group. additional_paths: type: dict keys: @@ -13268,6 +13288,415 @@ keys: ''ospfv3''. ' + address_family_ipv4_labeled_unicast: + type: dict + keys: + aigp_session: + type: dict + keys: + confederation: + type: bool + ebgp: + type: bool + ibgp: + type: bool + bgp: + type: dict + keys: + additional_paths: + type: dict + $ref: eos_cli_config_gen#/$defs/bgp_additional_paths + missing_policy: + type: dict + description: Missing policy configuration for all address-families. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy + decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy + decision. + next_hop_unchanged: + type: bool + graceful_restart: + type: bool + label_local_termination: + type: str + valid_values: + - explicit-null + - implicit-null + lfib_entry_installation_skipped: + type: bool + description: Skip LFIB entry installation and next hop self route advertisements. + neighbor_default: + type: dict + keys: + next_hop_self: + type: bool + peer_groups: + type: list + primary_key: name + items: + type: dict + keys: + name: + type: str + description: Peer-group name. + activate: + type: bool + additional_paths: + type: dict + $ref: eos_cli_config_gen#/$defs/bgp_additional_paths + aigp_session: + type: bool + graceful_restart: + type: bool + graceful_restart_helper: + type: dict + keys: + stale_route_map: + type: str + maximum_advertised_routes: + type: int + description: Maximum number of routes (0 means unlimited). + min: 0 + max: 4294967294 + convert_types: + - str + maximum_advertised_routes_warning_limit: + type: str + convert_types: + - int + description: 'Maximum number of routes after which a warning is + issued (0 means never warn) or + + Percentage of maximum number of routes at which to warn ("<1-100> + percent"). + + ' + missing_policy: + type: dict + description: Missing policy configuration for BGP Labeled-Unicast + neighbor. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing + policy decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing + policy decision. + multi_path: + type: bool + next_hop_resolution: + type: dict + keys: + v4_mapped_v6_translation: + type: bool + next_hop_self: + type: bool + next_hop_self_source_interface: + description: Source interface name. + type: str + next_hop_self_v4_mapped_v6_source_interface: + description: v4-mapped-v6 source interface name. Takes precedence + over the next_hop_self_source_interface. + type: str + next_hop_unchanged: + type: bool + rcf_in: + type: str + description: 'Inbound RCF function name with parenthesis. + + Example: MyFunction(myarg).' + rcf_out: + type: str + description: 'Outbound RCF function name with parenthesis. + + Example: MyFunction(myarg).' + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. + neighbors: + type: list + primary_key: ip_address + items: + type: dict + keys: + ip_address: + type: str + activate: + type: bool + additional_paths: + type: dict + $ref: eos_cli_config_gen#/$defs/bgp_additional_paths + aigp_session: + type: bool + graceful_restart: + type: bool + graceful_restart_helper: + type: dict + keys: + stale_route_map: + type: str + maximum_advertised_routes: + type: int + description: Maximum number of routes (0 means unlimited). + min: 0 + max: 4294967294 + convert_types: + - str + maximum_advertised_routes_warning_limit: + type: str + convert_types: + - int + description: 'Maximum number of routes after which a warning is + issued (0 means never warn) or + + Percentage of maximum number of routes at which to warn ("<1-100> + percent"). + + ' + missing_policy: + type: dict + description: Missing policy configuration for BGP Labeled-Unicast + neighbor. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing + policy decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing + policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy + decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing + policy decision. + multi_path: + type: bool + next_hop_resolution: + type: dict + keys: + v4_mapped_v6_translation: + type: bool + next_hop_self: + type: bool + next_hop_self_source_interface: + description: Source interface name. + type: str + next_hop_self_v4_mapped_v6_source_interface: + description: v4-mapped-v6 source interface name. Takes precedence + over the next_hop_self_source_interface. + type: str + next_hop_unchanged: + type: bool + rcf_in: + type: str + description: 'Inbound RCF function name with parenthesis. + + Example: MyFunction(myarg).' + rcf_out: + type: str + description: 'Outbound RCF function name with parenthesis. + + Example: MyFunction(myarg).' + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. + networks: + type: list + primary_key: prefix + min_length: 1 + items: + type: dict + keys: + prefix: + description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". + type: str + route_map: + description: Route-map name. + type: str + next_hops: + type: list + primary_key: ip_address + min_length: 1 + items: + type: dict + keys: + ip_address: + type: str + lfib_backup_ip_forwarding: + type: bool + next_hop_resolution_ribs: + type: list + min_length: 1 + max_length: 3 + description: Specify the RIBs used to resolve next-hops. The order of + this list determines the order of RIB lookups. + items: + type: dict + keys: + rib_type: + type: str + required: true + valid_values: + - system-connected + - tunnel-rib-colored + - tunnel-rib + description: Type of RIB. For 'tunnel-rib', use 'rib_name' to specify + the name of the Tunnel-RIB to use. + rib_name: + type: str + description: The name of the tunnel-rib to use when using 'tunnel-rib' + type. + tunnel_source_protocols: + type: list + min_length: 1 + max_length: 2 + primary_key: protocol + items: + type: dict + keys: + protocol: + type: str + valid_values: + - isis segment-routing + - ldp + rcf: + type: str + description: 'Optional RCF function name with parenthesis. + + Example: MyFunction(myarg).' + update_wait_for_convergence: + type: bool + description: Wait for BGP to converge before sending out any route updates. address_family_ipv4_multicast: type: dict keys: @@ -19392,6 +19821,49 @@ $defs: When the `protocols` list contain both `tcp` and `udp`, this key value must be the same as `udp_dest_port_set_name`.' + bgp_additional_paths: + type: dict + keys: + receive: + type: bool + description: Enable or disable reception of additional-paths. + send: + type: str + description: 'Select an option to send multiple paths for same prefix through + bgp updates. + + any: Send any eligible path. + + backup: Best path and installed backup path. + + ecmp: All paths in best path ECMP group. + + limit: Limit to n eligible paths. + + disabled: Disable sending any path.' + valid_values: + - any + - backup + - ecmp + - limit + - disabled + send_ecmp_limit: + type: int + description: Amount of ECMP paths to send. `send` must be set to `ecmp` for + this setting. If this key-value pair is not set, it will send all paths + in best ECMP group. + convert_types: + - str + min: 2 + max: 64 + send_limit: + type: int + description: Number of paths to send through bgp updates. `send` must be set + to `limit` for this setting. + convert_types: + - str + min: 2 + max: 64 flow_tracking: type: dict keys: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/defs_bgp_additional_paths.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/defs_bgp_additional_paths.schema.yml new file mode 100644 index 00000000000..20253e42744 --- /dev/null +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/defs_bgp_additional_paths.schema.yml @@ -0,0 +1,35 @@ +# Copyright (c) 2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +type: dict +$defs: + bgp_additional_paths: + type: dict + keys: + receive: + type: bool + description: Enable or disable reception of additional-paths. + send: + type: str + description: |- + Select an option to send multiple paths for same prefix through bgp updates. + any: Send any eligible path. + backup: Best path and installed backup path. + ecmp: All paths in best path ECMP group. + limit: Limit to n eligible paths. + disabled: Disable sending any path. + valid_values: [ 'any', 'backup', 'ecmp', 'limit', 'disabled' ] + send_ecmp_limit: + type: int + description: Amount of ECMP paths to send. `send` must be set to `ecmp` for this setting. If this key-value pair is not set, it will send all paths in best ECMP group. + convert_types: + - str + min: 2 + max: 64 + send_limit: + type: int + description: Number of paths to send through bgp updates. `send` must be set to `limit` for this setting. + convert_types: + - str + min: 2 + max: 64 diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_adaptive_virtual_topology.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_adaptive_virtual_topology.schema.yml index 52f59aef78b..8c13fe0e42d 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_adaptive_virtual_topology.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_adaptive_virtual_topology.schema.yml @@ -17,6 +17,11 @@ keys: - "pathfinder" - "transit region" - "transit zone" + gateway_vxlan: + description: |- + Enables VXLAN gateway router profile. + Only applicable for `topology_role: edge`, `topology_role: transit region` or `topology_role: transit zone`. + type: bool region: type: dict description: Region name and ID. diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml index 1c40d5aef55..b9bab5f4d50 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml @@ -150,6 +150,9 @@ keys: keys: d_path: type: bool + additional_paths: + type: dict + $ref: "eos_cli_config_gen#/$defs/bgp_additional_paths" redistribute_internal: type: bool description: Allow redistribution of iBGP routes into an Interior Gateway Protocol (IGP). EOS default is true. @@ -1027,6 +1030,8 @@ keys: valid_values: - "vxlan" - "mpls" + - "path-selection" + description: Transport encapsulation for neighbor. next_hop_self_source_interface: description: Source interface name. type: str @@ -1088,6 +1093,13 @@ keys: Example: MyFunction(myarg). route_map: type: str + encapsulation: + type: str + valid_values: + - "vxlan" + - "mpls" + - "path-selection" + description: Transport encapsulation for the neighbor. peer_groups: type: list primary_key: name @@ -1134,6 +1146,8 @@ keys: valid_values: - "vxlan" - "mpls" + - "path-selection" + description: Transport encapsulation for the peer-group. additional_paths: type: dict keys: @@ -1439,6 +1453,382 @@ keys: description: | Routes learned by the OSPF protocol. The `ospf_route_type` is valid for source_protocols 'ospf' and 'ospfv3'. + address_family_ipv4_labeled_unicast: + type: dict + keys: + aigp_session: + type: dict + keys: + confederation: + type: bool + ebgp: + type: bool + ibgp: + type: bool + bgp: + type: dict + keys: + additional_paths: + type: dict + $ref: "eos_cli_config_gen#/$defs/bgp_additional_paths" + missing_policy: + type: dict + description: Missing policy configuration for all address-families. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + next_hop_unchanged: + type: bool + graceful_restart: + type: bool + label_local_termination: + type: str + valid_values: + - "explicit-null" + - "implicit-null" + lfib_entry_installation_skipped: + type: bool + description: Skip LFIB entry installation and next hop self route advertisements. + neighbor_default: + type: dict + keys: + next_hop_self: + type: bool + peer_groups: + type: list + primary_key: name + items: + type: dict + keys: + name: + type: str + description: Peer-group name. + activate: + type: bool + additional_paths: + type: dict + $ref: "eos_cli_config_gen#/$defs/bgp_additional_paths" + aigp_session: + type: bool + graceful_restart: + type: bool + graceful_restart_helper: + type: dict + keys: + stale_route_map: + type: str + maximum_advertised_routes: + type: int + description: Maximum number of routes (0 means unlimited). + min: 0 + max: 4294967294 + convert_types: + - str + maximum_advertised_routes_warning_limit: + type: str + convert_types: + - int + description: | + Maximum number of routes after which a warning is issued (0 means never warn) or + Percentage of maximum number of routes at which to warn ("<1-100> percent"). + missing_policy: + type: dict + description: Missing policy configuration for BGP Labeled-Unicast neighbor. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + multi_path: + type: bool + next_hop_resolution: + type: dict + keys: + v4_mapped_v6_translation: + type: bool + next_hop_self: + type: bool + next_hop_self_source_interface: + description: Source interface name. + type: str + next_hop_self_v4_mapped_v6_source_interface: + description: v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. + type: str + next_hop_unchanged: + type: bool + rcf_in: + type: str + description: |- + Inbound RCF function name with parenthesis. + Example: MyFunction(myarg). + rcf_out: + type: str + description: |- + Outbound RCF function name with parenthesis. + Example: MyFunction(myarg). + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. + neighbors: + type: list + primary_key: ip_address + items: + type: dict + keys: + ip_address: + type: str + activate: + type: bool + additional_paths: + type: dict + $ref: "eos_cli_config_gen#/$defs/bgp_additional_paths" + aigp_session: + type: bool + graceful_restart: + type: bool + graceful_restart_helper: + type: dict + keys: + stale_route_map: + type: str + maximum_advertised_routes: + type: int + description: Maximum number of routes (0 means unlimited). + min: 0 + max: 4294967294 + convert_types: + - str + maximum_advertised_routes_warning_limit: + type: str + convert_types: + - int + description: | + Maximum number of routes after which a warning is issued (0 means never warn) or + Percentage of maximum number of routes at which to warn ("<1-100> percent"). + missing_policy: + type: dict + description: Missing policy configuration for BGP Labeled-Unicast neighbor. + keys: + direction_in: + description: Missing policy inbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + direction_out: + description: Missing policy outbound direction. + type: dict + keys: + action: + description: Missing policy action. + type: str + required: true + valid_values: + - deny + - permit + - deny-in-out + include_community_list: + type: bool + description: Include community-list references in missing policy decision. + include_prefix_list: + type: bool + description: Include prefix-list references in missing policy decision. + include_sub_route_map: + type: bool + description: Include sub-route-map references in missing policy decision. + multi_path: + type: bool + next_hop_resolution: + type: dict + keys: + v4_mapped_v6_translation: + type: bool + next_hop_self: + type: bool + next_hop_self_source_interface: + description: Source interface name. + type: str + next_hop_self_v4_mapped_v6_source_interface: + description: v4-mapped-v6 source interface name. Takes precedence over the next_hop_self_source_interface. + type: str + next_hop_unchanged: + type: bool + rcf_in: + type: str + description: |- + Inbound RCF function name with parenthesis. + Example: MyFunction(myarg). + rcf_out: + type: str + description: |- + Outbound RCF function name with parenthesis. + Example: MyFunction(myarg). + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. + networks: + type: list + primary_key: prefix + min_length: 1 + items: + type: dict + keys: + prefix: + description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". + type: str + route_map: + description: Route-map name. + type: str + next_hops: + type: list + primary_key: ip_address + min_length: 1 + items: + type: dict + keys: + ip_address: + type: str + lfib_backup_ip_forwarding: + type: bool + next_hop_resolution_ribs: + type: list + min_length: 1 + max_length: 3 + description: "Specify the RIBs used to resolve next-hops. The order of this list determines the order of RIB lookups." + items: + type: dict + keys: + rib_type: + type: str + required: true + valid_values: + - "system-connected" + - "tunnel-rib-colored" + - "tunnel-rib" + description: "Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use." + rib_name: + type: str + description: "The name of the tunnel-rib to use when using 'tunnel-rib' type." + tunnel_source_protocols: + type: list + min_length: 1 + max_length: 2 + primary_key: protocol + items: + type: dict + keys: + protocol: + type: str + valid_values: + - "isis segment-routing" + - "ldp" + rcf: + type: str + description: |- + Optional RCF function name with parenthesis. + Example: MyFunction(myarg). + update_wait_for_convergence: + type: bool + description: Wait for BGP to converge before sending out any route updates. address_family_ipv4_multicast: type: dict keys: diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py index fe4412f3c9f..e5896ee35e2 100644 --- a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py +++ b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py @@ -225,13 +225,13 @@ def _get_port_channel_uplink(self: EosDesignsFacts, uplink_index: int, uplink_in if uplink_switch_facts.shared_utils.mlag is True or self._short_esi is not None: # Override our description on port-channel to be peer's group name if they are mlag pair or A/A #} - uplink["channel_description"] = uplink_switch_facts.shared_utils.group + uplink["peer_mlag_group"] = uplink_switch_facts.shared_utils.group # Used to determine whether or not port-channel should have an mlag id configure on the uplink_switch unique_uplink_switches = set(self.shared_utils.uplink_switches) if self.shared_utils.mlag is True: # Override the peer's description on port-channel to be our group name if we are mlag pair #} - uplink["peer_channel_description"] = self.shared_utils.group + uplink["mlag_group"] = self.shared_utils.group # Updating unique_uplink_switches with our mlag peer's uplink switches unique_uplink_switches.update(self.shared_utils.mlag_peer_facts.shared_utils.uplink_switches) diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/vlans.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/vlans.py index d91dc827f89..8c4222a2577 100644 --- a/python-avd/pyavd/_eos_designs/eos_designs_facts/vlans.py +++ b/python-avd/pyavd/_eos_designs/eos_designs_facts/vlans.py @@ -87,7 +87,9 @@ def _local_endpoint_vlans_and_trunk_groups(self: EosDesignsFacts) -> tuple[set, connected_endpoints = get(self._hostvars, connected_endpoints_key["key"], default=[]) for connected_endpoint in connected_endpoints: for adapter in connected_endpoint.get("adapters", []): - adapter_settings = self.shared_utils.get_merged_adapter_settings(adapter) + adapter_settings = self.shared_utils.get_merged_adapter_settings( + adapter, context=f"{connected_endpoints_key['key']}[{connected_endpoint['name']}].adapters" + ) if self.shared_utils.hostname not in adapter_settings.get("switches", []): # This switch is not connected to this endpoint. Skipping. continue @@ -111,7 +113,7 @@ def _local_endpoint_vlans_and_trunk_groups(self: EosDesignsFacts) -> tuple[set, # Skip entry if no match continue - adapter_settings = self.shared_utils.get_merged_adapter_settings(network_port_item) + adapter_settings = self.shared_utils.get_merged_adapter_settings(network_port_item, context="network_ports") adapter_vlans, adapter_trunk_groups = self._parse_adapter_settings(adapter_settings) vlans.update(adapter_vlans) trunk_groups.update(adapter_trunk_groups) diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml index 417bbd2221c..ec1386e2a08 100644 --- a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml @@ -1035,6 +1035,32 @@ keys: required: true description: Regex needs to match full hostname (i.e. is bounded by ^ and $ elements). + default_underlay_p2p_ethernet_description: + type: str + documentation_options: + table: fabric-settings + description: "The default description or description template to be used on L3 + point-to-point ethernet interfaces.\nThe interfaces using this are the routed + uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`.\nThis + can be a template using the format string syntax.\nThe available template fields + are:\n - `peer`: The name of the peer.\n - `interface`: The local interface + name.\n - `peer_interface`: The interface on the peer.\n - `vrf`: The name + of the VRF if set (Only applicable for `uplink_type: p2p-vrfs`).\n\nBy default + the description is templated from the name and interface of the peer." + default: P2P_{peer}_{peer_interface}{vrf?<_VRF_} + default_underlay_p2p_port_channel_description: + type: str + documentation_options: + table: fabric-settings + description: "The default description or description template to be used on L3 + point-to-point port-channel interfaces.\nThe port-channels using this are `p2p_links` + defined under `l3_edge` or `core_interfaces`.\nThis can be a template using + the format string syntax.\nThe available template fields are:\n - `peer`: The + name of the peer.\n - `interface`: The local interface name.\n - `peer_interface`: + The interface on the peer.\n - `port_channel_id`: The local port-channel ID.\n + \ - `peer_port_channel_id`: The ID of the port-channel on the peer.\n\nBy default + the description is templated from the name and interface of the peer." + default: P2P_{peer}_{peer_interface} design: documentation_options: table: design @@ -1443,6 +1469,20 @@ keys: convert_types: - str description: IPv4 prefix length used for L3 point-to-point uplinks. + wan_ha: + type: dict + description: Allow to manipulate the IP addressing scheme for WAN HA direct + subnets. + keys: + ipv4_prefix_length: + type: int + default: 31 + min: 1 + max: 31 + convert_types: + - str + description: IPv4 prefix length used for point-to-point interface for + direct WAN HA link. fabric_name: documentation_options: table: fabric-topology @@ -2053,6 +2093,27 @@ keys: type: bool default: false description: Configure IP routing for the OOB Management VRF. + mlag_bgp_peer_description: + type: str + documentation_options: + table: fabric-settings + description: "Description or description template to be used on the MLAG BGP peers + including those in VRFs.\nThis can be a template using the format string syntax.\nThe + available template fields are:\n - `mlag_peer`: The name of the MLAG peer.\n + \ - `interface`: The local MLAG L3 VLAN interface.\n - `peer_interface`: The + MLAG L3 VLAN interface on the MLAG peer.\n - `vrf`: The name of the VRF. Not + available for the underlay peering.\n\nThe default description is built from + the name and interface of the MLAG peer and optionally the VRF." + default: '{mlag_peer}_{peer_interface}' + mlag_bgp_peer_group_description: + type: str + documentation_options: + table: fabric-settings + description: "Description or description template to be used on the MLAG BGP peer-group.\nThis + can be a template using the format string syntax.\nThe available template fields + are:\n - `mlag_peer`: The name of the MLAG peer.\n\nThe default description + is the name of the MLAG peers." + default: '{mlag_peer}' mlag_ibgp_peering_vrfs: documentation_options: table: network-services-vrfs-settings @@ -2101,6 +2162,63 @@ keys: If `false` (default) an MLAG ID will only be configured on Port-Channel downlinks dual-homed to two MLAG switches.' default: false + mlag_peer_l3_svi_description: + type: str + documentation_options: + table: fabric-settings + description: "Description or description template to be used on MLAG L3 peering + SVI (Interface Vlan4093 by default).\nThis can be a template using the format + string syntax.\nThe available template fields are:\n - `mlag_peer`: The name + of the MLAG peer.\n - `interface`: The MLAG L3 peering SVI name.\n - `mlag_peer_l3_vlan`: + The MLAG L3 peering VLAN ID." + default: MLAG_L3 + mlag_peer_l3_vlan_name: + type: str + documentation_options: + table: fabric-settings + description: "Name or name template to be used on MLAG L3 VLAN (VLAN 4093 by default).\nThis + can be a template using the format string syntax.\nThe available template fields + are:\n - `mlag_peer`: The name of the MLAG peer.\n - `mlag_peer_l3_vlan`: + The MLAG L3 peering VLAN ID." + default: MLAG_L3 + mlag_peer_l3_vrf_svi_description: + type: str + documentation_options: + table: fabric-settings + description: "Description or description template to be used on MLAG L3 peering + SVI for VRFs.\nThis can be a template using the format string syntax.\nThe available + template fields are:\n - `mlag_peer`: The name of the MLAG peer.\n - `interface`: + The MLAG L3 VRF peering SVI name.\n - `vlan`: The MLAG L3 VRF peering VLAN + ID.\n - `vrf`: The VRF name." + default: MLAG_L3_VRF_{vrf} + mlag_peer_l3_vrf_vlan_name: + type: str + documentation_options: + table: fabric-settings + description: "Name or name template to be used on MLAG L3 peering VLAN for VRFs.\nThis + can be a template using the format string syntax.\nThe available template fields + are:\n - `mlag_peer`: The name of the MLAG peer.\n - `vlan`: The MLAG L3 VRF + peering VLAN ID.\n - `vrf`: The VRF name." + default: MLAG_L3_VRF_{vrf} + mlag_peer_svi_description: + type: str + documentation_options: + table: fabric-settings + description: "Description or description template to be used on MLAG peering SVI + (Interface Vlan4094 by default).\nThis can be a template using the format string + syntax.\nThe available template fields are:\n - `mlag_peer`: The name of the + MLAG peer.\n - `interface`: The MLAG peering SVI name.\n - `mlag_peer_vlan`: + The MLAG peering VLAN ID." + default: MLAG + mlag_peer_vlan_name: + type: str + documentation_options: + table: fabric-settings + description: "Name or name template to be used on MLAG peering VLAN (VLAN 4094 + by default).\nThis can be a template using the format string syntax.\nThe available + template fields are:\n - `mlag_peer`: The name of the MLAG peer.\n - `mlag_peer_vlan`: + The MLAG peering VLAN ID." + default: MLAG mlag_port_channel_description: type: str documentation_options: @@ -2589,6 +2707,16 @@ keys: ' default: false + overlay_bgp_peer_description: + type: str + documentation_options: + table: overlay-settings + description: "Description or description template to be used on the overlay BGP + peers.\nThis can be a template using the format string syntax.\nThe available + template fields are:\n - `peer`: The name of the BGP peer.\n - `peer_interface`: + The interface on the BGP peer if available.\n\nThe default description is built + from the name and interface of the BGP peer." + default: '{peer}{peer_interface?<_}' overlay_cvx_servers: documentation_options: table: overlay-settings @@ -4360,6 +4488,15 @@ keys: WAN interfaces require an inbound access-list to be set unless the carrier is "trusted".' + wan_encapsulation: + documentation_options: + table: wan-settings + description: Select the encapsulation to use for EVPN peerings for WAN BGP peers. + type: str + default: path-selection + valid_values: + - path-selection + - vxlan wan_ha: documentation_options: table: wan-settings @@ -8982,6 +9119,18 @@ $defs: description: 'Number of parallel links towards HA switches. Can be used to reserve IP addresses for future parallel HA links.' + port_channel_id: + type: int + convert_types: + - str + description: Port-channel ID to use for direct HA. + use_port_channel_for_direct_ha: + type: bool + default: true + description: 'Enable or disable using a port-channel interface for + direct HA when there is only one interface. + + This feature was introduced in EOS 4.33.0F.' flow_tracking: type: dict $ref: eos_designs#/$defs/flow_tracking_link @@ -9362,9 +9511,16 @@ $defs: description: The values can be like ["node_a_as", "node_b_as"]. descriptions: type: list - description: Interface description. + description: Interface descriptions. items: type: str + description: "Description or description template to be used on the ethernet + interface.\nThis can be a template using the format string syntax.\nThe + available template fields are:\n - `peer`: The name of the peer.\n + \ - `interface`: The local interface name.\n - `peer_interface`: The + interface on the peer.\n\nThe default description is set by `default_underlay_p2p_ethernet_description`.\nBy + default the description is templated from the name and interface of + the peer." include_in_underlay_protocol: type: bool default: true @@ -9437,6 +9593,18 @@ $defs: description: Port-channel parameters. type: dict keys: + description: + type: str + description: "Description or description template to be used on the + port-channel interface.\nThis can be a template using the format string + syntax.\nThe available template fields are:\n - `peer`: The name + of the peer.\n - `interface`: The local port-channel interface name.\n + \ - `peer_interface`: The port-channel interface on the peer.\n - + `port_channel_id`: The local port-channel ID.\n - `peer_port_channel_id`: + The ID of the port-channel on the peer.\n\nFalls back to the description + on the `p2p_link` if set. Otherwise default description is set by + `default_underlay_p2p_port_channel_description`.\nBy default the description + is templated from the name and port_channel interface of the peer." mode: type: str default: active diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_ethernet_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_ethernet_description.schema.yml new file mode 100644 index 00000000000..1f42eaa5bfa --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_ethernet_description.schema.yml @@ -0,0 +1,25 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + default_underlay_p2p_ethernet_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + The default description or description template to be used on L3 point-to-point ethernet interfaces. + The interfaces using this are the routed uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`. + This can be a template using the format string syntax. + The available template fields are: + - `peer`: The name of the peer. + - `interface`: The local interface name. + - `peer_interface`: The interface on the peer. + - `vrf`: The name of the VRF if set (Only applicable for `uplink_type: p2p-vrfs`). + + By default the description is templated from the name and interface of the peer. + default: "P2P_{peer}_{peer_interface}{vrf?<_VRF_}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_port_channel_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_port_channel_description.schema.yml new file mode 100644 index 00000000000..94f911ef5b5 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/default_underlay_p2p_port_channel_description.schema.yml @@ -0,0 +1,26 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + default_underlay_p2p_port_channel_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + The default description or description template to be used on L3 point-to-point port-channel interfaces. + The port-channels using this are `p2p_links` defined under `l3_edge` or `core_interfaces`. + This can be a template using the format string syntax. + The available template fields are: + - `peer`: The name of the peer. + - `interface`: The local interface name. + - `peer_interface`: The interface on the peer. + - `port_channel_id`: The local port-channel ID. + - `peer_port_channel_id`: The ID of the port-channel on the peer. + + By default the description is templated from the name and interface of the peer. + default: "P2P_{peer}_{peer_interface}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_node_type.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_node_type.schema.yml index c16592d7a63..dfad31b8b6c 100644 --- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_node_type.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_node_type.schema.yml @@ -1341,6 +1341,18 @@ $defs: description: |- Number of parallel links towards HA switches. Can be used to reserve IP addresses for future parallel HA links. + port_channel_id: + type: int + convert_types: + - str + description: |- + Port-channel ID to use for direct HA. + use_port_channel_for_direct_ha: + type: bool + default: true + description: |- + Enable or disable using a port-channel interface for direct HA when there is only one interface. + This feature was introduced in EOS 4.33.0F. flow_tracking: type: dict $ref: "eos_designs#/$defs/flow_tracking_link" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_p2p_links.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_p2p_links.schema.yml index 2913d8caea3..82e534f61c8 100644 --- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_p2p_links.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_p2p_links.schema.yml @@ -66,9 +66,19 @@ $defs: description: The values can be like ["node_a_as", "node_b_as"]. descriptions: type: list - description: Interface description. + description: Interface descriptions. items: type: str + description: |- + Description or description template to be used on the ethernet interface. + This can be a template using the format string syntax. + The available template fields are: + - `peer`: The name of the peer. + - `interface`: The local interface name. + - `peer_interface`: The interface on the peer. + + The default description is set by `default_underlay_p2p_ethernet_description`. + By default the description is templated from the name and interface of the peer. include_in_underlay_protocol: type: bool default: true @@ -138,6 +148,20 @@ $defs: description: Port-channel parameters. type: dict keys: + description: + type: str + description: |- + Description or description template to be used on the port-channel interface. + This can be a template using the format string syntax. + The available template fields are: + - `peer`: The name of the peer. + - `interface`: The local port-channel interface name. + - `peer_interface`: The port-channel interface on the peer. + - `port_channel_id`: The local port-channel ID. + - `peer_port_channel_id`: The ID of the port-channel on the peer. + + Falls back to the description on the `p2p_link` if set. Otherwise default description is set by `default_underlay_p2p_port_channel_description`. + By default the description is templated from the name and port_channel interface of the peer. mode: type: str default: active diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/fabric_ip_addressing.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/fabric_ip_addressing.schema.yml index d77116523d8..c196b9a7000 100644 --- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/fabric_ip_addressing.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/fabric_ip_addressing.schema.yml @@ -56,3 +56,15 @@ keys: convert_types: - str description: IPv4 prefix length used for L3 point-to-point uplinks. + wan_ha: + type: dict + description: Allow to manipulate the IP addressing scheme for WAN HA direct subnets. + keys: + ipv4_prefix_length: + type: int + default: 31 + min: 1 + max: 31 + convert_types: + - str + description: IPv4 prefix length used for point-to-point interface for direct WAN HA link. diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_description.schema.yml new file mode 100644 index 00000000000..bed4c39bf58 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_description.schema.yml @@ -0,0 +1,24 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_bgp_peer_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on the MLAG BGP peers including those in VRFs. + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `interface`: The local MLAG L3 VLAN interface. + - `peer_interface`: The MLAG L3 VLAN interface on the MLAG peer. + - `vrf`: The name of the VRF. Not available for the underlay peering. + + The default description is built from the name and interface of the MLAG peer and optionally the VRF. + default: "{mlag_peer}_{peer_interface}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_group_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_group_description.schema.yml new file mode 100644 index 00000000000..318654229ea --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_bgp_peer_group_description.schema.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_bgp_peer_group_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on the MLAG BGP peer-group. + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + + The default description is the name of the MLAG peers. + default: "{mlag_peer}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_svi_description.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_svi_description.yml new file mode 100644 index 00000000000..8d2e3dc839f --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_svi_description.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_l3_svi_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on MLAG L3 peering SVI (Interface Vlan4093 by default). + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `interface`: The MLAG L3 peering SVI name. + - `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. + default: "MLAG_L3" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vlan_name.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vlan_name.yml new file mode 100644 index 00000000000..1b54ba3613f --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vlan_name.yml @@ -0,0 +1,20 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_l3_vlan_name: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Name or name template to be used on MLAG L3 VLAN (VLAN 4093 by default). + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `mlag_peer_l3_vlan`: The MLAG L3 peering VLAN ID. + default: "MLAG_L3" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_svi_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_svi_description.schema.yml new file mode 100644 index 00000000000..9cf957cc91d --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_svi_description.schema.yml @@ -0,0 +1,22 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_l3_vrf_svi_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on MLAG L3 peering SVI for VRFs. + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `interface`: The MLAG L3 VRF peering SVI name. + - `vlan`: The MLAG L3 VRF peering VLAN ID. + - `vrf`: The VRF name. + default: "MLAG_L3_VRF_{vrf}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_vlan_name.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_vlan_name.schema.yml new file mode 100644 index 00000000000..3dc8b0f2fe4 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_l3_vrf_vlan_name.schema.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_l3_vrf_vlan_name: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Name or name template to be used on MLAG L3 peering VLAN for VRFs. + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `vlan`: The MLAG L3 VRF peering VLAN ID. + - `vrf`: The VRF name. + default: "MLAG_L3_VRF_{vrf}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_svi_description.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_svi_description.yml new file mode 100644 index 00000000000..2cc172e9e17 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_svi_description.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_svi_description: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on MLAG peering SVI (Interface Vlan4094 by default). + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `interface`: The MLAG peering SVI name. + - `mlag_peer_vlan`: The MLAG peering VLAN ID. + default: "MLAG" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_vlan_name.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_vlan_name.yml new file mode 100644 index 00000000000..a5ccec3c4a9 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/mlag_peer_vlan_name.yml @@ -0,0 +1,20 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + mlag_peer_vlan_name: + type: str + documentation_options: + table: fabric-settings + # TODO: Insert link to format string syntax article. + description: |- + Name or name template to be used on MLAG peering VLAN (VLAN 4094 by default). + This can be a template using the format string syntax. + The available template fields are: + - `mlag_peer`: The name of the MLAG peer. + - `mlag_peer_vlan`: The MLAG peering VLAN ID. + default: "MLAG" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/overlay_bgp_peer_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/overlay_bgp_peer_description.schema.yml new file mode 100644 index 00000000000..1a5962b19f2 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/overlay_bgp_peer_description.schema.yml @@ -0,0 +1,22 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + overlay_bgp_peer_description: + type: str + documentation_options: + table: overlay-settings + # TODO: Insert link to format string syntax article. + description: |- + Description or description template to be used on the overlay BGP peers. + This can be a template using the format string syntax. + The available template fields are: + - `peer`: The name of the BGP peer. + - `peer_interface`: The interface on the BGP peer if available. + + The default description is built from the name and interface of the BGP peer. + default: "{peer}{peer_interface?<_}" diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/wan_encapsulation.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/wan_encapsulation.schema.yml new file mode 100644 index 00000000000..637cc332737 --- /dev/null +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/wan_encapsulation.schema.yml @@ -0,0 +1,17 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../_schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + wan_encapsulation: + documentation_options: + table: wan-settings + description: Select the encapsulation to use for EVPN peerings for WAN BGP peers. + type: str + default: path-selection + valid_values: + - path-selection + - vxlan diff --git a/python-avd/pyavd/_eos_designs/shared_utils/descriptions.py b/python-avd/pyavd/_eos_designs/shared_utils/descriptions.py index 3a9d5b39d05..2bf1ea4f5c8 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/descriptions.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/descriptions.py @@ -49,3 +49,58 @@ def mlag_member_description(self: SharedUtils) -> str: def mlag_port_channel_description(self: SharedUtils) -> str: default_value = self.schema.get_default_value(["mlag_port_channel_description"]) return get(self.hostvars, "mlag_port_channel_description", default=default_value) + + @cached_property + def mlag_peer_svi_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_svi_description"]) + return get(self.hostvars, "mlag_peer_svi_description", default=default_value) + + @cached_property + def mlag_peer_l3_svi_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_l3_svi_description"]) + return get(self.hostvars, "mlag_peer_l3_svi_description", default=default_value) + + @cached_property + def mlag_peer_vlan_name(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_vlan_name"]) + return get(self.hostvars, "mlag_peer_vlan_name", default=default_value) + + @cached_property + def mlag_peer_l3_vlan_name(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_l3_vlan_name"]) + return get(self.hostvars, "mlag_peer_l3_vlan_name", default=default_value) + + @cached_property + def mlag_peer_l3_vrf_svi_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_l3_vrf_svi_description"]) + return get(self.hostvars, "mlag_peer_l3_vrf_svi_description", default=default_value) + + @cached_property + def mlag_peer_l3_vrf_vlan_name(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_peer_l3_vrf_vlan_name"]) + return get(self.hostvars, "mlag_peer_l3_vrf_vlan_name", default=default_value) + + @cached_property + def mlag_bgp_peer_group_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_bgp_peer_group_description"]) + return get(self.hostvars, "mlag_bgp_peer_group_description", default=default_value) + + @cached_property + def mlag_bgp_peer_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["mlag_bgp_peer_description"]) + return get(self.hostvars, "mlag_bgp_peer_description", default=default_value) + + @cached_property + def overlay_bgp_peer_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["overlay_bgp_peer_description"]) + return get(self.hostvars, "overlay_bgp_peer_description", default=default_value) + + @cached_property + def default_underlay_p2p_ethernet_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["default_underlay_p2p_ethernet_description"]) + return get(self.hostvars, "default_underlay_p2p_ethernet_description", default=default_value) + + @cached_property + def default_underlay_p2p_port_channel_description(self: SharedUtils) -> str: + default_value = self.schema.get_default_value(["default_underlay_p2p_port_channel_description"]) + return get(self.hostvars, "default_underlay_p2p_port_channel_description", default=default_value) diff --git a/python-avd/pyavd/_eos_designs/shared_utils/filtered_tenants.py b/python-avd/pyavd/_eos_designs/shared_utils/filtered_tenants.py index 79da5e83e4a..73736eace33 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/filtered_tenants.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/filtered_tenants.py @@ -308,10 +308,12 @@ def get_merged_svi_config(self: SharedUtils, svi: dict) -> list[dict]: } if (svi_profile_name := filtered_svi.get("profile")) is not None: - svi_profile = get_item(self.svi_profiles, "profile", svi_profile_name, default={}) + msg = f"Profile '{svi_profile_name}' applied under SVI '{filtered_svi['name']}' does not exist in `svi_profiles`." + svi_profile = get_item(self.svi_profiles, "profile", svi_profile_name, required=True, custom_error_msg=msg) if (svi_parent_profile_name := svi_profile.get("parent_profile")) is not None: - svi_parent_profile = get_item(self.svi_profiles, "profile", svi_parent_profile_name, default={}) + msg = f"Profile '{svi_parent_profile_name}' applied under SVI Profile '{svi_profile_name}' does not exist in `svi_profiles`." + svi_parent_profile = get_item(self.svi_profiles, "profile", svi_parent_profile_name, required=True, custom_error_msg=msg) # deepmerge all levels of config - later vars override previous. # Using destructive_merge=False to avoid having references to profiles and other data. diff --git a/python-avd/pyavd/_eos_designs/shared_utils/flow_tracking.py b/python-avd/pyavd/_eos_designs/shared_utils/flow_tracking.py index 08bc391a594..b6b962068b1 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/flow_tracking.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/flow_tracking.py @@ -69,6 +69,7 @@ def get_flow_tracker( "mlag_interfaces", "l3_interfaces", "dps_interfaces", + "direct_wan_ha_links", ], ) -> dict: """Return flow_tracking settings for a link, falling back to the fabric flow_tracking_settings if not defined.""" diff --git a/python-avd/pyavd/_eos_designs/shared_utils/l3_interfaces.py b/python-avd/pyavd/_eos_designs/shared_utils/l3_interfaces.py index 5dc9e9e4ad0..298db2b4c87 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/l3_interfaces.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/l3_interfaces.py @@ -37,7 +37,8 @@ def apply_l3_interfaces_profile(self: SharedUtils, l3_interface: dict) -> dict: # Nothing to do return l3_interface - profile = get_item(self.l3_interface_profiles, "profile", l3_interface["profile"], default={}) + msg = f"Profile '{l3_interface['profile']}' applied under l3_interface '{l3_interface['name']}' does not exist in `l3_interface_profiles`." + profile = get_item(self.l3_interface_profiles, "profile", l3_interface["profile"], required=True, custom_error_msg=msg) merged_dict: dict = merge(profile, l3_interface, list_merge="replace", destructive_merge=False) merged_dict.pop("profile", None) return merged_dict @@ -52,7 +53,7 @@ def l3_interfaces(self: SharedUtils) -> list: if not (l3_interfaces := get(self.switch_data_combined, "l3_interfaces")): return [] - # Apply l3_interfaces._profile if set. Silently ignoring missing profile. + # Apply l3_interfaces._profile if set. if self.l3_interface_profiles: l3_interfaces = [self.apply_l3_interfaces_profile(l3_interface) for l3_interface in l3_interfaces] diff --git a/python-avd/pyavd/_eos_designs/shared_utils/misc.py b/python-avd/pyavd/_eos_designs/shared_utils/misc.py index 2b7823068ac..74c80997699 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/misc.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/misc.py @@ -323,6 +323,10 @@ def fabric_ip_addressing_mlag_ipv6_prefix_length(self: SharedUtils) -> int: def fabric_ip_addressing_p2p_uplinks_ipv4_prefix_length(self: SharedUtils) -> int: return get(self.hostvars, "fabric_ip_addressing.p2p_uplinks.ipv4_prefix_length", default=31) + @cached_property + def fabric_ip_addressing_wan_ha_ipv4_prefix_length(self: SharedUtils) -> int: + return get(self.hostvars, "fabric_ip_addressing.wan_ha.ipv4_prefix_length", default=31) + @cached_property def fabric_sflow_uplinks(self: SharedUtils) -> bool | None: return get(self.hostvars, "fabric_sflow.uplinks") diff --git a/python-avd/pyavd/_eos_designs/shared_utils/utils.py b/python-avd/pyavd/_eos_designs/shared_utils/utils.py index dec1f54cf86..b611d54dc2a 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/utils.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/utils.py @@ -52,23 +52,30 @@ def template_var(self: SharedUtils, template_file: str, template_vars: dict) -> raise AristaAvdError(msg) from e @lru_cache # noqa: B019 - def get_merged_port_profile(self: SharedUtils, profile_name: str) -> list: + def get_merged_port_profile(self: SharedUtils, profile_name: str, context: str) -> list: """Return list of merged "port_profiles" where "parent_profile" has been applied.""" - port_profile = get_item(self.port_profiles, "profile", profile_name, default={}) + msg = f"Profile '{profile_name}' applied under '{context}' does not exist in `port_profiles`." + port_profile = get_item(self.port_profiles, "profile", profile_name, required=True, custom_error_msg=msg) if "parent_profile" in port_profile: - parent_profile = get_item(self.port_profiles, "profile", port_profile["parent_profile"], default={}) + msg = f"Profile '{port_profile['parent_profile']}' applied under port profile '{profile_name}' does not exist in `port_profiles`." + parent_profile = get_item(self.port_profiles, "profile", port_profile["parent_profile"], required=True, custom_error_msg=msg) # Notice reuse of the same variable with the merged content. port_profile = merge(parent_profile, port_profile, list_merge="replace", destructive_merge=False) port_profile.pop("parent_profile") return port_profile - def get_merged_adapter_settings(self: SharedUtils, adapter_or_network_port_settings: dict) -> dict: + def get_merged_adapter_settings(self: SharedUtils, adapter_or_network_port_settings: dict, context: str) -> dict: """ Applies port-profiles to the given adapter_or_network_port and returns the combined result. - adapter_or_network_port can either be an adapter of a connected endpoint or one item under network_ports. + Args: + adapter_or_network_port_settings: can either be an adapter of a connected endpoint or one item under network_ports. + context: a context string for error messages. """ - profile_name = adapter_or_network_port_settings.get("profile") - adapter_profile = self.get_merged_port_profile(profile_name) + if (profile_name := adapter_or_network_port_settings.get("profile")) is None: + # No profile to apply + return adapter_or_network_port_settings + + adapter_profile = self.get_merged_port_profile(profile_name, context) return merge(adapter_profile, adapter_or_network_port_settings, list_merge="replace", destructive_merge=False) diff --git a/python-avd/pyavd/_eos_designs/shared_utils/wan.py b/python-avd/pyavd/_eos_designs/shared_utils/wan.py index 14b53ca1fc6..6876a9d1a1b 100644 --- a/python-avd/pyavd/_eos_designs/shared_utils/wan.py +++ b/python-avd/pyavd/_eos_designs/shared_utils/wan.py @@ -4,10 +4,11 @@ from __future__ import annotations from functools import cached_property +from re import findall from typing import TYPE_CHECKING, Literal from pyavd._errors import AristaAvdError, AristaAvdMissingVariableError -from pyavd._utils import default, get, get_ip_from_ip_prefix, get_ip_from_pool, get_item, strip_empties_from_dict +from pyavd._utils import default, get, get_ip_from_ip_prefix, get_item, strip_empties_from_dict from pyavd.j2filters import natural_sort if TYPE_CHECKING: @@ -360,18 +361,13 @@ def filtered_wan_route_servers(self: SharedUtils) -> dict: f"'vtep_ip' is missing for peering with {wan_rs}, either set it in under 'wan_route_servers' or something is wrong with the peer" " facts." ) - raise AristaAvdMissingVariableError( - msg, - ) + raise AristaAvdMissingVariableError(msg) if wan_path_groups is None: msg = ( f"'wan_path_groups' is missing for peering with {wan_rs}, either set it in under 'wan_route_servers'" " or something is wrong with the peer facts." ) - raise AristaAvdMissingVariableError( - msg, - ) - + raise AristaAvdMissingVariableError(msg) else: # Retrieve the values from the dictionary, making them required if the peer_facts were not found vtep_ip = get(wan_rs_dict, "vtep_ip", required=True) @@ -515,16 +511,21 @@ def vrf_default_uplink_interfaces(self: SharedUtils) -> list: @cached_property def use_uplinks_for_wan_ha(self: SharedUtils) -> bool: - """Return true or false.""" + """ + Indicates whether the device is using its uplinks for WAN HA or direct HA. + + Returns: + bool: True if uplinks are used for HA, False otherwise + + Raises: + AristaAvdError: when the list of configured interfaces is a mix of uplinks and none uplinks. + """ interfaces = set(self.configured_wan_ha_interfaces) uplink_interfaces = set(self.vrf_default_uplink_interfaces) if interfaces.issubset(uplink_interfaces): return True if not interfaces.intersection(uplink_interfaces): - if len(interfaces) > 1: - msg = "AVD does not support multiple HA interfaces when not using uplinks." - raise AristaAvdError(msg) return False msg = "Either all `wan_ha.ha_interfaces` must be uplink interfaces or all of them must not be uplinks." raise AristaAvdError(msg) @@ -542,6 +543,32 @@ def wan_ha_interfaces(self: SharedUtils) -> list: # Using node values return natural_sort(set(self.configured_wan_ha_interfaces), "name") + @cached_property + def wan_ha_port_channel_id(self: SharedUtils) -> int: + """ + Port-channel ID to use for direct WAN HA port-channel. + + If not provided, computed from the list of configured members. + """ + return get(self.switch_data_combined, "wan_ha.port_channel_id", default=int("".join(findall(r"\d", self.wan_ha_interfaces[0])))) + + @cached_property + def use_port_channel_for_direct_ha(self: SharedUtils) -> bool: + """ + Indicate if port-channel should be used for direct HA. + + Returns: + bool: False is use_uplinks_for_wan_ha is True + True if strictly there is more than one configured wan_ha.interfaces + otherwise the value of `wan_ha.use_port_channel_for_direct_ha` which defaults to True. + """ + if self.use_uplinks_for_wan_ha: + return False + + interfaces = set(self.configured_wan_ha_interfaces) + + return len(interfaces) > 1 or get(self.switch_data_combined, "wan_ha.use_port_channel_for_direct_ha", True) + @cached_property def wan_ha_peer_ip_addresses(self: SharedUtils) -> list: """ @@ -549,11 +576,11 @@ def wan_ha_peer_ip_addresses(self: SharedUtils) -> list: Used also to generate the prefix list of the PEER HA prefixes. """ - interfaces = set(self.configured_wan_ha_interfaces) ip_addresses = [] if self.use_uplinks_for_wan_ha: peer_facts = self.get_peer_facts(self.wan_ha_peer, required=True) vrf_default_peer_uplinks = [uplink for uplink in get(peer_facts, "uplinks", required=True) if get(uplink, "vrf") is None] + interfaces = set(self.configured_wan_ha_interfaces) for uplink in vrf_default_peer_uplinks: if not interfaces or uplink["interface"] in interfaces: ip_address = get( @@ -568,7 +595,7 @@ def wan_ha_peer_ip_addresses(self: SharedUtils) -> list: ip_addresses.append(f"{ip_address}/{prefix_length}") else: # Only one supported HA interface today when not using uplinks - ip_addresses.append(self.get_wan_ha_ip_address(local=False)) + ip_addresses.append(self.ip_addressing.wan_ha_peer_ip()) return ip_addresses @cached_property @@ -578,10 +605,10 @@ def wan_ha_ip_addresses(self: SharedUtils) -> list: Used to generate the prefix list. """ - interfaces = set(self.configured_wan_ha_interfaces) ip_addresses = [] if self.use_uplinks_for_wan_ha: + interfaces = set(self.configured_wan_ha_interfaces) for uplink in self.vrf_default_uplinks: if not interfaces or uplink["interface"] in interfaces: ip_address = get( @@ -595,42 +622,31 @@ def wan_ha_ip_addresses(self: SharedUtils) -> list: ip_addresses.append(f"{ip_address}/{prefix_length}") else: # Only one supported HA interface today when not using uplinks - ip_addresses.append(self.get_wan_ha_ip_address(local=True)) + ip_addresses.append(self.ip_addressing.wan_ha_ip()) return ip_addresses - def get_wan_ha_ip_address(self: SharedUtils, local: bool) -> str | None: - """ - Render ipv4 address for wan_ha_ip_address using dynamically loaded python module. - - local: When true, request the first IP address else request the remote peer IP. - TODO: Move this to ip_addressing module to allow for custom logic. - """ - wan_ha_ipv4_pool = get( + @cached_property + def wan_ha_ipv4_pool(self: SharedUtils) -> str: + """Return the configured wan_ha.ha_ipv4_pool.""" + return get( self.switch_data_combined, "wan_ha.ha_ipv4_pool", required=True, org_key="Missing `wan_ha.ha_ipv4_pool` node settings to allocate an IP address to defined HA interface", ) - first_ip_address = get_ip_from_pool(wan_ha_ipv4_pool, 31, 0, 0) - second_ip_address = get_ip_from_pool(wan_ha_ipv4_pool, 31, 0, 1) - - if self.is_first_ha_peer: - local_ip, remote_ip = first_ip_address, second_ip_address - else: - local_ip, remote_ip = second_ip_address, first_ip_address - - ip_address = local_ip if local else remote_ip - - return f"{ip_address}/31" - def generate_lb_policy_name(self: SharedUtils, name: str) -> str: """Returns LB-{name}.""" return f"LB-{name}" @cached_property def wan_stun_dtls_profile_name(self: SharedUtils) -> str | None: + """Return the DTLS profile name to use for STUN for WAN.""" if not self.is_wan_router or get(self.hostvars, "wan_stun_dtls_disable") is True: return None return get(self.hostvars, "wan_stun_dtls_profile_name", default="STUN-DTLS") + + @cached_property + def wan_encapsulation(self: SharedUtils) -> str: + return get(self.hostvars, "wan_encapsulation", default="path-selection") diff --git a/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/ethernet_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/ethernet_interfaces.py index 8741659f15a..7f4486c8f09 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/ethernet_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/ethernet_interfaces.py @@ -42,7 +42,7 @@ def ethernet_interfaces(self: AvdStructuredConfigConnectedEndpoints) -> list | N non_overwritable_ethernet_interfaces = [] - for network_port in self._filtered_network_ports: + for index, network_port in enumerate(self._filtered_network_ports): connected_endpoint = { "name": network_port.get("endpoint"), "type": "network_port", @@ -56,16 +56,16 @@ def ethernet_interfaces(self: AvdStructuredConfigConnectedEndpoints) -> list | N }, network_port, ) - ethernet_interface = self._get_ethernet_interface_cfg(tmp_network_port, 0, connected_endpoint) + ethernet_interface = self._get_ethernet_interface_cfg(tmp_network_port, 0, connected_endpoint, index) replace_or_append_item(ethernet_interfaces, "name", ethernet_interface) - for connected_endpoint in self._filtered_connected_endpoints: + for index, connected_endpoint in enumerate(self._filtered_connected_endpoints): for adapter in connected_endpoint["adapters"]: for node_index, node_name in enumerate(adapter["switches"]): if node_name != self.shared_utils.hostname: continue - ethernet_interface = self._get_ethernet_interface_cfg(adapter, node_index, connected_endpoint) + ethernet_interface = self._get_ethernet_interface_cfg(adapter, node_index, connected_endpoint, index) append_if_not_duplicate( list_of_dicts=non_overwritable_ethernet_interfaces, primary_key="name", @@ -114,7 +114,7 @@ def _update_ethernet_interface_cfg(self: AvdStructuredConfigConnectedEndpoints, ) return strip_null_from_data(ethernet_interface, strip_values_tuple=(None, "", {})) - def _get_ethernet_interface_cfg(self: AvdStructuredConfigConnectedEndpoints, adapter: dict, node_index: int, connected_endpoint: dict) -> dict: + def _get_ethernet_interface_cfg(self: AvdStructuredConfigConnectedEndpoints, adapter: dict, node_index: int, connected_endpoint: dict, index: int) -> dict: """Return structured_config for one ethernet_interface.""" peer = connected_endpoint["name"] endpoint_ports: list = default( @@ -192,16 +192,9 @@ def _get_ethernet_interface_cfg(self: AvdStructuredConfigConnectedEndpoints, ada msg, ) - # Verify that the referred profile exists under port_profiles - if not (profile := self.shared_utils.get_merged_port_profile(profile_name)): - msg = ( - "The 'profile' of every port-channel lacp fallback individual setting must be defined in the 'port_profiles'. First occurrence seen" - f" of a missing profile is '{get(adapter, 'port_channel.lacp_fallback.individual.profile')}' for the connected endpoint with the" - f" name '{connected_endpoint['name']}'." - ) - raise AristaAvdMissingVariableError( - msg, - ) + profile = self.shared_utils.get_merged_port_profile( + profile_name, context=f"{connected_endpoint['type']}[{connected_endpoint['name']}].adapters[{index}].port_channel.lacp_fallback.individual" + ) ethernet_interface = self._update_ethernet_interface_cfg(profile, ethernet_interface, connected_endpoint) diff --git a/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py b/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py index 29124c9fe02..22654b41fb8 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py +++ b/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py @@ -38,7 +38,9 @@ def _filtered_connected_endpoints(self: AvdStructuredConfigConnectedEndpoints) - filtered_adapters = [] for adapter_index, adapter in enumerate(connected_endpoint["adapters"]): - adapter_settings = self.shared_utils.get_merged_adapter_settings(adapter) + adapter_settings = self.shared_utils.get_merged_adapter_settings( + adapter, context=f"{connected_endpoints_key['key']}[{connected_endpoint['name']}].adapters[{adapter_index}]" + ) if self.shared_utils.hostname not in adapter_settings.get("switches", []): continue @@ -71,8 +73,8 @@ def _filtered_connected_endpoints(self: AvdStructuredConfigConnectedEndpoints) - def _filtered_network_ports(self: AvdStructuredConfigConnectedEndpoints) -> list: """Return list of endpoints defined under "network_ports" which are connected to this switch.""" filtered_network_ports = [] - for network_port in get(self._hostvars, "network_ports", default=[]): - network_port_settings = self.shared_utils.get_merged_adapter_settings(network_port) + for index, network_port in enumerate(get(self._hostvars, "network_ports", default=[])): + network_port_settings = self.shared_utils.get_merged_adapter_settings(network_port, context=f"network_ports[{index}]") if not self._match_regexes(network_port_settings.get("switches"), self.shared_utils.hostname): continue diff --git a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/ethernet_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/ethernet_interfaces.py index 3f65c2c663d..cc6e3bb6fd4 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/ethernet_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/ethernet_interfaces.py @@ -6,7 +6,8 @@ from functools import cached_property from typing import TYPE_CHECKING -from pyavd._utils import append_if_not_duplicate +from pyavd._utils import append_if_not_duplicate, get +from pyavd.api.interface_descriptions import InterfaceDescriptionData from .utils import UtilsMixin @@ -30,6 +31,7 @@ def ethernet_interfaces(self: AvdStructuredConfigCoreInterfacesAndL3Edge) -> lis if p2p_link["data"]["port_channel_id"] is None: # Ethernet interface ethernet_interface = self._get_common_interface_cfg(p2p_link) + ethernet_interface["description"] = self._p2p_link_ethernet_description(p2p_link) ethernet_interface.update(self._get_ethernet_cfg(p2p_link)) # Remove None values @@ -46,6 +48,7 @@ def ethernet_interfaces(self: AvdStructuredConfigCoreInterfacesAndL3Edge) -> lis # Port-Channel members for member in p2p_link["data"]["port_channel_members"]: ethernet_interface = self._get_port_channel_member_cfg(p2p_link, member) + ethernet_interface["description"] = self._port_channel_member_description(p2p_link, member) ethernet_interface.update(self._get_ethernet_cfg(p2p_link)) # Remove None values @@ -63,3 +66,27 @@ def ethernet_interfaces(self: AvdStructuredConfigCoreInterfacesAndL3Edge) -> lis return ethernet_interfaces return None + + def _p2p_link_ethernet_description(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link: dict) -> str: + return self.shared_utils.interface_descriptions.underlay_ethernet_interface( + InterfaceDescriptionData( + shared_utils=self.shared_utils, + description=get(p2p_link, "data.description"), + interface=p2p_link["data"]["interface"], + link_type=self.data_model, + peer=p2p_link["data"]["peer"], + peer_interface=p2p_link["data"]["peer_interface"], + ), + ) + + def _port_channel_member_description(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link: dict, member: dict) -> str: + return self.shared_utils.interface_descriptions.underlay_ethernet_interface( + InterfaceDescriptionData( + shared_utils=self.shared_utils, + description=get(p2p_link, "data.description"), + interface=member["interface"], + link_type=self.data_model, + peer=p2p_link["data"]["peer"], + peer_interface=member["peer_interface"], + ), + ) diff --git a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/port_channel_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/port_channel_interfaces.py index eaee2094b74..b69ca8a2f7e 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/port_channel_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/port_channel_interfaces.py @@ -6,6 +6,9 @@ from functools import cached_property from typing import TYPE_CHECKING +from pyavd._utils import default, get +from pyavd.api.interface_descriptions import InterfaceDescriptionData + from .utils import UtilsMixin if TYPE_CHECKING: @@ -29,6 +32,7 @@ def port_channel_interfaces(self: AvdStructuredConfigCoreInterfacesAndL3Edge) -> # Port-Channel interface port_channel_interface = self._get_common_interface_cfg(p2p_link) + port_channel_interface["description"] = self._p2p_link_port_channel_description(p2p_link) # Remove None values port_channel_interface = {key: value for key, value in port_channel_interface.items() if value is not None} @@ -39,3 +43,17 @@ def port_channel_interfaces(self: AvdStructuredConfigCoreInterfacesAndL3Edge) -> return port_channel_interfaces return None + + def _p2p_link_port_channel_description(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link: dict) -> str: + return self.shared_utils.interface_descriptions.underlay_port_channel_interface( + InterfaceDescriptionData( + shared_utils=self.shared_utils, + port_channel_description=default(get(p2p_link, "data.port_channel_description"), get(p2p_link, "data.description")), + interface=p2p_link["data"]["interface"], + port_channel_id=p2p_link["data"]["port_channel_id"], + peer_channel_group_id=p2p_link["data"]["peer_port_channel_id"], + link_type=self.data_model, + peer=p2p_link["data"]["peer"], + peer_interface=p2p_link["data"]["peer_interface"], + ), + ) diff --git a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py index 08fbf08d6f7..e883d0f8cd1 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py +++ b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py @@ -173,6 +173,8 @@ def _get_p2p_data(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link: di "interface": f"Port-Channel{portchannel_id}", "peer_interface": f"Port-Channel{peer_id}", "port_channel_id": portchannel_id, + "peer_port_channel_id": peer_id, + "port_channel_description": get(p2p_link, "port_channel.description"), "port_channel_members": [ { "interface": interface, @@ -191,6 +193,8 @@ def _get_p2p_data(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link: di "interface": p2p_link["interfaces"][index], "peer_interface": p2p_link["interfaces"][peer_index], "port_channel_id": None, + "peer_port_channel_id": None, + "port_channel_description": None, "port_channel_members": [], }, ) @@ -207,15 +211,11 @@ def _get_common_interface_cfg(self: AvdStructuredConfigCoreInterfacesAndL3Edge, This config will only be used on the main interface - so not port-channel members. """ index = p2p_link["nodes"].index(self.shared_utils.hostname) - peer = p2p_link["data"]["peer"] - peer_interface = p2p_link["data"]["peer_interface"] - default_description = f"P2P_LINK_TO_{peer}_{peer_interface}" interface_cfg = { "name": p2p_link["data"]["interface"], - "peer": peer, - "peer_interface": peer_interface, + "peer": p2p_link["data"]["peer"], + "peer_interface": p2p_link["data"]["peer_interface"], "peer_type": p2p_link["data"]["peer_type"], - "description": get(p2p_link, "data.description", default=default_description), "switchport": {"enabled": False}, "shutdown": False, "mtu": p2p_link.get("mtu", self.shared_utils.p2p_uplinks_mtu) if self.shared_utils.platform_settings_feature_support_per_interface_mtu else None, @@ -311,15 +311,11 @@ def _get_port_channel_member_cfg(self: AvdStructuredConfigCoreInterfacesAndL3Edg Covers config for ethernet interfaces that are port-channel members. """ - peer = p2p_link["data"]["peer"] - peer_interface = member["peer_interface"] - default_description = f"P2P_LINK_TO_{peer}_{peer_interface}" return { "name": member["interface"], - "peer": peer, - "peer_interface": peer_interface, + "peer": p2p_link["data"]["peer"], + "peer_interface": member["peer_interface"], "peer_type": p2p_link["data"]["peer_type"], - "description": get(p2p_link, "data.description", default=default_description), "shutdown": False, "channel_group": { "id": p2p_link["data"]["port_channel_id"], diff --git a/python-avd/pyavd/_eos_designs/structured_config/mlag/__init__.py b/python-avd/pyavd/_eos_designs/structured_config/mlag/__init__.py index 720f9888458..cd2f0669e11 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/mlag/__init__.py +++ b/python-avd/pyavd/_eos_designs/structured_config/mlag/__init__.py @@ -6,7 +6,7 @@ from functools import cached_property from pyavd._eos_designs.avdfacts import AvdFacts -from pyavd._utils import default, get, strip_empties_from_dict +from pyavd._utils import AvdStringFormatter, default, get, strip_empties_from_dict from pyavd.api.interface_descriptions import InterfaceDescriptionData from pyavd.j2filters import list_compress @@ -42,7 +42,9 @@ def vlans(self) -> list: { "id": self.shared_utils.mlag_peer_l3_vlan, "tenant": "system", - "name": "LEAF_PEER_L3", + "name": AvdStringFormatter().format( + self.shared_utils.mlag_peer_l3_vlan_name, mlag_peer=self.shared_utils.mlag_peer, mlag_peer_l3_vlan=self.shared_utils.mlag_peer_l3_vlan + ), "trunk_groups": [self._trunk_groups_mlag_l3_name], }, ) @@ -51,7 +53,9 @@ def vlans(self) -> list: { "id": self.shared_utils.mlag_peer_vlan, "tenant": "system", - "name": "MLAG_PEER", + "name": AvdStringFormatter().format( + self.shared_utils.mlag_peer_vlan_name, mlag_peer=self.shared_utils.mlag_peer, mlag_peer_vlan=self.shared_utils.mlag_peer_vlan + ), "trunk_groups": [self._trunk_groups_mlag_name], }, ) @@ -69,7 +73,9 @@ def vlan_interfaces(self) -> list | None: main_vlan_interface_name = f"Vlan{self.shared_utils.mlag_peer_vlan}" main_vlan_interface = { "name": main_vlan_interface_name, - "description": "MLAG_PEER", + "description": self.shared_utils.interface_descriptions.mlag_peer_svi( + InterfaceDescriptionData(shared_utils=self.shared_utils, interface=main_vlan_interface_name) + ), "shutdown": False, "no_autostate": True, "struct_cfg": self.shared_utils.mlag_peer_vlan_structured_config, @@ -124,7 +130,9 @@ def vlan_interfaces(self) -> list | None: l3_vlan_interface_name = f"Vlan{self.shared_utils.mlag_peer_l3_vlan}" l3_vlan_interface = { "name": l3_vlan_interface_name, - "description": "MLAG_PEER_L3_PEERING", + "description": self.shared_utils.interface_descriptions.mlag_peer_l3_svi( + InterfaceDescriptionData(shared_utils=self.shared_utils, interface=l3_vlan_interface_name) + ), "shutdown": False, "mtu": self.shared_utils.p2p_uplinks_mtu, } @@ -294,17 +302,23 @@ def router_bgp(self) -> dict | None: peer_group_name = self.shared_utils.bgp_peer_groups["mlag_ipv4_underlay_peer"]["name"] router_bgp = self._router_bgp_mlag_peer_group() + vlan = default(self.shared_utils.mlag_peer_l3_vlan, self.shared_utils.mlag_peer_vlan) + interface_name = f"Vlan{vlan}" + # Underlay MLAG peering if self.shared_utils.underlay_rfc5549: - vlan = default(self.shared_utils.mlag_peer_l3_vlan, self.shared_utils.mlag_peer_vlan) - neighbor_interface_name = f"Vlan{vlan}" router_bgp["neighbor_interfaces"] = [ { - "name": neighbor_interface_name, + "name": interface_name, "peer_group": peer_group_name, "peer": self.shared_utils.mlag_peer, "remote_as": self.shared_utils.bgp_as, - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format( + self.shared_utils.mlag_bgp_peer_description, + mlag_peer=self.shared_utils.mlag_peer, + interface=interface_name, + peer_interface=interface_name, + ), }, ] @@ -315,7 +329,12 @@ def router_bgp(self) -> dict | None: "ip_address": neighbor_ip, "peer_group": peer_group_name, "peer": self.shared_utils.mlag_peer, - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format( + self.shared_utils.mlag_bgp_peer_description, + mlag_peer=self.shared_utils.mlag_peer, + interface=interface_name, + peer_interface=interface_name, + ), }, ] @@ -334,7 +353,7 @@ def _router_bgp_mlag_peer_group(self) -> dict: "type": "ipv4", "remote_as": self.shared_utils.bgp_as, "next_hop_self": True, - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format(self.shared_utils.mlag_bgp_peer_group_description, mlag_peer=self.shared_utils.mlag_peer), "password": self.shared_utils.bgp_peer_groups["mlag_ipv4_underlay_peer"]["password"], "bfd": self.shared_utils.bgp_peer_groups["ipv4_underlay_peers"]["bfd"], "maximum_routes": 12000, diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/prefix_lists.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/prefix_lists.py index a4bf84e500a..fdaabb2f6c2 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/prefix_lists.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/prefix_lists.py @@ -85,7 +85,7 @@ def _mlag_ibgp_peering_subnets_without_redistribution(self: AvdStructuredConfigN # By default the BGP peering is redistributed, so we only need the prefix-list for the false case. continue - if (mlag_ip_address := self._get_vlan_interface_config_for_mlag_peering(vrf).get("ip_address")) is None: + if (mlag_ip_address := self._get_vlan_ip_config_for_mlag_peering(vrf).get("ip_address")) is None: # No MLAG prefix for this VRF (could be RFC5549) continue diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py index 54c78e7987f..18101c777ee 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING from pyavd._errors import AristaAvdMissingVariableError -from pyavd._utils import append_if_not_duplicate, default, get, get_item, merge, strip_empties_from_dict +from pyavd._utils import AvdStringFormatter, append_if_not_duplicate, default, get, get_item, merge, strip_empties_from_dict from pyavd.j2filters import list_compress, natural_sort from .utils import UtilsMixin @@ -176,20 +176,26 @@ def _router_bgp_vrfs(self: AvdStructuredConfigNetworkServices) -> dict: if (bgp_vrf_redistribute_static := vrf.get("redistribute_static")) is True or ( vrf["static_routes"] and bgp_vrf_redistribute_static is not False ): - bgp_vrf.setdefault("redistribute_routes", []).append({"source_protocol": "static"}) + bgp_vrf["redistribute_routes"].append({"source_protocol": "static"}) - elif bgp_vrf: - # VRF default with RD/RT and eos_cli/struct_cfg which should go under the vrf default context. - # Any peers added later will be put directly under router_bgp - append_if_not_duplicate( - list_of_dicts=router_bgp["vrfs"], - primary_key="name", - new_dict={"name": vrf_name, **bgp_vrf}, - context="BGP VRFs defined under network services", - context_keys=["name"], - ) - # Resetting bgp_vrf so we only add global keys if there are any neighbors for VRF default - bgp_vrf = {} + else: + # VRF default + if bgp_vrf: + # RD/RT and/or eos_cli/struct_cfg which should go under the vrf default context. + # Any peers added later will be put directly under router_bgp + append_if_not_duplicate( + list_of_dicts=router_bgp["vrfs"], + primary_key="name", + new_dict={"name": vrf_name, **bgp_vrf}, + context="BGP VRFs defined under network services", + context_keys=["name"], + ) + # Resetting bgp_vrf so we only add global keys if there are any neighbors for VRF default + bgp_vrf = {} + + if self.shared_utils.underlay_routing_protocol == "none": + # We need to add redistribute connected for the default VRF when underlay_routing_protocol is "none" + bgp_vrf["redistribute_routes"] = [{"source_protocol": "connected"}] # MLAG IBGP Peering VLANs per VRF # Will only be configured for VRF default if underlay_routing_protocol == "none". @@ -273,9 +279,7 @@ def _router_bgp_vrfs(self: AvdStructuredConfigNetworkServices) -> dict: def _update_router_bgp_vrf_evpn_or_mpls_cfg(self: AvdStructuredConfigNetworkServices, bgp_vrf: dict, vrf: dict, vrf_address_families: list) -> None: """In-place update EVPN/MPLS part of structured config for *one* VRF under router_bgp.vrfs.""" vrf_name = vrf["name"] - bgp_vrf["rd"] = self.get_vrf_rd(vrf) - vrf_rt = self.get_vrf_rt(vrf) route_targets = {"import": [], "export": []} @@ -320,14 +324,19 @@ def _update_router_bgp_vrf_mlag_neighbor_cfg(self: AvdStructuredConfigNetworkSer if not self._mlag_ibgp_peering_redistribute(vrf, tenant): bgp_vrf["redistribute_routes"][0]["route_map"] = "RM-CONN-2-BGP-VRFS" + interface_name = f"Vlan{vlan_id}" if self.shared_utils.underlay_rfc5549 and self.shared_utils.overlay_mlag_rfc5549: - interface_name = f"Vlan{vlan_id}" bgp_vrf.setdefault("neighbor_interfaces", []).append( { "name": interface_name, "peer_group": self.shared_utils.bgp_peer_groups["mlag_ipv4_underlay_peer"]["name"], "remote_as": self.shared_utils.bgp_as, - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format( + self.shared_utils.mlag_bgp_peer_description, + mlag_peer=self.shared_utils.mlag_peer, + interface=interface_name, + peer_interface=interface_name, + ), }, ) else: @@ -342,7 +351,12 @@ def _update_router_bgp_vrf_mlag_neighbor_cfg(self: AvdStructuredConfigNetworkSer { "ip_address": ip_address, "peer_group": self.shared_utils.bgp_peer_groups["mlag_ipv4_underlay_peer"]["name"], - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format( + self.shared_utils.mlag_bgp_peer_description, + **strip_empties_from_dict( + {"mlag_peer": self.shared_utils.mlag_peer, "interface": interface_name, "peer_interface": interface_name, "vrf": vrf["name"]} + ), + ), }, ) if self.shared_utils.underlay_rfc5549: @@ -350,9 +364,7 @@ def _update_router_bgp_vrf_mlag_neighbor_cfg(self: AvdStructuredConfigNetworkSer { "ip_address": ip_address, "next_hop": { - "address_family_ipv6": { - "enabled": False, - }, + "address_family_ipv6": {"enabled": False}, }, }, ) @@ -441,7 +453,6 @@ def _router_bgp_vlans(self: AvdStructuredConfigNetworkServices, tenant_svis_l2vl context_keys=["id", "tenant"], ignore_keys={"tenant"}, ) - return vlans or None def _router_bgp_vlans_vlan(self: AvdStructuredConfigNetworkServices, vlan: dict, tenant: dict, vrf: dict) -> dict | None: @@ -484,11 +495,11 @@ def _router_bgp_vlans_vlan(self: AvdStructuredConfigNetworkServices, vlan: dict, return {key: value for key, value in bgp_vlan.items() if value is not None} @cached_property - def _evpn_vlan_bundles(self) -> list: + def _evpn_vlan_bundles(self: AvdStructuredConfigNetworkServices) -> list: return get(self._hostvars, "evpn_vlan_bundles", default=[]) @cached_property - def _evpn_vlan_aware_bundles(self) -> bool: + def _evpn_vlan_aware_bundles(self: AvdStructuredConfigNetworkServices) -> bool: return get(self._hostvars, "evpn_vlan_aware_bundles", default=False) def _get_vlan_aware_bundle_name_tuple_for_l2vlans(self: AvdStructuredConfigNetworkServices, vlan: dict) -> tuple[str, bool] | None: @@ -639,13 +650,7 @@ def _router_bgp_vlan_aware_bundles_vrf(self: AvdStructuredConfigNetworkServices, ) def _router_bgp_vlan_aware_bundle( - self: AvdStructuredConfigNetworkServices, - name: str, - vlans: list, - rd: str, - rt: str, - evpn_l2_multi_domain: bool, - tenant: dict, + self: AvdStructuredConfigNetworkServices, name: str, vlans: list, rd: str, rt: str, evpn_l2_multi_domain: bool, tenant: dict ) -> dict | None: """ Return structured config for one vlan-aware-bundle. @@ -964,7 +969,7 @@ def _router_bgp_mlag_peer_group(self: AvdStructuredConfigNetworkServices) -> dic "type": "ipv4", "remote_as": self.shared_utils.bgp_as, "next_hop_self": True, - "description": self.shared_utils.mlag_peer, + "description": AvdStringFormatter().format(self.shared_utils.mlag_bgp_peer_group_description, mlag_peer=self.shared_utils.mlag_peer), "password": self.shared_utils.bgp_peer_groups["mlag_ipv4_underlay_peer"]["password"], "maximum_routes": 12000, "send_community": "all", diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/vlan_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/vlan_interfaces.py index 483e8edf489..d8e044697f4 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/vlan_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/vlan_interfaces.py @@ -8,6 +8,7 @@ from pyavd._errors import AristaAvdMissingVariableError from pyavd._utils import append_if_not_duplicate, default, get, strip_empties_from_dict +from pyavd.api.interface_descriptions import InterfaceDescriptionData from .utils import UtilsMixin @@ -51,7 +52,7 @@ def vlan_interfaces(self: AvdStructuredConfigNetworkServices) -> list | None: if (vlan_id := self._mlag_ibgp_peering_vlan_vrf(vrf, tenant)) is None: continue - vlan_interface = {"name": f"Vlan{vlan_id}", **self._get_vlan_interface_config_for_mlag_peering(vrf)} + vlan_interface = {"name": f"Vlan{vlan_id}", **self._get_vlan_interface_config_for_mlag_peering(vrf, vlan_id)} append_if_not_duplicate( list_of_dicts=vlan_interfaces, primary_key="name", @@ -152,34 +153,44 @@ def _check_virtual_router_mac_address(vlan_interface_config: dict, variables: li return strip_empties_from_dict(vlan_interface_config) - def _get_vlan_interface_config_for_mlag_peering(self: AvdStructuredConfigNetworkServices, vrf: dict) -> dict: - """ - Build config for MLAG peering SVI for the given SVI. - - Called from vlan_interfaces and prefix_lists. - """ + def _get_vlan_interface_config_for_mlag_peering(self: AvdStructuredConfigNetworkServices, vrf: dict, vlan_id: int) -> dict: + """Build full config for MLAG peering SVI for the given VRF.""" vlan_interface_config = { "tenant": vrf["tenant"], "type": "underlay_peering", "shutdown": False, - "description": f"MLAG_PEER_L3_iBGP: vrf {vrf['name']}", + "description": self.shared_utils.interface_descriptions.mlag_peer_l3_vrf_svi( + InterfaceDescriptionData(shared_utils=self.shared_utils, interface=f"Vlan{vlan_id}", vrf=vrf["name"], vlan=vlan_id) + ), "vrf": vrf["name"], "mtu": self.shared_utils.p2p_uplinks_mtu, } + vlan_interface_config.update(self._get_vlan_ip_config_for_mlag_peering(vrf)) + return vlan_interface_config + + def _get_vlan_ip_config_for_mlag_peering(self: AvdStructuredConfigNetworkServices, vrf: dict) -> dict: + """ + Build IP config for MLAG peering SVI for the given VRF. + + Called from _get_vlan_interface_config_for_mlag_peering and prefix_lists. + """ if self.shared_utils.underlay_rfc5549 and self.shared_utils.overlay_mlag_rfc5549: - vlan_interface_config["ipv6_enable"] = True - elif (mlag_ibgp_peering_ipv4_pool := vrf.get("mlag_ibgp_peering_ipv4_pool")) is not None: + return {"ipv6_enable": True} + + if (mlag_ibgp_peering_ipv4_pool := vrf.get("mlag_ibgp_peering_ipv4_pool")) is not None: if self.shared_utils.mlag_role == "primary": - vlan_interface_config["ip_address"] = ( - f"{self.shared_utils.ip_addressing.mlag_ibgp_peering_ip_primary(mlag_ibgp_peering_ipv4_pool)}/" - f"{self.shared_utils.fabric_ip_addressing_mlag_ipv4_prefix_length}" - ) - else: - vlan_interface_config["ip_address"] = ( + return { + "ip_address": ( + f"{self.shared_utils.ip_addressing.mlag_ibgp_peering_ip_primary(mlag_ibgp_peering_ipv4_pool)}/" + f"{self.shared_utils.fabric_ip_addressing_mlag_ipv4_prefix_length}" + ) + } + + return { + "ip_address": ( f"{self.shared_utils.ip_addressing.mlag_ibgp_peering_ip_secondary(mlag_ibgp_peering_ipv4_pool)}/" f"{self.shared_utils.fabric_ip_addressing_mlag_ipv4_prefix_length}" ) - else: - vlan_interface_config["ip_address"] = f"{self.shared_utils.mlag_ibgp_ip}/{self.shared_utils.fabric_ip_addressing_mlag_ipv4_prefix_length}" + } - return vlan_interface_config + return {"ip_address": f"{self.shared_utils.mlag_ibgp_ip}/{self.shared_utils.fabric_ip_addressing_mlag_ipv4_prefix_length}"} diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/vlans.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/vlans.py index 1e74c6623d7..bf5eca7445d 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/network_services/vlans.py +++ b/python-avd/pyavd/_eos_designs/structured_config/network_services/vlans.py @@ -6,7 +6,7 @@ from functools import cached_property from typing import TYPE_CHECKING -from pyavd._utils import append_if_not_duplicate +from pyavd._utils import AvdStringFormatter, append_if_not_duplicate from pyavd.j2filters import natural_sort from .utils import UtilsMixin @@ -56,7 +56,9 @@ def vlans(self: AvdStructuredConfigNetworkServices) -> list | None: vlan = { "id": vlan_id, - "name": f"MLAG_iBGP_{vrf['name']}", + "name": AvdStringFormatter().format( + self.shared_utils.mlag_peer_l3_vrf_vlan_name, mlag_peer=self.shared_utils.mlag_peer, vlan=vlan_id, vrf=vrf["name"] + ), "trunk_groups": [self._trunk_groups_mlag_l3_name], "tenant": tenant["name"], } diff --git a/python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py b/python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py index e503dbab65b..e9df868c208 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py +++ b/python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING from pyavd._errors import AristaAvdError -from pyavd._utils import default, get, get_item, strip_empties_from_dict +from pyavd._utils import AvdStringFormatter, default, get, strip_empties_from_dict from pyavd.j2filters import natural_sort from .utils import UtilsMixin @@ -64,7 +64,7 @@ def _bgp_listen_ranges(self: AvdStructuredConfigOverlay) -> list | None: return [ { "prefix": prefix, - "peer_group": self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"], + "peer_group": self._get_peer_group_name("wan_overlay_peers"), "remote_as": self.shared_utils.bgp_as, } for prefix in self.shared_utils.wan_listen_ranges @@ -182,49 +182,57 @@ def _address_family_ipv4(self: AvdStructuredConfigOverlay) -> dict: peer_groups = [] if self.shared_utils.is_wan_router: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("wan_overlay_peers"), "activate": False}) # TODO: no elif elif self.shared_utils.overlay_evpn_vxlan is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("evpn_overlay_peers"), "activate": False}) if self.shared_utils.overlay_routing_protocol == "ebgp" and ( self.shared_utils.evpn_gateway_vxlan_l2 is True or self.shared_utils.evpn_gateway_vxlan_l3 is True ): - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["evpn_overlay_core"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("evpn_overlay_core"), "activate": False}) if self.shared_utils.overlay_routing_protocol == "ibgp": if self.shared_utils.overlay_mpls is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("mpls_overlay_peers"), "activate": False}) if self._is_mpls_server is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["rr_overlay_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("rr_overlay_peers"), "activate": False}) if self._is_wan_server_with_peers: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("wan_rr_overlay_peers"), "activate": False}) if self.shared_utils.overlay_ipvpn_gateway is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["ipvpn_gateway_peers"]["name"], "activate": False}) + peer_groups.append({"name": self._get_peer_group_name("ipvpn_gateway_peers"), "activate": False}) return {"peer_groups": peer_groups} + def _get_peer_group_name(self: AvdStructuredConfigOverlay, key: str) -> str: + """Helper to retrieve the configured peer_group name for the given key.""" + return self.shared_utils.bgp_peer_groups[key]["name"] + def _address_family_evpn(self: AvdStructuredConfigOverlay) -> dict | None: address_family_evpn = {} peer_groups = [] + overlay_peer_group = {} if self.shared_utils.overlay_evpn_vxlan is True: if self.shared_utils.is_wan_router: - overlay_peer_group_name = self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"] + overlay_peer_group = { + "name": self._get_peer_group_name("wan_overlay_peers"), + "activate": True, + "encapsulation": self.shared_utils.wan_encapsulation, + } else: - overlay_peer_group_name = self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"] - peer_groups.append({"name": overlay_peer_group_name, "activate": True}) + overlay_peer_group = {"name": self._get_peer_group_name("evpn_overlay_peers"), "activate": True} if self.shared_utils.overlay_routing_protocol == "ebgp": if self.shared_utils.evpn_gateway_vxlan_l2 is True or self.shared_utils.evpn_gateway_vxlan_l3 is True: peer_groups.append( { - "name": self.shared_utils.bgp_peer_groups["evpn_overlay_core"]["name"], + "name": self._get_peer_group_name("evpn_overlay_core"), "domain_remote": True, "activate": True, }, @@ -239,24 +247,18 @@ def _address_family_evpn(self: AvdStructuredConfigOverlay) -> dict | None: } if self.shared_utils.overlay_routing_protocol == "ibgp": - # TODO: - assess this condition + # TODO: - assess this condition - both can't be true at the same time. if self.shared_utils.overlay_evpn_mpls is True and self.shared_utils.overlay_evpn_vxlan is not True: - overlay_peer_group_name = self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"] - peer_groups.append({"name": overlay_peer_group_name, "activate": True}) + overlay_peer_group = {"name": self._get_peer_group_name("mpls_overlay_peers"), "activate": True} address_family_evpn["neighbor_default"] = {"encapsulation": "mpls"} if self.shared_utils.overlay_ler is True: address_family_evpn["neighbor_default"]["next_hop_self_source_interface"] = "Loopback0" if self._is_mpls_server is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["rr_overlay_peers"]["name"], "activate": True}) - - # partly duplicate with ebgp - if ( - self.shared_utils.overlay_vtep is True - and self.shared_utils.evpn_role != "server" - and (peer_group := get_item(peer_groups, "name", overlay_peer_group_name)) is not None - ): - peer_group.update( + peer_groups.append({"name": self._get_peer_group_name("rr_overlay_peers"), "activate": True}) + + if self.shared_utils.overlay_vtep is True and self.shared_utils.evpn_role != "server" and overlay_peer_group: + overlay_peer_group.update( { "route_map_in": "RM-EVPN-SOO-IN", "route_map_out": "RM-EVPN-SOO-OUT", @@ -264,7 +266,16 @@ def _address_family_evpn(self: AvdStructuredConfigOverlay) -> dict | None: ) if self._is_wan_server_with_peers: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"], "activate": True}) + peer_groups.append( + { + "name": self._get_peer_group_name("wan_rr_overlay_peers"), + "activate": True, + "encapsulation": self.shared_utils.wan_encapsulation, + } + ) + + if overlay_peer_group: + peer_groups.append(overlay_peer_group) if peer_groups: address_family_evpn["peer_groups"] = peer_groups @@ -296,7 +307,13 @@ def _address_family_evpn(self: AvdStructuredConfigOverlay) -> dict | None: "enable": True, }, } - address_family_evpn["neighbors"] = [{"ip_address": self._wan_ha_peer_vtep_ip(), "activate": True}] + address_family_evpn["neighbors"] = [ + { + "ip_address": self._wan_ha_peer_vtep_ip(), + "activate": True, + "encapsulation": self.shared_utils.wan_encapsulation, + } + ] return address_family_evpn or None @@ -308,14 +325,14 @@ def _address_family_ipv4_sr_te(self: AvdStructuredConfigOverlay) -> dict | None: address_family_ipv4_sr_te = { "peer_groups": [ { - "name": self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"], + "name": self._get_peer_group_name("wan_overlay_peers"), "activate": True, }, ], } if self._is_wan_server_with_peers: - address_family_ipv4_sr_te["peer_groups"].append({"name": self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"], "activate": True}) + address_family_ipv4_sr_te["peer_groups"].append({"name": self._get_peer_group_name("wan_rr_overlay_peers"), "activate": True}) return address_family_ipv4_sr_te @@ -327,7 +344,7 @@ def _address_family_link_state(self: AvdStructuredConfigOverlay) -> dict | None: address_family_link_state = { "peer_groups": [ { - "name": self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"], + "name": self._get_peer_group_name("wan_overlay_peers"), "activate": True, }, ], @@ -346,7 +363,7 @@ def _address_family_link_state(self: AvdStructuredConfigOverlay) -> dict | None: address_family_link_state["path_selection"] = {"roles": {"producer": True}} if self._is_wan_server_with_peers: - address_family_link_state["peer_groups"].append({"name": self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"], "activate": True}) + address_family_link_state["peer_groups"].append({"name": self._get_peer_group_name("wan_rr_overlay_peers"), "activate": True}) return address_family_link_state @@ -357,7 +374,7 @@ def _address_family_path_selection(self: AvdStructuredConfigOverlay) -> dict | N address_family_path_selection = { "peer_groups": [ { - "name": self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"], + "name": self._get_peer_group_name("wan_overlay_peers"), "activate": True, }, ], @@ -365,7 +382,7 @@ def _address_family_path_selection(self: AvdStructuredConfigOverlay) -> dict | N } if self._is_wan_server_with_peers: - address_family_path_selection["peer_groups"].append({"name": self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"], "activate": True}) + address_family_path_selection["peer_groups"].append({"name": self._get_peer_group_name("wan_rr_overlay_peers"), "activate": True}) return address_family_path_selection @@ -381,13 +398,13 @@ def _address_family_rtc(self: AvdStructuredConfigOverlay) -> dict | None: address_family_rtc = {} peer_groups = [] - evpn_overlay_peers = {"name": self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"]} + evpn_overlay_peers = {"name": self._get_peer_group_name("evpn_overlay_peers")} if self.shared_utils.overlay_evpn_vxlan is True: evpn_overlay_peers["activate"] = True if self.shared_utils.overlay_routing_protocol == "ebgp": if self.shared_utils.evpn_gateway_vxlan_l2 is True or self.shared_utils.evpn_gateway_vxlan_l3 is True: - core_peer_group = {"name": self.shared_utils.bgp_peer_groups["evpn_overlay_core"]["name"], "activate": True} + core_peer_group = {"name": self._get_peer_group_name("evpn_overlay_core"), "activate": True} # TODO: (@Claus) told me to remove this if self.shared_utils.evpn_role == "server": core_peer_group["default_route_target"] = {"only": True} @@ -400,7 +417,7 @@ def _address_family_rtc(self: AvdStructuredConfigOverlay) -> dict | None: if self.shared_utils.overlay_routing_protocol == "ibgp": if self.shared_utils.overlay_mpls is True: - mpls_peer_group = {"name": self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"], "activate": True} + mpls_peer_group = {"name": self._get_peer_group_name("mpls_overlay_peers"), "activate": True} if self.shared_utils.evpn_role == "server" or self.shared_utils.mpls_overlay_role == "server": mpls_peer_group["default_route_target"] = {"only": True} peer_groups.append(mpls_peer_group) @@ -429,14 +446,14 @@ def _address_family_vpn_ipvx(self: AvdStructuredConfigOverlay, version: int) -> peer_groups = [] if self.shared_utils.overlay_ipvpn_gateway is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["ipvpn_gateway_peers"]["name"], "activate": True}) + peer_groups.append({"name": self._get_peer_group_name("ipvpn_gateway_peers"), "activate": True}) if self.shared_utils.overlay_routing_protocol == "ibgp": if self.shared_utils.overlay_mpls is True: - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"], "activate": True}) + peer_groups.append({"name": self._get_peer_group_name("mpls_overlay_peers"), "activate": True}) if self.shared_utils.mpls_overlay_role == "server": - peer_groups.append({"name": self.shared_utils.bgp_peer_groups["rr_overlay_peers"]["name"], "activate": True}) + peer_groups.append({"name": self._get_peer_group_name("rr_overlay_peers"), "activate": True}) if peer_groups: address_family_vpn_ipvx["peer_groups"] = peer_groups @@ -446,14 +463,27 @@ def _address_family_vpn_ipvx(self: AvdStructuredConfigOverlay, version: int) -> return address_family_vpn_ipvx - def _create_neighbor(self: AvdStructuredConfigOverlay, ip_address: str, name: str, peer_group: str, remote_as: str | None = None) -> dict: - neighbor = {"ip_address": ip_address, "peer_group": peer_group, "peer": name, "description": name} + def _create_neighbor( + self: AvdStructuredConfigOverlay, + ip_address: str, + name: str, + peer_group: str, + remote_as: str | None = None, + overlay_peering_interface: str | None = None, + ) -> dict: + neighbor = { + "ip_address": ip_address, + "peer_group": peer_group, + "peer": name, + "description": AvdStringFormatter().format( + self.shared_utils.overlay_bgp_peer_description, **strip_empties_from_dict({"peer": name, "peer_interface": overlay_peering_interface}) + ), + } if self.shared_utils.overlay_routing_protocol == "ebgp": if remote_as is None: msg = "Configuring eBGP neighbor without a remote_as" raise AristaAvdError(msg) - neighbor["remote_as"] = remote_as if self.shared_utils.shutdown_bgp_towards_undeployed_peers is True and name in self._avd_overlay_peers: @@ -471,8 +501,9 @@ def _neighbors(self: AvdStructuredConfigOverlay) -> list | None: neighbor = self._create_neighbor( data["ip_address"], route_server, - self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"], + self._get_peer_group_name("evpn_overlay_peers"), remote_as=data["bgp_as"], + overlay_peering_interface=data.get("overlay_peering_interface"), ) if self.shared_utils.evpn_prevent_readvertise_to_server is True: @@ -483,8 +514,9 @@ def _neighbors(self: AvdStructuredConfigOverlay) -> list | None: neighbor = self._create_neighbor( data["ip_address"], route_client, - self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"], + self._get_peer_group_name("evpn_overlay_peers"), remote_as=data["bgp_as"], + overlay_peering_interface=data.get("overlay_peering_interface"), ) neighbors.append(neighbor) @@ -492,48 +524,81 @@ def _neighbors(self: AvdStructuredConfigOverlay) -> list | None: neighbor = self._create_neighbor( data["ip_address"], gw_remote_peer, - self.shared_utils.bgp_peer_groups["evpn_overlay_core"]["name"], + self._get_peer_group_name("evpn_overlay_core"), remote_as=data["bgp_as"], + overlay_peering_interface=data.get("overlay_peering_interface"), ) neighbors.append(neighbor) if self.shared_utils.overlay_routing_protocol == "ibgp": if self.shared_utils.overlay_mpls is True: for route_reflector, data in natural_sort(self._mpls_route_reflectors.items()): - neighbor = self._create_neighbor(data["ip_address"], route_reflector, self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + route_reflector, + self._get_peer_group_name("mpls_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) for route_client, data in natural_sort(self._mpls_route_clients.items()): - neighbor = self._create_neighbor(data["ip_address"], route_client, self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + route_client, + self._get_peer_group_name("mpls_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) for mesh_pe, data in natural_sort(self._mpls_mesh_pe.items()): - neighbor = self._create_neighbor(data["ip_address"], mesh_pe, self.shared_utils.bgp_peer_groups["mpls_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + mesh_pe, + self._get_peer_group_name("mpls_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) if self._is_mpls_server is True: for rr_peer, data in natural_sort(self._mpls_rr_peers.items()): - neighbor = self._create_neighbor(data["ip_address"], rr_peer, self.shared_utils.bgp_peer_groups["rr_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + rr_peer, + self._get_peer_group_name("rr_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) if self.shared_utils.overlay_evpn_vxlan is True: for route_server, data in natural_sort(self._evpn_route_servers.items()): - neighbor = self._create_neighbor(data["ip_address"], route_server, self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + route_server, + self._get_peer_group_name("evpn_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) for route_client, data in natural_sort(self._evpn_route_clients.items()): - neighbor = self._create_neighbor(data["ip_address"], route_client, self.shared_utils.bgp_peer_groups["evpn_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["ip_address"], + route_client, + self._get_peer_group_name("evpn_overlay_peers"), + overlay_peering_interface=data.get("overlay_peering_interface"), + ) neighbors.append(neighbor) if self.shared_utils.is_wan_client: if not self._ip_in_listen_ranges(self.shared_utils.vtep_ip, self.shared_utils.wan_listen_ranges): - msg = ( - f"{self.shared_utils.vtep_loopback} IP {self.shared_utils.vtep_ip} is not in the Route Reflector listen range prefixes" - " 'bgp_peer_groups.wan_overlay_peers.listen_range_prefixes'." - ) + msg = f"{self.shared_utils.vtep_loopback} IP {self.shared_utils.vtep_ip} is not in the Route Reflector listen range prefixes" raise AristaAvdError(msg) for wan_route_server, data in self.shared_utils.filtered_wan_route_servers.items(): - neighbor = self._create_neighbor(data["vtep_ip"], wan_route_server, self.shared_utils.bgp_peer_groups["wan_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["vtep_ip"], + wan_route_server, + self._get_peer_group_name("wan_overlay_peers"), + overlay_peering_interface=self.shared_utils.vtep_loopback, + ) neighbors.append(neighbor) if self.shared_utils.wan_ha: @@ -553,15 +618,21 @@ def _neighbors(self: AvdStructuredConfigOverlay) -> list | None: if self.shared_utils.is_wan_server: # No neighbor configured on the `wan_overlay_peers` peer group as it is covered by listen ranges for wan_route_server, data in self.shared_utils.filtered_wan_route_servers.items(): - neighbor = self._create_neighbor(data["vtep_ip"], wan_route_server, self.shared_utils.bgp_peer_groups["wan_rr_overlay_peers"]["name"]) + neighbor = self._create_neighbor( + data["vtep_ip"], + wan_route_server, + self._get_peer_group_name("wan_rr_overlay_peers"), + overlay_peering_interface=self.shared_utils.vtep_loopback, + ) neighbors.append(neighbor) for ipvpn_gw_peer, data in natural_sort(self._ipvpn_gateway_remote_peers.items()): neighbor = self._create_neighbor( data["ip_address"], ipvpn_gw_peer, - self.shared_utils.bgp_peer_groups["ipvpn_gateway_peers"]["name"], + self._get_peer_group_name("ipvpn_gateway_peers"), remote_as=data["bgp_as"], + overlay_peering_interface=data.get("overlay_peering_interface"), ) # Add ebgp_multihop if the gw peer is an ebgp peer. if data["bgp_as"] != default(self._ipvpn_gateway_local_as, self.shared_utils.bgp_as): diff --git a/python-avd/pyavd/_eos_designs/structured_config/overlay/router_path_selection.py b/python-avd/pyavd/_eos_designs/structured_config/overlay/router_path_selection.py index 285169fa170..acfd3497703 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/overlay/router_path_selection.py +++ b/python-avd/pyavd/_eos_designs/structured_config/overlay/router_path_selection.py @@ -115,11 +115,16 @@ def _generate_ha_path_group(self: AvdStructuredConfigOverlay) -> dict: if self.shared_utils.is_cv_pathfinder_server: return ha_path_group + if self.shared_utils.use_port_channel_for_direct_ha is True: + local_interfaces = [{"name": f"Port-Channel{self.shared_utils.wan_ha_port_channel_id}"}] + else: + local_interfaces = [{"name": interface} for interface in self.shared_utils.wan_ha_interfaces] + # not a pathfinder device ha_path_group.update( { # This should be the LAN interface over which a DPS tunnel is built - "local_interfaces": [{"name": interface} for interface in self.shared_utils.wan_ha_interfaces], + "local_interfaces": local_interfaces, "static_peers": [ { "router_ip": self._wan_ha_peer_vtep_ip(), diff --git a/python-avd/pyavd/_eos_designs/structured_config/overlay/utils.py b/python-avd/pyavd/_eos_designs/structured_config/overlay/utils.py index e6a7d4ea551..3a815bf76ee 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/overlay/utils.py +++ b/python-avd/pyavd/_eos_designs/structured_config/overlay/utils.py @@ -6,7 +6,8 @@ from functools import cached_property from typing import TYPE_CHECKING -from pyavd._utils import get +from pyavd._errors import AristaAvdError +from pyavd._utils import get, strip_empties_from_dict from pyavd.j2filters import natural_sort if TYPE_CHECKING: @@ -40,24 +41,30 @@ def _evpn_gateway_remote_peers(self: AvdStructuredConfigOverlay) -> dict: evpn_gateway_remote_peers_list = get(self.shared_utils.switch_data_combined, "evpn_gateway.remote_peers", default=[]) for gw_remote_peer_dict in natural_sort(evpn_gateway_remote_peers_list, sort_key="hostname"): - # These remote gw can be outside of the inventory + # These remote gateways can be outside of the inventory or in the inventory gw_remote_peer = gw_remote_peer_dict["hostname"] - peer_facts = self.shared_utils.get_peer_facts(gw_remote_peer, required=False) - if peer_facts is not None: - # Found a matching server in inventory - self._append_peer(evpn_gateway_remote_peers, gw_remote_peer, peer_facts) + gw_info = strip_empties_from_dict( + { + "bgp_as": str(_as) if (_as := gw_remote_peer_dict.get("bgp_as")) else None, + "ip_address": gw_remote_peer_dict.get("ip_address"), + # Not adding the "overlay_peering_interface" since we do not know it for this device. Only used for description. + } + ) + peer_facts = self.shared_utils.get_peer_facts(gw_remote_peer, required=False) + if peer_facts is None: + # No matching host found in the inventory for this remote gateway + evpn_gateway_remote_peers[gw_remote_peer] = gw_info else: - # Server not found in inventory, adding manually - # TODO: - what if the values are None - this is not handled by the template today - bgp_as = str(_as) if (_as := gw_remote_peer_dict.get("bgp_as")) else None - ip_address = gw_remote_peer_dict.get("ip_address") - - evpn_gateway_remote_peers[gw_remote_peer] = { - "bgp_as": bgp_as, - "ip_address": ip_address, - } + # Found a matching name for this remote gateway in the inventory + self._append_peer(evpn_gateway_remote_peers, gw_remote_peer, peer_facts) + # Apply potential override if present in the input variables + evpn_gateway_remote_peers[gw_remote_peer].update(strip_empties_from_dict(gw_info)) + + if any(key not in evpn_gateway_remote_peers[gw_remote_peer] for key in ["bgp_as", "ip_address"]): + msg = f"The EVPN Gateway remote peer '{gw_remote_peer}' is missing either a `bpg_as` or an `ip_address`." + raise AristaAvdError(msg) return evpn_gateway_remote_peers @@ -139,6 +146,7 @@ def _ipvpn_gateway_remote_peers(self: AvdStructuredConfigOverlay) -> dict: ipvpn_gateway_remote_peers[ipvpn_gw_peer_dict["hostname"]] = { "bgp_as": str(bgp_as) if bgp_as is not None else None, "ip_address": ipvpn_gw_peer_dict["ip_address"], + # Not adding the "overlay_peering_interface" since we do not know it for this device. Only used for description. } return ipvpn_gateway_remote_peers @@ -242,6 +250,7 @@ def _append_peer(self: AvdStructuredConfigOverlay, peers_dict: dict, peer_name: peer_name: { "bgp_as": bgp_as, "ip_address": overlay.peering_address, + "overlay_peering_interface": "Loopback0" } }. """ @@ -254,6 +263,7 @@ def _append_peer(self: AvdStructuredConfigOverlay, peers_dict: dict, peer_name: required=True, org_key=f"switch.overlay.peering_address for {peer_name}", ), + "overlay_peering_interface": "Loopback0", } @cached_property diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/ethernet_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/ethernet_interfaces.py index 5033eebe800..896941c93d7 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/ethernet_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/ethernet_interfaces.py @@ -285,35 +285,75 @@ def ethernet_interfaces(self: AvdStructuredConfigUnderlay) -> list | None: context_keys=["name", "peer", "peer_interface"], ) - # WAN HA interfaces for direct connection - if self.shared_utils.use_uplinks_for_wan_ha is False: - direct_wan_ha_links_flow_tracker = get( - self.shared_utils.switch_data_combined, - "wan_ha.flow_tracker", - default=self.shared_utils.get_flow_tracker(None, "direct_wan_ha_links"), + # WAN HA interface(s) for direct connection + for wan_ha_interface in self._get_direct_ha_ethernet_interfaces(): + append_if_not_duplicate( + list_of_dicts=ethernet_interfaces, + primary_key="name", + new_dict=wan_ha_interface, + context=f"L3 Interfaces defined under {self.shared_utils.node_type_key_data['key']} wan_ha.ha_interfaces", + context_keys=["name", "peer", "peer_interface"], ) - for index, interface in enumerate(get(self.shared_utils.switch_data_combined, "wan_ha.ha_interfaces", required=True)): - ha_interface = { - "name": interface, - "switchport": {"enabled": False}, - "peer_type": "l3_interface", - "peer": self.shared_utils.wan_ha_peer, - "shutdown": False, - "description": "DIRECT LAN HA LINK", - "ip_address": self.shared_utils.wan_ha_ip_addresses[index], - "flow_tracker": direct_wan_ha_links_flow_tracker, - "mtu": self.shared_utils.configured_wan_ha_mtu, - } - - append_if_not_duplicate( - list_of_dicts=ethernet_interfaces, - primary_key="name", - new_dict=ha_interface, - context=f"L3 Interfaces defined under {self.shared_utils.node_type_key_data['key']} wan_ha_interfaces", - context_keys=["name", "peer", "peer_interface"], - ) if ethernet_interfaces: return ethernet_interfaces return None + + def _get_direct_ha_ethernet_interfaces(self: AvdStructuredConfigUnderlay) -> list: + """ + Return a list of ethernet interfaces to be configured for WAN direct HA. + + Caters for the scenarii where either a port-channel is used or a single l3_interface. + """ + if self.shared_utils.use_uplinks_for_wan_ha: + return [] + + direct_wan_ha_interfaces = [] + + direct_wan_ha_links_flow_tracker = self.shared_utils.get_flow_tracker(get(self.shared_utils.switch_data_combined, "wan_ha"), "direct_wan_ha_links") + + for index, interface in enumerate(get(self.shared_utils.switch_data_combined, "wan_ha.ha_interfaces", required=True)): + description = self.shared_utils.interface_descriptions.wan_ha_ethernet_interface( + InterfaceDescriptionData( + shared_utils=self.shared_utils, + interface=interface, + peer=self.shared_utils.wan_ha_peer, + peer_interface=interface, + ), + ) + if self.shared_utils.use_port_channel_for_direct_ha: + direct_wan_ha_interfaces.append( + { + "name": interface, + "peer_type": "wan_ha_peer", + "peer_interface": interface, + "peer": self.shared_utils.wan_ha_peer, + "description": description, + "shutdown": False, + "channel_group": { + "id": self.shared_utils.wan_ha_port_channel_id, + "mode": "active", + }, + # TODO: do we need speed? + # TODO: do we need mtu + "mtu": self.shared_utils.configured_wan_ha_mtu, + } + ) + else: + # Using direct l3 interface + direct_wan_ha_interfaces.append( + { + "name": interface, + "switchport": {"enabled": False}, + "peer_type": "l3_interface", + "peer": self.shared_utils.wan_ha_peer, + "shutdown": False, + "description": description, + "ip_address": self.shared_utils.wan_ha_ip_addresses[index], + "flow_tracker": direct_wan_ha_links_flow_tracker, + "mtu": self.shared_utils.configured_wan_ha_mtu, + } + ) + + return direct_wan_ha_interfaces diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/port_channel_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/port_channel_interfaces.py index dde07b26126..57a82cce310 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/port_channel_interfaces.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/port_channel_interfaces.py @@ -6,7 +6,7 @@ from functools import cached_property from typing import TYPE_CHECKING -from pyavd._utils import get, short_esi_to_route_target, strip_null_from_data +from pyavd._utils import append_if_not_duplicate, get, short_esi_to_route_target, strip_null_from_data from pyavd.api.interface_descriptions import InterfaceDescriptionData from .utils import UtilsMixin @@ -47,7 +47,7 @@ def port_channel_interfaces(self: AvdStructuredConfigUnderlay) -> list | None: peer=link["peer"], peer_channel_group_id=link["peer_channel_group_id"], port_channel_id=link["channel_group_id"], - port_channel_description=link.get("channel_description"), + peer_mlag_group=link.get("peer_mlag_group"), ), ), "switchport": { @@ -107,7 +107,48 @@ def port_channel_interfaces(self: AvdStructuredConfigUnderlay) -> list | None: port_channel_interfaces.append(port_channel_interface) + # WAN HA interface for direct connection + if (port_channel_interface := self._get_direct_ha_port_channel_interface()) is not None: + append_if_not_duplicate( + list_of_dicts=port_channel_interfaces, + primary_key="name", + new_dict=port_channel_interface, + context="Port-Channel interface for WAN direct HA.", + context_keys=["name", "peer", "peer_interface"], + ) + if port_channel_interfaces: return port_channel_interfaces return None + + def _get_direct_ha_port_channel_interface(self: AvdStructuredConfigUnderlay) -> dict | None: + """Return a dict containing the port-channel interface for direct HA.""" + if not self.shared_utils.use_port_channel_for_direct_ha: + return None + + direct_wan_ha_links_flow_tracker = self.shared_utils.get_flow_tracker(get(self.shared_utils.switch_data_combined, "wan_ha"), "direct_wan_ha_links") + + port_channel_name = f"Port-Channel{self.shared_utils.wan_ha_port_channel_id}" + description = self.shared_utils.interface_descriptions.wan_ha_port_channel_interface( + InterfaceDescriptionData( + shared_utils=self.shared_utils, + interface=port_channel_name, + peer=self.shared_utils.wan_ha_peer, + peer_interface=port_channel_name, + ), + ) + + return { + "name": port_channel_name, + "switchport": {"enabled": False}, + "peer_type": "l3_interface", + # TODO: if different interfaces used across nodes it will fail just like for mlag. + "peer_interface": port_channel_name, + "peer": self.shared_utils.wan_ha_peer, + "shutdown": False, + "description": description, + "ip_address": self.shared_utils.wan_ha_ip_addresses[0], + "flow_tracker": direct_wan_ha_links_flow_tracker, + "mtu": self.shared_utils.configured_wan_ha_mtu, + } diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/utils.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/utils.py index c44d5f839c8..bc953ae17ce 100644 --- a/python-avd/pyavd/_eos_designs/structured_config/underlay/utils.py +++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/utils.py @@ -75,7 +75,7 @@ def _underlay_links(self: AvdStructuredConfigUnderlay) -> list: "prefix_length": get(uplink, "prefix_length"), "channel_group_id": get(uplink, "peer_channel_group_id"), "peer_channel_group_id": get(uplink, "channel_group_id"), - "channel_description": get(uplink, "peer_channel_description"), + "peer_mlag_group": get(uplink, "mlag_group"), "vlans": get(uplink, "vlans"), "native_vlan": get(uplink, "native_vlan"), "trunk_groups": get(uplink, "peer_trunk_groups"), diff --git a/python-avd/pyavd/api/interface_descriptions/__init__.py b/python-avd/pyavd/api/interface_descriptions/__init__.py index bf0f851ed72..51ae0a4d046 100644 --- a/python-avd/pyavd/api/interface_descriptions/__init__.py +++ b/python-avd/pyavd/api/interface_descriptions/__init__.py @@ -46,6 +46,7 @@ def underlay_ethernet_interface(self, data: InterfaceDescriptionData) -> str: Available data: - link_type + - description - peer - peer_interface - mpls_overlay_role @@ -66,18 +67,29 @@ def underlay_ethernet_interface(self, data: InterfaceDescriptionData) -> str: }, ) - # TODO: should we keep this upper - or use it consistently everywhere - link_peer = str(data.peer or "").upper() - - if data.link_type == "underlay_p2p": - desc = f"P2P_LINK_TO_{link_peer}_{data.peer_interface}" + if data.description is not None: + description = data.description + elif data.link_type in ("underlay_p2p", "l3_edge", "core_interfaces"): + description = self.shared_utils.default_underlay_p2p_ethernet_description elif data.link_type == "underlay_l2": - desc = f"{link_peer}_{data.peer_interface}" + link_peer = str(data.peer or "").upper() + description = f"{link_peer}_{data.peer_interface}" + return f"{description}_vrf_{data.vrf}" if data.vrf is not None else description else: elems = [data.wan_carrier, data.wan_circuit_id, data.peer, data.peer_interface] - desc = "_".join([elem for elem in elems if elem]) + description = "_".join([elem for elem in elems if elem]) + return f"{description}_vrf_{data.vrf}" if data.vrf is not None else description - return f"{desc}_vrf_{data.vrf}" if data.vrf is not None else desc + return AvdStringFormatter().format( + description, + **strip_null_from_data( + { + "peer": data.peer, + "peer_interface": data.peer_interface, + "vrf": data.vrf, + } + ), + ) def underlay_port_channel_interface(self, data: InterfaceDescriptionData) -> str: """ @@ -87,7 +99,9 @@ def underlay_port_channel_interface(self, data: InterfaceDescriptionData) -> str Available data: - peer + - peer_interface - peer_channel_group_id + - peer_mlag_group - port_channel_id - port_channel_description - mpls_overlay_role @@ -107,11 +121,28 @@ def underlay_port_channel_interface(self, data: InterfaceDescriptionData) -> str ) if data.port_channel_description is not None: - data.port_channel_description = str(data.port_channel_description).upper() - return f"{data.port_channel_description}_Po{data.peer_channel_group_id}" + description = data.port_channel_description + elif data.link_type in ("l3_edge", "core_interfaces"): + description = self.shared_utils.default_underlay_p2p_port_channel_description + else: + # This is for L2 port-channels + data.peer = str(data.peer).upper() + description = "{peer_mlag_group_or_peer}_Po{peer_port_channel_id}" - data.peer = str(data.peer).upper() - return f"{data.peer}_Po{data.peer_channel_group_id}" + return AvdStringFormatter().format( + description, + **strip_null_from_data( + { + "peer": data.peer, + "interface": data.interface, + "peer_interface": data.peer_interface, + "port_channel_id": data.port_channel_id, + "peer_port_channel_id": data.peer_channel_group_id, + "peer_mlag_group": data.peer_mlag_group, + "peer_mlag_group_or_peer": data.peer_mlag_group or data.peer, + } + ), + ) def mlag_ethernet_interface(self, data: InterfaceDescriptionData) -> str: """ @@ -190,6 +221,80 @@ def mlag_port_channel_interface(self, data: InterfaceDescriptionData) -> str: ), ) + def mlag_peer_svi(self, data: InterfaceDescriptionData) -> str: + """ + Build an MLAG Peering SVI description. + + Available data: + - interface + - mlag_peer + - mlag_peer_vlan + - mpls_overlay_role + - mpls_lsr + - overlay_routing_protocol + - type. + """ + return AvdStringFormatter().format( + self.shared_utils.mlag_peer_svi_description, + **strip_null_from_data( + { + "mlag_peer": data.mlag_peer, + "interface": data.interface, + "mlag_peer_vlan": data.mlag_peer_vlan, + } + ), + ) + + def mlag_peer_l3_svi(self, data: InterfaceDescriptionData) -> str: + """ + Build an MLAG Peering SVI description. + + Available data: + - interface + - mlag_peer + - mlag_peer_l3_vlan + - mpls_overlay_role + - mpls_lsr + - overlay_routing_protocol + - type. + """ + return AvdStringFormatter().format( + self.shared_utils.mlag_peer_l3_svi_description, + **strip_null_from_data( + { + "mlag_peer": data.mlag_peer, + "interface": data.interface, + "mlag_peer_l3_vlan": data.mlag_peer_l3_vlan, + } + ), + ) + + def mlag_peer_l3_vrf_svi(self, data: InterfaceDescriptionData) -> str: + """ + Build an MLAG Peering SVI description. + + Available data: + - interface + - vlan + - vrf + - mlag_peer + - mpls_overlay_role + - mpls_lsr + - overlay_routing_protocol + - type. + """ + return AvdStringFormatter().format( + self.shared_utils.mlag_peer_l3_vrf_svi_description, + **strip_null_from_data( + { + "mlag_peer": data.mlag_peer, + "interface": data.interface, + "vlan": data.vlan, + "vrf": data.vrf, + } + ), + ) + def connected_endpoints_ethernet_interface(self, data: InterfaceDescriptionData) -> str: """ Build a connected endpoint Ethernet interface description. @@ -336,6 +441,36 @@ def vtep_loopback_interface(self, data: InterfaceDescriptionData) -> str: return data.description + def wan_ha_ethernet_interface(self, data: InterfaceDescriptionData) -> str: + """ + Build WAN HA ethernet interface description. + + Available data: + - interface + - peer + - peer_interface + - mpls_overlay_role + - mpls_lsr + - overlay_routing_protocol + - type + """ + return f"WAN_HA_{data.peer}_{data.peer_interface}" + + def wan_ha_port_channel_interface(self, data: InterfaceDescriptionData) -> str: + """ + Build WAN HA port-channel interface description. + + Available data: + - interface + - peer + - peer_interface + - mpls_overlay_role + - mpls_lsr + - overlay_routing_protocol + - type + """ + return f"WAN_HA_{data.peer}_{data.peer_interface}" + class InterfaceDescriptionData: """ @@ -363,12 +498,16 @@ class InterfaceDescriptionData: """Interface of peer""" peer_channel_group_id: int | None """Port channel ID of peer""" + peer_mlag_group: str | None + """MLAG group of peer""" peer_type: str | None """Type of peer""" port_channel_id: int | None """Port channel ID""" port_channel_description: str | None """Set description for port-channel""" + vlan: int | None + """VLAN ID""" vrf: str | None """Interface VRF""" wan_carrier: str | None @@ -385,9 +524,11 @@ def __init__( peer: str | None = None, peer_interface: str | None = None, peer_channel_group_id: int | None = None, + peer_mlag_group: str | None = None, peer_type: str | None = None, port_channel_id: int | None = None, port_channel_description: str | None = None, + vlan: int | None = None, vrf: str | None = None, wan_carrier: str | None = None, wan_circuit_id: str | None = None, @@ -399,9 +540,11 @@ def __init__( self.peer = peer self.peer_interface = peer_interface self.peer_channel_group_id = peer_channel_group_id + self.peer_mlag_group = peer_mlag_group self.peer_type = peer_type self.port_channel_id = port_channel_id self.port_channel_description = port_channel_description + self.vlan = vlan self.vrf = vrf self.wan_carrier = wan_carrier self.wan_circuit_id = wan_circuit_id @@ -430,6 +573,14 @@ def mlag_port_channel_id(self) -> int: def mlag_peer_port_channel_id(self) -> int: return self._shared_utils.mlag_peer_port_channel_id + @property + def mlag_peer_vlan(self) -> int: + return self._shared_utils.mlag_peer_vlan + + @property + def mlag_peer_l3_vlan(self) -> int | None: + return self._shared_utils.mlag_peer_l3_vlan + @property def mpls_lsr(self) -> bool: return self._shared_utils.mpls_lsr diff --git a/python-avd/pyavd/api/ip_addressing/__init__.py b/python-avd/pyavd/api/ip_addressing/__init__.py index fd08dc88254..352bb60e778 100644 --- a/python-avd/pyavd/api/ip_addressing/__init__.py +++ b/python-avd/pyavd/api/ip_addressing/__init__.py @@ -331,3 +331,27 @@ def evpn_underlay_l2_multicast_group( """Return IP address to be used for EVPN underlay L2 multicast group.""" offset = vlan_id - 1 + underlay_l2_multicast_group_ipv4_pool_offset return get_ip_from_pool(underlay_l2_multicast_group_ipv4_pool, 32, offset, 0) + + def wan_ha_ip(self) -> str: + """Return the WAN HA local IP address.""" + wan_ha_ipv4_pool = self.shared_utils.wan_ha_ipv4_pool + prefixlen = self.shared_utils.fabric_ip_addressing_wan_ha_ipv4_prefix_length + + if self.shared_utils.is_first_ha_peer: + ip_address = get_ip_from_pool(wan_ha_ipv4_pool, prefixlen, 0, 0) + else: + ip_address = get_ip_from_pool(wan_ha_ipv4_pool, prefixlen, 0, 1) + + return f"{ip_address}/{prefixlen}" + + def wan_ha_peer_ip(self) -> str: + """Return the WAN HA peer IP.""" + wan_ha_ipv4_pool = self.shared_utils.wan_ha_ipv4_pool + prefixlen = self.shared_utils.fabric_ip_addressing_wan_ha_ipv4_prefix_length + + if self.shared_utils.is_first_ha_peer: + ip_address = get_ip_from_pool(wan_ha_ipv4_pool, prefixlen, 0, 1) + else: + ip_address = get_ip_from_pool(wan_ha_ipv4_pool, prefixlen, 0, 0) + + return f"{ip_address}/{prefixlen}" diff --git a/python-avd/tests/pyavd/eos_designs/test_validate_structured_config.py b/python-avd/tests/pyavd/eos_designs/test_validate_structured_config.py index f8930080e40..790e8ab9925 100644 --- a/python-avd/tests/pyavd/eos_designs/test_validate_structured_config.py +++ b/python-avd/tests/pyavd/eos_designs/test_validate_structured_config.py @@ -33,7 +33,7 @@ def test_validate_structured_config_with_invalid_data(hostname: str, structured_ # No dict found, so we insert our own instead if not updated: - structured_config.update({"bgp_peer_groups": {"invalid_key": "some_value"}}) + structured_config.update({"router_bgp": {"invalid_key": "some_value"}}) validation_result = validate_structured_config(structured_config) assert validation_result.failed is True