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 4b1f2fb255b..788205b265a 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
@@ -297,6 +297,15 @@ The description can be reverted manually if needed:
+router_id_loopback_description: "EVPN_Overlay_Peering"
```
+The interface description for `Loopback1` (or the interface set with `vtep_loopback`) changes to `VXLAN_TUNNEL_SOURCE`.
+Previously the description was `VTEP_VXLAN_Tunnel_Source`.
+
+The description can be reverted manually if needed:
+
+```diff
++vtep_loopback_description: "VTEP_VXLAN_Tunnel_Source"
+```
+
### custom_structured_configuration_prefix no longer accepts a string
Starting AVD 5.0.0, `custom_structured_configuration_prefix` only accepts a list of strings.
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 0bd9eaffd75..6434764b34d 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
@@ -359,7 +359,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.3/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.3/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.3/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.3/32 |
@@ -368,7 +368,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -382,7 +382,7 @@ interface Loopback0
ip address 10.255.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 2a95dc56fc0..b885afa24b5 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
@@ -359,7 +359,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.4/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.3/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.4/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.4/32 |
@@ -368,7 +368,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -382,7 +382,7 @@ interface Loopback0
ip address 10.255.0.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 2fca24e2096..8fa4627ada6 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
@@ -367,7 +367,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.5/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.5/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.5/32 |
@@ -376,7 +376,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -390,7 +390,7 @@ interface Loopback0
ip address 10.255.0.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 1b357cad06f..06ce312a3e4 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
@@ -367,7 +367,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.6/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.5/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.6/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.6/32 |
@@ -376,7 +376,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -390,7 +390,7 @@ interface Loopback0
ip address 10.255.0.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 cf3614eded5..057bc44ff7e 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
@@ -359,7 +359,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.128.13/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.13/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.129.13/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.13/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.13/32 |
@@ -368,7 +368,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -382,7 +382,7 @@ interface Loopback0
ip address 10.255.128.13/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.13/32
!
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 ce224c7f072..9cc61c7c384 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
@@ -359,7 +359,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.128.14/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.13/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.129.13/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.14/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.14/32 |
@@ -368,7 +368,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -382,7 +382,7 @@ interface Loopback0
ip address 10.255.128.14/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.13/32
!
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 ea9ba2faeed..8e527b79cb4 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
@@ -367,7 +367,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.128.15/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.15/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.129.15/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.15/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.15/32 |
@@ -376,7 +376,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -390,7 +390,7 @@ interface Loopback0
ip address 10.255.128.15/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.15/32
!
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 ebf791c60cc..03b85d2a403 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
@@ -367,7 +367,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.128.16/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.15/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.129.15/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.16/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.16/32 |
@@ -376,7 +376,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -390,7 +390,7 @@ interface Loopback0
ip address 10.255.128.16/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.15/32
!
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 c55c73deacd..dbfbd815bcd 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
@@ -123,7 +123,7 @@ interface Loopback0
ip address 10.255.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 8a73a6d8e86..9f0306adb56 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
@@ -123,7 +123,7 @@ interface Loopback0
ip address 10.255.0.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 298bcb0c624..511dddf2bcf 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
@@ -130,7 +130,7 @@ interface Loopback0
ip address 10.255.0.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 7c4892045d7..2b230bcf8e1 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
@@ -130,7 +130,7 @@ interface Loopback0
ip address 10.255.0.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 23fdd131b23..1f9d526e50d 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
@@ -123,7 +123,7 @@ interface Loopback0
ip address 10.255.128.13/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.13/32
!
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 279e8a39e8e..ddebe74b088 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
@@ -123,7 +123,7 @@ interface Loopback0
ip address 10.255.128.14/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.13/32
!
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 3f093c3863a..5dffef90b03 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
@@ -130,7 +130,7 @@ interface Loopback0
ip address 10.255.128.15/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.15/32
!
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 895a2f452bd..0f210615cd6 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
@@ -130,7 +130,7 @@ interface Loopback0
ip address 10.255.128.16/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.129.15/32
!
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 2f85f0ae0a5..f99039e2f2f 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
@@ -413,7 +413,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 542140f018b..c53367b6935 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
@@ -413,7 +413,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 5d3bf5f8130..f398b67adc4 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
@@ -484,7 +484,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 4206695bf4f..46153187d31 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
@@ -484,7 +484,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 2f1d662983e..490a389e8f0 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
@@ -413,7 +413,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.13/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.13/32
- name: Loopback10
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 074a04d8725..b5c9fe0b585 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
@@ -413,7 +413,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.14/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.13/32
- name: Loopback10
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 981cd35f611..1e80a60debf 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
@@ -484,7 +484,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.15/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.15/32
- name: Loopback10
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 41e8e0de850..12ff8136f4e 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
@@ -484,7 +484,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.16/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.15/32
- name: Loopback10
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 ac5d01adf13..69acaf85de5 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
@@ -420,7 +420,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.3/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.3/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.3/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.3/32 |
@@ -429,7 +429,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -443,7 +443,7 @@ interface Loopback0
ip address 10.255.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 f78c9c4a21b..d8820e34335 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
@@ -420,7 +420,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.4/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.3/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.4/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.4/32 |
@@ -429,7 +429,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -443,7 +443,7 @@ interface Loopback0
ip address 10.255.0.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 34db740f57a..a2273810374 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
@@ -420,7 +420,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.5/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.5/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.5/32 |
@@ -429,7 +429,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -443,7 +443,7 @@ interface Loopback0
ip address 10.255.0.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 03fb5dfffb5..83096167a54 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
@@ -420,7 +420,7 @@ interface Port-Channel8
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 10.255.0.6/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 10.255.1.5/32 |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.6/32 |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.6/32 |
@@ -429,7 +429,7 @@ interface Port-Channel8
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
| Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -443,7 +443,7 @@ interface Loopback0
ip address 10.255.0.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 c4ea8b81012..7a39e6e23a1 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
@@ -131,7 +131,7 @@ interface Loopback0
ip address 10.255.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 c869a4b4e98..c1061d63520 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
@@ -131,7 +131,7 @@ interface Loopback0
ip address 10.255.0.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.3/32
!
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 d4ae3e9deef..6a6aefda978 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
@@ -131,7 +131,7 @@ interface Loopback0
ip address 10.255.0.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 a012a18f411..db660028201 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
@@ -131,7 +131,7 @@ interface Loopback0
ip address 10.255.0.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.255.1.5/32
!
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 0a6edd9cc4e..6d5c2034309 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
@@ -434,7 +434,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 aed2776c0ab..5a871fa6252 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
@@ -434,7 +434,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 94bc0170bc7..9cf1e0ca77e 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
@@ -434,7 +434,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 0dade72da0d..739613e32ef 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
@@ -434,7 +434,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 c8a73258c76..087b8a90f26 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
@@ -396,14 +396,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.10/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -415,7 +415,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
```
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 dbbd96659f5..f8d8ac8669d 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
@@ -396,14 +396,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.11/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -415,7 +415,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
```
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 22c49e63fd4..84b2e238f38 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
@@ -324,14 +324,14 @@ interface Ethernet7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.5/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -343,7 +343,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
```
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 4bc8ea60126..97352c23729 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
@@ -480,7 +480,7 @@ interface Port-Channel10
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.6/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.6/32 |
##### IPv6
@@ -488,7 +488,7 @@ interface Port-Channel10
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -501,7 +501,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 44c5c7a1be2..890ecf1dbf5 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
@@ -480,7 +480,7 @@ interface Port-Channel10
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.7/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.7/32 |
##### IPv6
@@ -488,7 +488,7 @@ interface Port-Channel10
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -501,7 +501,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 a495794ed38..650d36d9a41 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
@@ -524,7 +524,7 @@ interface Port-Channel10
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.8/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.8/32 |
##### IPv6
@@ -532,7 +532,7 @@ interface Port-Channel10
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -545,7 +545,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 0838098a18e..dfcb3edfc20 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
@@ -498,7 +498,7 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.9/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.9/32 |
##### IPv6
@@ -506,7 +506,7 @@ interface Port-Channel7
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -519,7 +519,7 @@ interface Loopback0
ip address 192.168.255.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 73e0dbf4085..20fc4c71ae3 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
@@ -115,7 +115,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
!
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 7a5cb01e641..c68c432b04f 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
@@ -115,7 +115,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
!
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 3c8e9ccfb62..ebd701e954b 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
@@ -93,7 +93,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 85b45793d65..4e59c12eb88 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
@@ -188,7 +188,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 82c7a4e8b88..3b2a6726d0c 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
@@ -188,7 +188,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 88c52bebfa8..911598bc03f 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
@@ -223,7 +223,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 f34a41d17ae..746a59cee4c 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
@@ -207,7 +207,7 @@ interface Loopback0
ip address 192.168.255.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 edb17ce3522..9836adaef2f 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
@@ -449,7 +449,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
prefix_lists:
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 d4929c90132..b42f684a2db 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
@@ -449,7 +449,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.11/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
prefix_lists:
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 e0c94a4138a..cdc9941b029 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
@@ -265,7 +265,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
prefix_lists:
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 a8d09720b21..7b3cfe7cfbe 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
@@ -727,7 +727,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
- name: Loopback100
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 6eb68a262f8..6e7de5bb651 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
@@ -727,7 +727,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.7/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
- name: Loopback100
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 57bdf018926..26825f5024c 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
@@ -905,7 +905,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.8/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
- name: Loopback100
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 e6ceaade71b..30a351ee0aa 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
@@ -884,7 +884,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.9/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
- name: Loopback100
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 c65f2f79148..a7094a022b0 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
@@ -29,7 +29,7 @@ cvp_configlets:
MLAG_PEER_DC1-BL1B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface
Ethernet6\n description MLAG_PEER_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 VTEP_VXLAN_Tunnel_Source\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
@@ -144,7 +144,7 @@ cvp_configlets:
MLAG_PEER_DC1-BL1A_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface
Ethernet6\n description MLAG_PEER_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 VTEP_VXLAN_Tunnel_Source\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
@@ -348,32 +348,31 @@ cvp_configlets:
Ethernet7\n description 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 VTEP_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 no shutdown\n vrf Tenant_A_WEB_Zone\n
- \ ip helper-address 1.1.1.1 vrf TEST source-interface lo100\n ip address virtual
- 10.1.20.1/24\n!\ninterface Vlan121\n description Tenant_A_WEBZone_2\n shutdown\n
- \ mtu 1560\n vrf Tenant_A_WEB_Zone\n ip address virtual 10.1.10.254/24\n!\ninterface
- Vlan130\n description Tenant_A_APP_Zone_1\n no shutdown\n vrf Tenant_A_APP_Zone\n
- \ ip address virtual 10.1.30.1/24\n!\ninterface Vlan131\n description Tenant_A_APP_Zone_2\n
- \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.31.1/24\n!\ninterface
- Vxlan1\n description DC1-LEAF1A_VTEP\n vxlan source-interface Loopback1\n
- \ vxlan udp-port 4789\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 vrf Tenant_A_APP_Zone
- vni 12\n vxlan vrf Tenant_A_WEB_Zone vni 11\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_APP_Zone\nip
- routing vrf Tenant_A_WEB_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!\nip
- route vrf MGMT 0.0.0.0/0 192.168.200.5\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 65101\n router-id 192.168.255.5\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
+ 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
+ \ no shutdown\n vrf Tenant_A_WEB_Zone\n ip helper-address 1.1.1.1 vrf TEST
+ source-interface lo100\n ip address virtual 10.1.20.1/24\n!\ninterface Vlan121\n
+ \ description Tenant_A_WEBZone_2\n shutdown\n mtu 1560\n vrf Tenant_A_WEB_Zone\n
+ \ ip address virtual 10.1.10.254/24\n!\ninterface Vlan130\n description Tenant_A_APP_Zone_1\n
+ \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.30.1/24\n!\ninterface
+ Vlan131\n description Tenant_A_APP_Zone_2\n no shutdown\n vrf Tenant_A_APP_Zone\n
+ \ ip address virtual 10.1.31.1/24\n!\ninterface Vxlan1\n description DC1-LEAF1A_VTEP\n
+ \ vxlan source-interface Loopback1\n vxlan udp-port 4789\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 vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_WEB_Zone
+ vni 11\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_APP_Zone\nip routing vrf Tenant_A_WEB_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!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\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 65101\n
+ \ router-id 192.168.255.5\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 172.31.255.0 peer group IPv4-UNDERLAY-PEERS\n
@@ -451,7 +450,7 @@ cvp_configlets:
7 mode active\n!\ninterface Ethernet10\n description 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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface
+ \ 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
@@ -628,7 +627,7 @@ cvp_configlets:
7 mode active\n!\ninterface Ethernet10\n description 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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface
+ \ 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
@@ -1097,131 +1096,130 @@ cvp_configlets:
\ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description
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 VTEP_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 ip helper-address 1.1.1.1 vrf TEST source-interface
- lo100\n ip address virtual 10.1.20.1/24\n!\ninterface Vlan121\n description
- Tenant_A_WEBZone_2\n shutdown\n mtu 1560\n vrf Tenant_A_WEB_Zone\n ip
- address virtual 10.1.10.254/24\n!\ninterface Vlan130\n description Tenant_A_APP_Zone_1\n
- \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.30.1/24\n!\ninterface
- Vlan131\n description Tenant_A_APP_Zone_2\n no shutdown\n vrf Tenant_A_APP_Zone\n
- \ ip address virtual 10.1.31.1/24\n!\ninterface Vlan140\n description Tenant_A_DB_BZone_1\n
- \ no shutdown\n vrf Tenant_A_DB_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface
- Vlan141\n description Tenant_A_DB_Zone_2\n no shutdown\n vrf Tenant_A_DB_Zone\n
- \ ip address virtual 10.1.41.1/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
- Vlan210\n description Tenant_B_OP_Zone_1\n no shutdown\n vrf Tenant_B_OP_Zone\n
- \ ip address virtual 10.2.10.1/24\n!\ninterface Vlan211\n description Tenant_B_OP_Zone_2\n
- \ no shutdown\n vrf Tenant_B_OP_Zone\n ip address virtual 10.2.11.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 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 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 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 150 vni 10150\n vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n
- \ vxlan vlan 250 vni 20250\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni
- 30311\n vxlan vlan 350 vni 30350\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_WAN_Zone vni 14\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf
- Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_OP_Zone
- vni 30\n vxlan vrf Tenant_C_WAN_Zone vni 31\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.8\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_WAN_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip
- routing vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_OP_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_SVC3\n local-interface Vlan4094\n peer-address 10.255.252.7\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!\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 65103\n
- \ router-id 192.168.255.8\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
- MLAG-IPv4-UNDERLAY-PEER remote-as 65103\n neighbor MLAG-IPv4-UNDERLAY-PEER next-hop-self\n
- \ neighbor MLAG-IPv4-UNDERLAY-PEER description DC1-SVC3B\n neighbor MLAG-IPv4-UNDERLAY-PEER
- 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
- 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
- group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.28 remote-as 65001\n neighbor
- 172.31.255.28 description DC1-SPINE3_Ethernet4\n neighbor 172.31.255.30 peer
- 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
+ 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
+ \ ip helper-address 1.1.1.1 vrf TEST source-interface lo100\n ip address virtual
+ 10.1.20.1/24\n!\ninterface Vlan121\n description Tenant_A_WEBZone_2\n shutdown\n
+ \ mtu 1560\n vrf Tenant_A_WEB_Zone\n ip address virtual 10.1.10.254/24\n!\ninterface
+ Vlan130\n description Tenant_A_APP_Zone_1\n no shutdown\n vrf Tenant_A_APP_Zone\n
+ \ ip address virtual 10.1.30.1/24\n!\ninterface Vlan131\n description Tenant_A_APP_Zone_2\n
+ \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.31.1/24\n!\ninterface
+ Vlan140\n description Tenant_A_DB_BZone_1\n no shutdown\n vrf Tenant_A_DB_Zone\n
+ \ ip address virtual 10.1.40.1/24\n!\ninterface Vlan141\n description Tenant_A_DB_Zone_2\n
+ \ no shutdown\n vrf Tenant_A_DB_Zone\n ip address virtual 10.1.41.1/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 Vlan210\n description Tenant_B_OP_Zone_1\n
+ \ no shutdown\n vrf Tenant_B_OP_Zone\n ip address virtual 10.2.10.1/24\n!\ninterface
+ Vlan211\n description Tenant_B_OP_Zone_2\n no shutdown\n vrf Tenant_B_OP_Zone\n
+ \ ip address virtual 10.2.11.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
+ 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
+ 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
+ \ 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 150 vni 10150\n vxlan vlan
+ 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 250 vni 20250\n vxlan
+ vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan vlan 350 vni 30350\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_WAN_Zone vni 14\n
+ \ vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n
+ \ vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_OP_Zone vni 30\n
+ \ vxlan vrf Tenant_C_WAN_Zone vni 31\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.8\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_WAN_Zone\nip routing vrf
+ Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_B_WAN_Zone\nip
+ routing vrf Tenant_C_OP_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_SVC3\n
+ \ local-interface Vlan4094\n peer-address 10.255.252.7\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!\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 65103\n router-id 192.168.255.8\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 MLAG-IPv4-UNDERLAY-PEER remote-as 65103\n neighbor MLAG-IPv4-UNDERLAY-PEER
+ next-hop-self\n neighbor MLAG-IPv4-UNDERLAY-PEER description DC1-SVC3B\n neighbor
+ MLAG-IPv4-UNDERLAY-PEER 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 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 group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.28
+ remote-as 65001\n neighbor 172.31.255.28 description DC1-SPINE3_Ethernet4\n
+ \ neighbor 172.31.255.30 peer 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
@@ -1310,7 +1308,7 @@ cvp_configlets:
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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface
+ \ 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
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 c65f2f79148..a7094a022b0 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
@@ -29,7 +29,7 @@ cvp_configlets:
MLAG_PEER_DC1-BL1B_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface
Ethernet6\n description MLAG_PEER_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 VTEP_VXLAN_Tunnel_Source\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
@@ -144,7 +144,7 @@ cvp_configlets:
MLAG_PEER_DC1-BL1A_Ethernet5\n no shutdown\n channel-group 5 mode active\n!\ninterface
Ethernet6\n description MLAG_PEER_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 VTEP_VXLAN_Tunnel_Source\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
@@ -348,32 +348,31 @@ cvp_configlets:
Ethernet7\n description 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 VTEP_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 no shutdown\n vrf Tenant_A_WEB_Zone\n
- \ ip helper-address 1.1.1.1 vrf TEST source-interface lo100\n ip address virtual
- 10.1.20.1/24\n!\ninterface Vlan121\n description Tenant_A_WEBZone_2\n shutdown\n
- \ mtu 1560\n vrf Tenant_A_WEB_Zone\n ip address virtual 10.1.10.254/24\n!\ninterface
- Vlan130\n description Tenant_A_APP_Zone_1\n no shutdown\n vrf Tenant_A_APP_Zone\n
- \ ip address virtual 10.1.30.1/24\n!\ninterface Vlan131\n description Tenant_A_APP_Zone_2\n
- \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.31.1/24\n!\ninterface
- Vxlan1\n description DC1-LEAF1A_VTEP\n vxlan source-interface Loopback1\n
- \ vxlan udp-port 4789\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 vrf Tenant_A_APP_Zone
- vni 12\n vxlan vrf Tenant_A_WEB_Zone vni 11\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_APP_Zone\nip
- routing vrf Tenant_A_WEB_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!\nip
- route vrf MGMT 0.0.0.0/0 192.168.200.5\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 65101\n router-id 192.168.255.5\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
+ 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
+ \ no shutdown\n vrf Tenant_A_WEB_Zone\n ip helper-address 1.1.1.1 vrf TEST
+ source-interface lo100\n ip address virtual 10.1.20.1/24\n!\ninterface Vlan121\n
+ \ description Tenant_A_WEBZone_2\n shutdown\n mtu 1560\n vrf Tenant_A_WEB_Zone\n
+ \ ip address virtual 10.1.10.254/24\n!\ninterface Vlan130\n description Tenant_A_APP_Zone_1\n
+ \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.30.1/24\n!\ninterface
+ Vlan131\n description Tenant_A_APP_Zone_2\n no shutdown\n vrf Tenant_A_APP_Zone\n
+ \ ip address virtual 10.1.31.1/24\n!\ninterface Vxlan1\n description DC1-LEAF1A_VTEP\n
+ \ vxlan source-interface Loopback1\n vxlan udp-port 4789\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 vrf Tenant_A_APP_Zone vni 12\n vxlan vrf Tenant_A_WEB_Zone
+ vni 11\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_APP_Zone\nip routing vrf Tenant_A_WEB_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!\nip route vrf MGMT 0.0.0.0/0 192.168.200.5\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 65101\n
+ \ router-id 192.168.255.5\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 172.31.255.0 peer group IPv4-UNDERLAY-PEERS\n
@@ -451,7 +450,7 @@ cvp_configlets:
7 mode active\n!\ninterface Ethernet10\n description 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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface
+ \ 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
@@ -628,7 +627,7 @@ cvp_configlets:
7 mode active\n!\ninterface Ethernet10\n description 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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.6/32\n!\ninterface
+ \ 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
@@ -1097,131 +1096,130 @@ cvp_configlets:
\ no shutdown\n channel-group 7 mode active\n!\ninterface Ethernet10\n description
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 VTEP_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 ip helper-address 1.1.1.1 vrf TEST source-interface
- lo100\n ip address virtual 10.1.20.1/24\n!\ninterface Vlan121\n description
- Tenant_A_WEBZone_2\n shutdown\n mtu 1560\n vrf Tenant_A_WEB_Zone\n ip
- address virtual 10.1.10.254/24\n!\ninterface Vlan130\n description Tenant_A_APP_Zone_1\n
- \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.30.1/24\n!\ninterface
- Vlan131\n description Tenant_A_APP_Zone_2\n no shutdown\n vrf Tenant_A_APP_Zone\n
- \ ip address virtual 10.1.31.1/24\n!\ninterface Vlan140\n description Tenant_A_DB_BZone_1\n
- \ no shutdown\n vrf Tenant_A_DB_Zone\n ip address virtual 10.1.40.1/24\n!\ninterface
- Vlan141\n description Tenant_A_DB_Zone_2\n no shutdown\n vrf Tenant_A_DB_Zone\n
- \ ip address virtual 10.1.41.1/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
- Vlan210\n description Tenant_B_OP_Zone_1\n no shutdown\n vrf Tenant_B_OP_Zone\n
- \ ip address virtual 10.2.10.1/24\n!\ninterface Vlan211\n description Tenant_B_OP_Zone_2\n
- \ no shutdown\n vrf Tenant_B_OP_Zone\n ip address virtual 10.2.11.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 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 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 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 150 vni 10150\n vxlan vlan 210 vni 20210\n vxlan vlan 211 vni 20211\n
- \ vxlan vlan 250 vni 20250\n vxlan vlan 310 vni 30310\n vxlan vlan 311 vni
- 30311\n vxlan vlan 350 vni 30350\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_WAN_Zone vni 14\n vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf
- Tenant_B_OP_Zone vni 20\n vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_OP_Zone
- vni 30\n vxlan vrf Tenant_C_WAN_Zone vni 31\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.8\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_WAN_Zone\nip routing vrf Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip
- routing vrf Tenant_B_WAN_Zone\nip routing vrf Tenant_C_OP_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_SVC3\n local-interface Vlan4094\n peer-address 10.255.252.7\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!\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 65103\n
- \ router-id 192.168.255.8\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
- MLAG-IPv4-UNDERLAY-PEER remote-as 65103\n neighbor MLAG-IPv4-UNDERLAY-PEER next-hop-self\n
- \ neighbor MLAG-IPv4-UNDERLAY-PEER description DC1-SVC3B\n neighbor MLAG-IPv4-UNDERLAY-PEER
- 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
- 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
- group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.28 remote-as 65001\n neighbor
- 172.31.255.28 description DC1-SPINE3_Ethernet4\n neighbor 172.31.255.30 peer
- 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
+ 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
+ \ ip helper-address 1.1.1.1 vrf TEST source-interface lo100\n ip address virtual
+ 10.1.20.1/24\n!\ninterface Vlan121\n description Tenant_A_WEBZone_2\n shutdown\n
+ \ mtu 1560\n vrf Tenant_A_WEB_Zone\n ip address virtual 10.1.10.254/24\n!\ninterface
+ Vlan130\n description Tenant_A_APP_Zone_1\n no shutdown\n vrf Tenant_A_APP_Zone\n
+ \ ip address virtual 10.1.30.1/24\n!\ninterface Vlan131\n description Tenant_A_APP_Zone_2\n
+ \ no shutdown\n vrf Tenant_A_APP_Zone\n ip address virtual 10.1.31.1/24\n!\ninterface
+ Vlan140\n description Tenant_A_DB_BZone_1\n no shutdown\n vrf Tenant_A_DB_Zone\n
+ \ ip address virtual 10.1.40.1/24\n!\ninterface Vlan141\n description Tenant_A_DB_Zone_2\n
+ \ no shutdown\n vrf Tenant_A_DB_Zone\n ip address virtual 10.1.41.1/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 Vlan210\n description Tenant_B_OP_Zone_1\n
+ \ no shutdown\n vrf Tenant_B_OP_Zone\n ip address virtual 10.2.10.1/24\n!\ninterface
+ Vlan211\n description Tenant_B_OP_Zone_2\n no shutdown\n vrf Tenant_B_OP_Zone\n
+ \ ip address virtual 10.2.11.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
+ 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
+ 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
+ \ 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 150 vni 10150\n vxlan vlan
+ 210 vni 20210\n vxlan vlan 211 vni 20211\n vxlan vlan 250 vni 20250\n vxlan
+ vlan 310 vni 30310\n vxlan vlan 311 vni 30311\n vxlan vlan 350 vni 30350\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_WAN_Zone vni 14\n
+ \ vxlan vrf Tenant_A_WEB_Zone vni 11\n vxlan vrf Tenant_B_OP_Zone vni 20\n
+ \ vxlan vrf Tenant_B_WAN_Zone vni 21\n vxlan vrf Tenant_C_OP_Zone vni 30\n
+ \ vxlan vrf Tenant_C_WAN_Zone vni 31\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.8\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_WAN_Zone\nip routing vrf
+ Tenant_A_WEB_Zone\nip routing vrf Tenant_B_OP_Zone\nip routing vrf Tenant_B_WAN_Zone\nip
+ routing vrf Tenant_C_OP_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_SVC3\n
+ \ local-interface Vlan4094\n peer-address 10.255.252.7\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!\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 65103\n router-id 192.168.255.8\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 MLAG-IPv4-UNDERLAY-PEER remote-as 65103\n neighbor MLAG-IPv4-UNDERLAY-PEER
+ next-hop-self\n neighbor MLAG-IPv4-UNDERLAY-PEER description DC1-SVC3B\n neighbor
+ MLAG-IPv4-UNDERLAY-PEER 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 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 group IPv4-UNDERLAY-PEERS\n neighbor 172.31.255.28
+ remote-as 65001\n neighbor 172.31.255.28 description DC1-SPINE3_Ethernet4\n
+ \ neighbor 172.31.255.30 peer 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
@@ -1310,7 +1308,7 @@ cvp_configlets:
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 VTEP_VXLAN_Tunnel_Source\n no shutdown\n ip address 192.168.254.8/32\n!\ninterface
+ \ 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
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 cb83a6d8995..4fb7821cbbf 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
@@ -241,14 +241,14 @@ interface Port-Channel3
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.110.3/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.110.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.110.3/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -260,7 +260,7 @@ interface Loopback0
ip address 172.16.110.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.3/32
```
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 838bc66daa0..1bdb8cf53cd 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
@@ -502,7 +502,7 @@ interface Port-Channel19
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.110.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.110.4/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.110.4/32 |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | 10.100.0.5/32 |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | 10.101.101.5/32 |
| Loopback102 | vrf_with_loopbacks_dc1_pod1_only_VTEP_DIAGNOSTICS | vrf_with_loopbacks_dc1_pod1_only | 10.102.101.5/32 |
@@ -512,7 +512,7 @@ interface Port-Channel19
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | - |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | - |
| Loopback102 | vrf_with_loopbacks_dc1_pod1_only_VTEP_DIAGNOSTICS | vrf_with_loopbacks_dc1_pod1_only | - |
@@ -527,7 +527,7 @@ interface Loopback0
ip address 172.16.110.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.4/32
!
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 73f57d05790..28613100e10 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
@@ -293,7 +293,7 @@ interface Ethernet3
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.120.3/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.120.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.120.3/32 |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | 10.100.0.3/32 |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | 10.101.102.3/32 |
@@ -302,7 +302,7 @@ interface Ethernet3
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | - |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | - |
@@ -316,7 +316,7 @@ interface Loopback0
ip address 172.16.120.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.120.3/32
!
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 a5cb7143914..ad6c7c2497c 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
@@ -477,7 +477,7 @@ interface Port-Channel19
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.110.4/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.110.4/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.110.4/32 |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | 10.100.0.4/32 |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | 10.101.101.4/32 |
| Loopback102 | vrf_with_loopbacks_dc1_pod1_only_VTEP_DIAGNOSTICS | vrf_with_loopbacks_dc1_pod1_only | 10.102.101.4/32 |
@@ -487,7 +487,7 @@ interface Port-Channel19
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | - |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | - |
| Loopback102 | vrf_with_loopbacks_dc1_pod1_only_VTEP_DIAGNOSTICS | vrf_with_loopbacks_dc1_pod1_only | - |
@@ -502,7 +502,7 @@ interface Loopback0
ip address 172.16.110.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.4/32
!
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 912ab7a2cb0..9348a806d9a 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
@@ -297,7 +297,7 @@ interface Port-Channel3
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.210.3/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.210.3/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.210.3/32 |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | 10.100.0.3/32 |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | 10.101.201.3/32 |
@@ -306,7 +306,7 @@ interface Port-Channel3
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | vrf_with_loopbacks_from_overlapping_pool_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_overlapping_pool | - |
| Loopback101 | vrf_with_loopbacks_from_pod_pools_VTEP_DIAGNOSTICS | vrf_with_loopbacks_from_pod_pools | - |
@@ -320,7 +320,7 @@ interface Loopback0
ip address 172.16.210.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.210.3/32
!
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 f7273c4d1d2..4bd747c5212 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
@@ -265,14 +265,14 @@ interface Port-Channel3
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 172.16.210.4/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.210.4/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 172.18.210.4/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -284,7 +284,7 @@ interface Loopback0
ip address 172.16.210.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.210.4/32
```
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 1eb212f5cf6..79d0cf3fb6f 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
@@ -65,7 +65,7 @@ interface Loopback0
ip address 172.16.110.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.3/32
!
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 21235923252..07993c243ce 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
@@ -229,7 +229,7 @@ interface Loopback0
ip address 172.16.110.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.4/32
!
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 23519923dc1..f308d8cf774 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
@@ -88,7 +88,7 @@ interface Loopback0
ip address 172.16.120.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.120.3/32
!
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 5a1fcf904ae..f983df7c0fb 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
@@ -229,7 +229,7 @@ interface Loopback0
ip address 172.16.110.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.110.4/32
!
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 928ade29855..aea7b9300b0 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
@@ -79,7 +79,7 @@ interface Loopback0
ip address 172.16.210.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.210.3/32
!
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 95e228b5a0e..47678a05f6d 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
@@ -57,7 +57,7 @@ interface Loopback0
ip address 172.16.210.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 172.18.210.4/32
!
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 e3050643d42..dcc118eda35 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
@@ -196,7 +196,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.110.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.110.3/32
router_bfd:
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 2544df9410c..cc7ee2e182c 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
@@ -762,7 +762,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.110.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.110.4/32
- name: Loopback102
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 6f909c7c369..2990c7a6c6a 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
@@ -310,7 +310,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.120.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.120.3/32
- name: Loopback100
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 894d4ef46e2..e0cfc361c09 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
@@ -724,7 +724,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.110.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.110.4/32
- name: Loopback102
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 aafd426ccde..7f86d12550a 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
@@ -280,7 +280,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.210.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.210.3/32
- name: Loopback100
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 4281ef464d8..37aaf122139 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
@@ -151,7 +151,7 @@ loopback_interfaces:
shutdown: false
ip_address: 172.16.210.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 172.18.210.4/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg
index 321e1db30de..d2723d8f9d7 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg
@@ -18,7 +18,7 @@ interface Loopback0
ip address 192.168.255.101/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.101/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml
index 1d5488beeed..95df1ef3f08 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml
@@ -62,7 +62,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.101/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.101/32
prefix_lists:
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 5252f270ada..2996544b558 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1A.cfg
index c132555079b..0beb7055281 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1A.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1B.cfg
index ea49d39714e..fc409b7ce53 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF1B.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.4/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF2.cfg
index 7bac9f31a8a..c88ef1eb843 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF2.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 cbe8fce4384..2e7acc8117d 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.7/32
!
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 26ae6151cc1..9ee8ece4567 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.7/32
!
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 aa7ae571777..2010d38d122 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.9/32
!
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 c786dff083b..7f1550ca6e1 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.9/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF5A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF5A.cfg
index 9d2acb0ab77..cfa207e0f2e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF5A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF5A.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.11/32
!
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 bb34ea21979..1b6d8bd8f38 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.13/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.13/32
!
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 90fe07ff9ae..ccc8a3ecf66 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
@@ -48,7 +48,7 @@ interface Loopback0
ip address 192.168.255.14/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.13/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8A.cfg
index 8df1dfadf13..c5478f321c9 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8A.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.15/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.15/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8B.cfg
index 93b14e5751a..3faa8641e26 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_ASN_LEAF8B.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.16/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.16/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_UNGROUPED_LEAF6.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_UNGROUPED_LEAF6.cfg
index 0153bf359c8..9340325649d 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_UNGROUPED_LEAF6.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/AUTO_BGP_UNGROUPED_LEAF6.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.12/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 f6dae2bac13..e1215f36c62 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
@@ -35,7 +35,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 41f017fe8f8..0aa186cfe8f 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
@@ -35,7 +35,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.4/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg
index 46d15a3af8e..74222116013 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
@@ -183,7 +183,7 @@ interface Loopback0
ip address 192.168.255.14/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.14/32
ip address 192.168.255.255/32 secondary
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 b9243b0e325..09b053c1899 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
@@ -174,7 +174,7 @@ interface Loopback0
ip address 192.168.255.15/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.15/32
!
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 bd2d3196463..82246ad1dbf 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
@@ -95,7 +95,7 @@ interface Loopback0
ip address 192.168.255.16/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.16/32
!
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 264b8433a15..faaeb441838 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
@@ -93,7 +93,7 @@ interface Loopback0
ip address 192.168.255.17/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.17/32
!
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 e99353bd755..373507bdcae 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
@@ -162,7 +162,7 @@ interface Loopback0
ip address 192.168.255.18/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.18/32
!
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 5fb42b2757e..d10f255ca71 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
@@ -162,7 +162,7 @@ interface Loopback0
ip address 192.168.255.19/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.18/32
!
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 bca64bef915..57b0ce3605a 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
@@ -149,7 +149,7 @@ interface Loopback0
ip address 192.168.42.42/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.43.43/32
!
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 bd455503597..fa9a88dff31 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
@@ -413,7 +413,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
!
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 b4677e23221..8f318be55ed 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
@@ -377,7 +377,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.11/32
!
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 e7fcd868259..82adae82775 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
@@ -600,7 +600,7 @@ interface Loopback0
ip address 192.168.255.12/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 41e33251bf6..cbc31778bdc 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
@@ -566,7 +566,7 @@ interface Loopback0
ip address 192.168.255.13/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 060d7424bc5..562c006ee6c 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
@@ -225,7 +225,7 @@ interface Loopback0
ip address 192.168.255.21/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.21/32
!
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 faf6dd8cffa..2f4b492beb3 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
@@ -225,7 +225,7 @@ interface Loopback0
ip address 192.168.255.22/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.21/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF1.cfg
index e71937b9a2b..ee3e358720b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF1.cfg
@@ -27,7 +27,7 @@ interface Loopback0
ip address 10.0.0.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.10.0.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF2.cfg
index ea24d3e038b..2b52e308058 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DUP-LEAF2.cfg
@@ -27,7 +27,7 @@ interface Loopback0
ip address 10.0.0.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.10.0.2/32
!
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 4df150553df..a238c2161eb 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
@@ -182,7 +182,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 7b8e455e0f7..b3bf248ee0f 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
@@ -349,7 +349,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 14224c2a54f..901908b481d 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
@@ -349,7 +349,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 62a21231dee..1ab07778fb3 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
@@ -222,7 +222,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 4a9ea18a123..49e653f715e 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
@@ -244,7 +244,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 053132085b2..6af6c67f52a 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
@@ -244,7 +244,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.7/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/IGMP-QUERIER-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/IGMP-QUERIER-L3LEAF1A.cfg
index 00f7f5a10a9..5792fae9dde 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/IGMP-QUERIER-L3LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/IGMP-QUERIER-L3LEAF1A.cfg
@@ -135,7 +135,7 @@ interface Loopback0
ip address 192.168.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg
index 4286275ae77..c64439184db 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg
@@ -296,7 +296,7 @@ interface Loopback0
ip address 192.168.255.33/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.33/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg
index 2b5374199f3..363adf4a0b5 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg
@@ -296,7 +296,7 @@ interface Loopback0
ip address 192.168.255.34/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.34/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
index fae9734a513..ba0c5509877 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
@@ -81,7 +81,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1A.cfg
index edac3312162..9628c2b19eb 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1A.cfg
@@ -77,7 +77,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.36/32
ip ospf area 0.0.0.0
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1B.cfg
index a0fce353905..882ed63c1d3 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1B.cfg
@@ -77,7 +77,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.36/32
ip ospf area 0.0.0.0
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 6cce8951b14..0faa51b7064 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
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 997cac24673..2c450bed8de 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.255.36/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
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 2313b8b3a5e..47d5cb4fad0 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
@@ -53,7 +53,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
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 fc5fe4ef0cf..a7241c04e88 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
@@ -53,7 +53,7 @@ interface Loopback0
ip address 192.168.255.36/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
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 71aa1c4bd9e..9efbac62acf 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
@@ -55,7 +55,7 @@ interface Loopback0
ip address 192.168.255.32/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.32/32
!
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 26e59bfbbd1..82d1c6a42c1 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
@@ -55,7 +55,7 @@ interface Loopback0
ip address 192.168.255.33/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.32/32
!
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 8b1ac070689..f797b16e88a 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
@@ -55,7 +55,7 @@ interface Loopback0
ip address 192.168.255.34/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.34/32
!
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 eaa06f4ce57..03fcfa25536 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
@@ -55,7 +55,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.34/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.cfg
index 28015b114e3..d4cd69267be 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.cfg
@@ -29,7 +29,7 @@ interface Loopback0
ip address 192.168.254.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.cfg
index 214dce1b6ef..89227afac97 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.cfg
@@ -29,7 +29,7 @@ interface Loopback0
ip address 192.168.254.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.2/32
!
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 cf438f6f2b9..6feb7beecb2 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
@@ -38,7 +38,7 @@ interface Loopback0
ip address 192.168.254.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.1/32
!
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 89a4abae4b1..19ae2a2bbb1 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
@@ -38,7 +38,7 @@ interface Loopback0
ip address 192.168.254.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.2/32
!
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 f38c9ef4008..c7a9d80ec75 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
@@ -64,7 +64,7 @@ interface Loopback0
ip address 192.168.254.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.3/32
!
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 bac64390137..2b485ff2082 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
@@ -64,7 +64,7 @@ interface Loopback0
ip address 192.168.254.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.253.3/32
!
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 cda1da13900..2655c33a569 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.255.35/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.35/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.cfg
index 3816ba998b4..9ead8a88471 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.cfg
index 33a44523310..08ebf90d0ca 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.2/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.cfg
index e558b018957..f46291c745e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.cfg
index bfa0f8b5472..af070d51b6b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.4/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.cfg
index e135acea94e..f79e514dd3f 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.cfg
index f12f4f58888..5d9b651ea0d 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.cfg
index c936e2ad6eb..e10cadd0028 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.cfg
@@ -33,7 +33,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.7/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg
index be87f165fef..30e4a33a1e9 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg
@@ -84,7 +84,7 @@ interface Loopback0
ip address 192.168.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg
index 50290746bd6..9ebc635ff70 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg
@@ -84,7 +84,7 @@ interface Loopback0
ip address 192.168.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.1/32
!
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 cbb583c4558..990e77d0910 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
@@ -73,7 +73,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 1db93b17422..e71c865f057 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
@@ -61,7 +61,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 d1c0694cbe4..e51e4667b04 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
@@ -57,7 +57,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 e528ffeaa31..bfdc7827b72 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
@@ -57,7 +57,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 5116e2f9e71..443e49190cc 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
@@ -32,7 +32,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 aec18c63fa3..4f42f75bf3e 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
@@ -77,7 +77,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 335d475f470..f9cb6275b51 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
@@ -77,7 +77,7 @@ interface Loopback0
ip address 192.168.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
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 02eb5b3b4f6..65b909f15d4 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
@@ -37,7 +37,7 @@ interface Loopback0
ip address 192.168.255.111/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.111/32
!
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 5f6c996c397..a5b7b4c0989 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
@@ -37,7 +37,7 @@ interface Loopback0
ip address 192.168.255.112/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.111/32
!
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 b69d7569e90..e4b279ee64d 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
@@ -32,7 +32,7 @@ interface Loopback0
ip address 192.168.1.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.2.10/32
!
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 b9470e52ed3..c1150228f26 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
@@ -32,7 +32,7 @@ interface Loopback0
ip address 192.168.1.20/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.2.20/32
!
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 73613497157..7a84dff5e61 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.1.30/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.2.30/32
!
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 ef8cdc4fdcc..1a852669d5d 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
@@ -46,7 +46,7 @@ interface Loopback0
ip address 192.168.1.40/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.2.40/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/duplicate-vrfs.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/duplicate-vrfs.cfg
index 5555b6867a6..a5c8ea90ee4 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/duplicate-vrfs.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/duplicate-vrfs.cfg
@@ -26,7 +26,7 @@ interface Loopback0
ip address 192.168.255.101/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.101/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-to-ipvpn-gateway.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-to-ipvpn-gateway.cfg
index 19bf52ae82a..39a6ab3bb99 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-to-ipvpn-gateway.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-to-ipvpn-gateway.cfg
@@ -23,7 +23,7 @@ interface Loopback0
ip address 10.10.0.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.11.0.1/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-vtep-with-default-vrf-not-evpn.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-vtep-with-default-vrf-not-evpn.cfg
index de1bd8915b8..86d57967d4f 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-vtep-with-default-vrf-not-evpn.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn-vtep-with-default-vrf-not-evpn.cfg
@@ -21,7 +21,7 @@ interface Loopback0
ip address 192.168.255.109/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.109/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg
index bf118b4d1dc..70d37e55459 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg
@@ -164,7 +164,7 @@ interface Loopback0
ip address 192.168.255.109/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.109/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg
index 93206aebd84..43d3503c739 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg
@@ -141,7 +141,7 @@ interface Loopback0
ip address 192.168.255.109/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.109/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg
index 591b1ae79b6..1f2b7122c97 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg
@@ -86,7 +86,7 @@ interface Loopback0
ip address 10.10.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.11.0.3/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg
index e64a027b866..160354414dc 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg
@@ -41,7 +41,7 @@ interface Loopback0
ip address 10.10.0.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.11.0.3/32
!
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 79c3223c04b..27bfb188ef0 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
@@ -117,7 +117,7 @@ interface Loopback0
ip address 10.254.1.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.1/32
!
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 92ee5446e56..44af7d567e5 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
@@ -116,7 +116,7 @@ interface Loopback0
ip address 10.254.1.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.2/32
!
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 560f7467d18..5348626f0f6 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
@@ -161,7 +161,7 @@ interface Loopback0
ip address 10.254.1.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.5/32
!
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 69d7661b364..5386a40f9fa 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
@@ -161,7 +161,7 @@ interface Loopback0
ip address 10.254.1.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.5/32
!
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 6446dc59a92..116fa680b93 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
@@ -132,7 +132,7 @@ interface Loopback0
ip address 10.0.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.3/32
!
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 45c9ae580d1..45aba25184f 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
@@ -132,7 +132,7 @@ interface Loopback0
ip address 10.0.255.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.3/32
!
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 07588619c35..4cdf065c7f8 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
@@ -126,7 +126,7 @@ interface Loopback0
ip address 10.0.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.5/32
!
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 07194a7a838..521cbeda320 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
@@ -128,7 +128,7 @@ interface Loopback0
ip address 10.0.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.5/32
!
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 38adda34ed1..38fd15a0ac8 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
@@ -96,7 +96,7 @@ interface Loopback0
ip address 10.0.255.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.2/32
!
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 3619f66110d..722563fe725 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
@@ -96,7 +96,7 @@ interface Loopback0
ip address 10.0.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.0.254.1/32
!
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 a5c0aad3d61..cd6defeba64 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
@@ -209,7 +209,7 @@ interface Loopback0
ip address 10.254.1.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.1/32
!
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 3d4b5b8a7e2..a3296097ba0 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
@@ -189,7 +189,7 @@ interface Loopback0
ip address 10.254.1.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.1/32
!
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 7bb46fda38b..8e2c5e8a455 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
@@ -73,7 +73,7 @@ interface Loopback0
ip address 10.254.1.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.1/32
!
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 eb2e714e4b8..b5ade79d31c 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
@@ -49,7 +49,7 @@ interface Loopback0
ip address 10.254.1.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.2/32
!
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 880b9077a8a..e742a487600 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
@@ -142,7 +142,7 @@ interface Loopback0
ip address 10.254.1.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.5/32
!
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 77211435e4b..f4478084a73 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
@@ -142,7 +142,7 @@ interface Loopback0
ip address 10.254.1.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 10.254.11.5/32
!
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 df7661a3441..ebd510cede5 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
@@ -95,7 +95,7 @@ interface Loopback0
ip address 192.168.45.4/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.255.4/32
!
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 a5c2d586fa7..7a039f64746 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
@@ -95,7 +95,7 @@ interface Loopback0
ip address 192.168.45.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.255.1/32
!
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 7ecf25f1648..c223858e559 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
@@ -95,7 +95,7 @@ interface Loopback0
ip address 192.168.45.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.255.2/32
!
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 9697885c498..2ffb07281c5 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
@@ -95,7 +95,7 @@ interface Loopback0
ip address 192.168.45.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.255.3/32
!
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 2dbc01110f8..9c12f689a22 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
@@ -183,7 +183,7 @@ interface Loopback0
ip address 192.168.250.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.249.9/32
!
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 ce25c7d047e..e97722ffb4e 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
@@ -163,7 +163,7 @@ interface Loopback0
ip address 192.168.250.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.249.9/32
!
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 bf09ae906f8..cdfdbd0f8ad 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
@@ -79,7 +79,7 @@ interface Loopback0
ip address 192.168.250.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.249.11/32
!
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 fa75ad8b3b7..ba56c269fcf 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
@@ -74,7 +74,7 @@ interface Loopback0
ip address 192.168.250.12/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.249.11/32
!
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 df74d828389..83faec80030 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
@@ -32,7 +32,7 @@ interface Loopback0
ip address 192.168.255.1/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.1/32
!
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 d7ff5dbc6e9..de72cf8bff9 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
@@ -25,7 +25,7 @@ interface Loopback0
ip address 192.168.255.2/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.2/32
!
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 4600e742360..6a74be633e0 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
@@ -25,7 +25,7 @@ interface Loopback0
ip address 192.168.255.3/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.3/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/varpv6.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/varpv6.cfg
index 15a71e2479e..05160e59066 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/varpv6.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/varpv6.cfg
@@ -35,7 +35,7 @@ interface Loopback0
ip address 192.168.255.101/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.101/32
!
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/vrfs_rd_rt_override.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/vrfs_rd_rt_override.cfg
index e0ba871cfef..b40a3eb5a32 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/vrfs_rd_rt_override.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/vrfs_rd_rt_override.cfg
@@ -28,7 +28,7 @@ interface Loopback0
ip address 10.10.0.20/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description MY_VTEP_LOOPBACK
no shutdown
ip address 10.11.0.20/32
!
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 d445ee0277e..554ca74edb2 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
@@ -159,7 +159,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml
index c0f7424b36d..edcb2f1ab4e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1A.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml
index 2765636eb47..d1272a432f0 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF1B.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.4/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml
index 7cc0e2f10bb..5123391ce7e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF2.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
prefix_lists:
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 7f63d3a3a55..10d9217f56e 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.7/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.7/32
prefix_lists:
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 57882b47229..b0c9c136381 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.8/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.7/32
prefix_lists:
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 6de42ca661b..95dc5413e9d 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.9/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.9/32
prefix_lists:
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 4cdf1b92822..96e30ef5702 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.9/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml
index 89987529443..becceb4ad43 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF5A.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.11/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.11/32
prefix_lists:
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 db1e17da7d6..3b149428238 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.13/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.13/32
prefix_lists:
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 8f712dd8166..69e2e53bd18 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.14/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.13/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml
index 71b9963ab40..3fb96998e32 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8A.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.15/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.15/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml
index 99a64597bf2..7d607b0fc36 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_ASN_LEAF8B.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.16/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.16/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml
index 3f02c397e0f..4bf71547063 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/AUTO_BGP_UNGROUPED_LEAF6.yml
@@ -81,7 +81,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.12/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.12/32
prefix_lists:
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 71aad445b51..03fd74c2718 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
@@ -121,7 +121,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
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 f24947108db..8e3213fa2fc 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
@@ -121,7 +121,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.4/32
prefix_lists:
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 4c8d81724d7..b0346e57833 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
@@ -542,7 +542,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.14/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.14/32
ip_address_secondaries:
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 c8b20098c47..6600109db59 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
@@ -519,7 +519,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.15/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.15/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml
index 94b413164b2..62f4336f196 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2A.yml
@@ -411,7 +411,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.16/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.16/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml
index f0ee6c84feb..59c37562497 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL2B.yml
@@ -405,7 +405,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.17/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.17/32
prefix_lists:
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 a2b657b86b6..8a3ec8658f4 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
@@ -440,7 +440,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.18/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.18/32
prefix_lists:
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 8f597a004ef..2c599006240 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
@@ -455,7 +455,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.19/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.18/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml
index 1833cac722b..581c9b80da7 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF1A.yml
@@ -381,7 +381,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.42.42/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.43.43/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
index dd6523a17fd..bd197f80ba0 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
@@ -841,7 +841,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
index b149ad85c3f..ac383ebd288 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
@@ -785,7 +785,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.11/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.11/32
- name: Loopback100
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 28c95efef5f..3519788b0be 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
@@ -1539,7 +1539,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.12/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.12/32
- name: Loopback100
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 6328b63a55c..86378b2bc01 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
@@ -1491,7 +1491,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.13/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.12/32
- name: Loopback100
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 6ddf740af5e..569aaf8ccda 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
@@ -967,7 +967,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.21/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.21/32
- name: Loopback100
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 88ab4d36cdb..a8a6ca03a48 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
@@ -967,7 +967,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.22/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.21/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml
index 777b315189b..76153128f2c 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF1.yml
@@ -106,7 +106,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.0.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.10.0.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml
index fadff73d3c9..4d856b40ddb 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DUP-LEAF2.yml
@@ -106,7 +106,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.0.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.10.0.2/32
prefix_lists:
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 d4b01949cca..c2dff292c08 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
@@ -661,7 +661,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.8/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
- name: Loopback33
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 1fdb905d432..f6b7625f567 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
@@ -1410,7 +1410,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
- name: Loopback33
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 f3a4ba8ae88..c03b159330a 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
@@ -1410,7 +1410,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
- name: Loopback33
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 ee72d762beb..ad2e31a5093 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
@@ -708,7 +708,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
- name: Loopback33
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 35855a98856..2682dba9bf2 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
@@ -740,7 +740,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
- name: Loopback33
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 54112a1f026..60b6091bdb7 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
@@ -740,7 +740,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.7/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.7/32
- name: Loopback33
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml
index 987b3509e3a..0f97c2c9375 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/IGMP-QUERIER-L3LEAF1A.yml
@@ -284,7 +284,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
index 734b8818826..bc3f15b7b72 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
@@ -369,7 +369,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.33/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.33/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
index 9483bddfb87..eb0d9582a3b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
@@ -369,7 +369,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.34/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.34/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
index 745589df888..63fc5fb14ea 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
@@ -242,7 +242,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml
index edf440a8b7c..d72d987d125 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml
@@ -198,7 +198,7 @@ loopback_interfaces:
ip_address: 192.168.255.36/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.36/32
ospf_area: 0.0.0.0
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml
index c7f64e805fd..7304ae0f2cc 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml
@@ -198,7 +198,7 @@ loopback_interfaces:
ip_address: 192.168.255.37/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.36/32
ospf_area: 0.0.0.0
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 681b675bd23..06236a5725f 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
@@ -161,7 +161,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
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 61bbfc01732..6ea3cec0122 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
@@ -161,7 +161,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.36/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
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 1d4a98974f1..c2e6d6239bc 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
@@ -175,7 +175,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
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 80ca0e03c11..d778a39d9df 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
@@ -173,7 +173,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.36/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
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 dffc08ffe98..0ead0afaa0f 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
@@ -216,7 +216,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.32/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.32/32
prefix_lists:
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 aa93e8104f4..6e7cea72dcb 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
@@ -216,7 +216,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.33/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.32/32
prefix_lists:
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 22a6bf8f847..1fdcaa88378 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
@@ -216,7 +216,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.34/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.34/32
prefix_lists:
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 73b0e89a7ef..47c9ef5d55b 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
@@ -216,7 +216,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.34/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml
index 0888ebf713d..6424547734a 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.yml
@@ -52,7 +52,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml
index af927c1bbd8..35598de1c82 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.yml
@@ -52,7 +52,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.2/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml
index 5df4bf50418..781f4a215b7 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF1.yml
@@ -52,7 +52,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml
index fa2ac593ad4..c3eb2c5bc53 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/OVERLAY_ROUTING_PROTOCOL_HER_L3LEAF2.yml
@@ -52,7 +52,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.2/32
prefix_lists:
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 2fa44596212..6351416bed9 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
@@ -185,7 +185,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.3/32
prefix_lists:
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 4ec82ebd543..25357313877 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
@@ -185,7 +185,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.254.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.253.3/32
prefix_lists:
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 e18bf1581e4..1d5cb78fecc 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
@@ -161,7 +161,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.35/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.35/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml
index e2578feb143..442ea7171b8 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF1.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml
index dd29dad4e0d..2d536c4708e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF2.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.2/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml
index da7b5c3ccc0..c977e2a2b8a 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF3.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml
index a23973fd7a2..3084238869e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF4.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.4/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml
index ee5a743e240..04d459e505b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF5.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml
index bd60b288e25..4d6eea9c928 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF6.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml
index c17f8ee6cd2..e34c764324e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/RD-RT-ADMIN-SUBFIELD-L3LEAF7.yml
@@ -126,7 +126,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.7/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.7/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml
index 19730180bbf..025ff9217c0 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_1.yml
@@ -234,7 +234,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml
index 887173bf851..19a501577f1 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/SVI_PROFILE_NODE_2.yml
@@ -106,7 +106,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.1/32
prefix_lists:
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 a39579a162c..1e578b5b5a7 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
@@ -232,7 +232,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
- name: Loopback3
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 53151e5e3f4..909425667aa 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
@@ -216,7 +216,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
- name: Loopback4
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 68feb0367dd..f1d6c49ffd3 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
@@ -206,7 +206,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
- name: Loopback5
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 c6e6b051212..7a339949eb7 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
@@ -206,7 +206,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
- name: Loopback5
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 8eebdb92f3e..f398480f078 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
@@ -80,7 +80,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
route_maps:
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 93a2a9e54fc..7cb1fd569a9 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
@@ -227,7 +227,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
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 6639ccda457..8838362df66 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
@@ -227,7 +227,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
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 fb5a8de853b..a2992ca68ed 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
@@ -162,7 +162,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.111/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.111/32
prefix_lists:
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 e61366b7106..2900552174a 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
@@ -161,7 +161,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.112/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.111/32
prefix_lists:
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 816e26225ca..09b789968c7 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
@@ -97,7 +97,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.1.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.2.10/32
prefix_lists:
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 897c2c64279..cc3d9ffef9f 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
@@ -97,7 +97,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.1.20/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.2.20/32
prefix_lists:
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 40c6c2a5fd3..c933a198799 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
@@ -130,7 +130,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.1.30/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.2.30/32
prefix_lists:
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 001b5fce6dd..96cfa6555c3 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
@@ -130,7 +130,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.1.40/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.2.40/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml
index e864c69faf2..9af4cc22ad7 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/duplicate-vrfs.yml
@@ -97,7 +97,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.101/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.101/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml
index 18ea8d54dcd..f78d5a852f9 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-to-ipvpn-gateway.yml
@@ -120,7 +120,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.10.0.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.11.0.1/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml
index de34bb28ccc..b84876c8054 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn-vtep-with-default-vrf-not-evpn.yml
@@ -71,7 +71,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.109/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.109/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml
index ffc51d82f07..7678e6bf38b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml
@@ -470,7 +470,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.109/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.109/32
- name: Loopback100
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml
index b2827de567f..e021cece27c 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml
@@ -261,7 +261,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.109/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.109/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml
index 08fc635a4d3..de90dacfd27 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle.yml
@@ -208,7 +208,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.10.0.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.11.0.3/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml
index 50298fdb117..0127a5b6238 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml
@@ -114,7 +114,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.10.0.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.11.0.3/32
prefix_lists:
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 80ac8f723e8..21f223c6eb9 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
@@ -220,7 +220,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.1/32
prefix_lists:
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 248f04742e8..d0e74b3de43 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
@@ -210,7 +210,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.2/32
prefix_lists:
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 b3c0ee951ec..bbc2a7e36e2 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
@@ -373,7 +373,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.5/32
prefix_lists:
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 4b4a2b4fc06..8acee44e591 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
@@ -373,7 +373,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.5/32
prefix_lists:
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 79b347d4931..76e593b00b1 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
@@ -357,7 +357,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.3/32
prefix_lists:
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 2cb8c0062fa..55b92967cc7 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
@@ -357,7 +357,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.3/32
prefix_lists:
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 bd297c18404..30b750357ee 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
@@ -308,7 +308,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.5/32
prefix_lists:
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 cf60ad1ec13..5b6900e055d 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
@@ -306,7 +306,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.5/32
prefix_lists:
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 6146d9297fb..1387e26337b 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
@@ -170,7 +170,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.2/32
prefix_lists:
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 c9476402ba0..857fc38017c 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
@@ -171,7 +171,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.0.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.0.254.1/32
prefix_lists:
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 1743f17135c..89ef330006c 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
@@ -445,7 +445,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.1/32
prefix_lists:
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 73c5140cc10..a6e81edab02 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
@@ -418,7 +418,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.1/32
prefix_lists:
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 60143644c2d..7578df5e32b 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
@@ -176,7 +176,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.1/32
prefix_lists:
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 e4c0f0d9725..dece3ad80d6 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
@@ -143,7 +143,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.2/32
prefix_lists:
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 9069ccb319c..0eea74cff91 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
@@ -357,7 +357,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.5/32
prefix_lists:
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 3bd515a0a9d..6c0b9175b6f 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
@@ -357,7 +357,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.254.1.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.254.11.5/32
prefix_lists:
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 b058f4e0790..846ae6bc284 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
@@ -273,7 +273,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.45.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.255.4/32
prefix_lists:
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 07d76da608d..e7ba332bd00 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
@@ -273,7 +273,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.45.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.255.1/32
prefix_lists:
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 d0fc4ba80b1..3760e18cbe4 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
@@ -273,7 +273,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.45.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.255.2/32
prefix_lists:
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 b470635e510..5cc449bff7e 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
@@ -273,7 +273,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.45.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.255.3/32
prefix_lists:
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 2e27e9e9fc8..0c0fc0e5e6c 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
@@ -543,7 +543,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.250.9/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.249.9/32
prefix_lists:
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 dff400f4e7c..d52a22a3e31 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
@@ -520,7 +520,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.250.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.249.9/32
prefix_lists:
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 88cf59e6ebb..dbdfcf404b5 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
@@ -254,7 +254,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.250.11/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.249.11/32
prefix_lists:
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 6a3d8493e79..82218c98941 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
@@ -249,7 +249,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.250.12/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.249.11/32
prefix_lists:
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 b44f93e594f..c5f3b61fc33 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
@@ -104,7 +104,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.1/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.1/32
prefix_lists:
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 2574774c1c9..23da01f7094 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
@@ -85,7 +85,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.2/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.2/32
prefix_lists:
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 648cae41574..eb5321399cc 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
@@ -85,7 +85,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.3/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml
index d13c7247d6f..fa946149582 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/varpv6.yml
@@ -122,7 +122,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.101/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.101/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml
index 5576cdea229..e7327d72d6e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/vrfs_rd_rt_override.yml
@@ -114,7 +114,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.10.0.20/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: MY_VTEP_LOOPBACK
shutdown: false
ip_address: 10.11.0.20/32
prefix_lists:
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/vrfs_rd_rt_override.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/vrfs_rd_rt_override.yml
index ee9b71ead63..d7c7a20a75f 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/vrfs_rd_rt_override.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/vrfs_rd_rt_override.yml
@@ -1,6 +1,9 @@
# Testing the rd and rt override for VRFs
type: l3leaf
+# Testing custom vtep loopback description
+vtep_loopback_description: MY_VTEP_LOOPBACK
+
l3leaf:
defaults:
loopback_ipv4_pool: 10.10.0.0/24
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 de0994def3c..341dd353695 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
@@ -487,7 +487,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.3/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 22cc0ac0e94..38765db3d73 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
@@ -550,7 +550,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.4/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.3/32
- name: Loopback10
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 c406c67c05f..ee51ec3e68c 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
@@ -503,7 +503,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 b0ece618f61..6166631d2ac 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
@@ -503,7 +503,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.0.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.1.5/32
- name: Loopback10
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 2e6ac5eadfc..4eb69b3ae95 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
@@ -218,7 +218,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.33.0.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.33.1.5/32
prefix_lists:
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 8fcfb85b1d0..656c25a0a7f 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
@@ -218,7 +218,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.33.0.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.33.1.5/32
prefix_lists:
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 2fdb93118d7..466200dd83d 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
@@ -414,7 +414,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.13/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.13/32
- name: Loopback10
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 297ee923031..b9bd75151a7 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
@@ -414,7 +414,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.14/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.13/32
- name: Loopback10
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 a38dfd23d71..301fde7c023 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
@@ -485,7 +485,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.15/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.15/32
- name: Loopback10
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 2b48e79c48c..e51994cda85 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
@@ -485,7 +485,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.16/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.15/32
- name: Loopback10
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 e4033f997bb..d36168ed916 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
@@ -395,7 +395,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.17/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.17/32
- name: Loopback10
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 1d0db19e738..ad949b69733 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
@@ -395,7 +395,7 @@ loopback_interfaces:
shutdown: false
ip_address: 10.255.128.18/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 10.255.129.17/32
- name: Loopback10
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 00dd6859997..11cf924c081 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
@@ -467,7 +467,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 25327e6d6ac..a518094317f 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
@@ -464,7 +464,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 093a7d850e7..17fee30b1d8 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
@@ -428,7 +428,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 68c5ae42fcd..8e980e18163 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
@@ -346,7 +346,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Vxlan1
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 1a4cc9cd4c9..b757b4d60fa 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
@@ -346,7 +346,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Vxlan1
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 dbb1ea98387..a08482eed7f 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
@@ -414,7 +414,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 06e77a99f5b..80483a7a08a 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
@@ -414,7 +414,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 eecad7e455b..bc69041fbff 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
@@ -436,7 +436,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 6fe7f69055e..4ba288cc70f 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
@@ -420,7 +420,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 46833c0b708..013d2ee3ebd 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
@@ -397,7 +397,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 002174ff831..33da87bad47 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
@@ -397,7 +397,7 @@ anta.tests.interfaces:
- name: Loopback1
status: up
result_overwrite:
- custom_field: Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'
+ custom_field: Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Loopback10
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 726df92da39..6e426c248ec 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
@@ -68,7 +68,7 @@ id,dut,categories,test,description,inputs,result,messages
67,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+70,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
71,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
72,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
73,dc1-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc1-leaf1b_Po3 = 'up',NOT RUN,
@@ -227,7 +227,7 @@ id,dut,categories,test,description,inputs,result,messages
226,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet7 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+229,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
230,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
231,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
232,dc1-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc1-leaf1a_Po3 = 'up',NOT RUN,
@@ -462,7 +462,7 @@ id,dut,categories,test,description,inputs,result,messages
461,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+464,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
465,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
466,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
467,dc1-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc1-leaf2b_Po3 = 'up',NOT RUN,
@@ -950,7 +950,7 @@ id,dut,categories,test,description,inputs,result,messages
949,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_PEER_dc1-svc-leaf1b_Ethernet3 = 'up',NOT RUN,
950,dc1-svc-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_PEER_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 - VTEP_VXLAN_Tunnel_Source = '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_PEER_dc1-svc-leaf1b_Po3 = '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,
@@ -1079,7 +1079,7 @@ id,dut,categories,test,description,inputs,result,messages
1078,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_PEER_dc1-svc-leaf1a_Ethernet3 = 'up',NOT RUN,
1079,dc1-svc-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_PEER_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 - VTEP_VXLAN_Tunnel_Source = '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_PEER_dc1-svc-leaf1a_Po3 = '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,
@@ -1403,7 +1403,7 @@ id,dut,categories,test,description,inputs,result,messages
1402,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - dc2-leaf1-server1_PCI1 = 'up',NOT RUN,
1403,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC2-LEAF1C_Ethernet1 = 'up',NOT RUN,
1404,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN,
-1405,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+1405,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
1406,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1407,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1408,dc2-leaf1a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc2-leaf1b_Po3 = 'up',NOT RUN,
@@ -1565,7 +1565,7 @@ id,dut,categories,test,description,inputs,result,messages
1564,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet5 - dc2-leaf1-server1_PCI2 = 'up',NOT RUN,
1565,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet8 - DC2-LEAF1C_Ethernet2 = 'up',NOT RUN,
1566,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN,
-1567,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+1567,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
1568,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1569,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1570,dc2-leaf1b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc2-leaf1a_Po3 = 'up',NOT RUN,
@@ -1804,7 +1804,7 @@ id,dut,categories,test,description,inputs,result,messages
1803,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+1806,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
1807,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1808,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1809,dc2-leaf2a,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc2-leaf2b_Po3 = 'up',NOT RUN,
@@ -1967,7 +1967,7 @@ id,dut,categories,test,description,inputs,result,messages
1966,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+1969,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
1970,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1971,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
1972,dc2-leaf2b,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel3 - MLAG_PEER_dc2-leaf2a_Po3 = 'up',NOT RUN,
@@ -2199,7 +2199,7 @@ id,dut,categories,test,description,inputs,result,messages
2198,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_PEER_dc2-leaf3b.arista.com_Ethernet3 = 'up',NOT RUN,
2199,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_PEER_dc2-leaf3b.arista.com_Ethernet4 = 'up',NOT RUN,
2200,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN,
-2201,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+2201,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
2202,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
2203,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
2204,dc2-leaf3a.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel11 - dc2-leaf3-fw1_PortChannel = 'up',NOT RUN,
@@ -2358,7 +2358,7 @@ id,dut,categories,test,description,inputs,result,messages
2357,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet3 - MLAG_PEER_dc2-leaf3a.arista.com_Ethernet3 = 'up',NOT RUN,
2358,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Ethernet4 - MLAG_PEER_dc2-leaf3a.arista.com_Ethernet4 = 'up',NOT RUN,
2359,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback0 - ROUTER_ID = 'up',NOT RUN,
-2360,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up',NOT RUN,
+2360,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up',NOT RUN,
2361,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up',NOT RUN,
2362,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up',NOT RUN,
2363,dc2-leaf3b.arista.com,Interfaces,VerifyInterfacesStatus,Verifies the status of the provided interfaces.,Interface Port-Channel11 - dc2-leaf3-fw1_PortChannel = 'up',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 c23dc120bec..b722ab91b57 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
@@ -150,7 +150,7 @@
| 67 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 70 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 71 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 72 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 73 | dc1-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc1-leaf1b_Po3 = 'up' | NOT RUN | - |
@@ -309,7 +309,7 @@
| 226 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet7 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 229 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 230 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 231 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 232 | dc1-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc1-leaf1a_Po3 = 'up' | NOT RUN | - |
@@ -544,7 +544,7 @@
| 461 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 464 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 465 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 466 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 467 | dc1-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc1-leaf2b_Po3 = 'up' | NOT RUN | - |
@@ -1032,7 +1032,7 @@
| 949 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_PEER_dc1-svc-leaf1b_Ethernet3 = 'up' | NOT RUN | - |
| 950 | dc1-svc-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_PEER_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 - VTEP_VXLAN_Tunnel_Source = '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_PEER_dc1-svc-leaf1b_Po3 = '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 | - |
@@ -1161,7 +1161,7 @@
| 1078 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_PEER_dc1-svc-leaf1a_Ethernet3 = 'up' | NOT RUN | - |
| 1079 | dc1-svc-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_PEER_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 - VTEP_VXLAN_Tunnel_Source = '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_PEER_dc1-svc-leaf1a_Po3 = '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 | - |
@@ -1485,7 +1485,7 @@
| 1402 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - dc2-leaf1-server1_PCI1 = 'up' | NOT RUN | - |
| 1403 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC2-LEAF1C_Ethernet1 = 'up' | NOT RUN | - |
| 1404 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - |
-| 1405 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 1405 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 1406 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1407 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1408 | dc2-leaf1a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc2-leaf1b_Po3 = 'up' | NOT RUN | - |
@@ -1647,7 +1647,7 @@
| 1564 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet5 - dc2-leaf1-server1_PCI2 = 'up' | NOT RUN | - |
| 1565 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet8 - DC2-LEAF1C_Ethernet2 = 'up' | NOT RUN | - |
| 1566 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - |
-| 1567 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 1567 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 1568 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1569 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1570 | dc2-leaf1b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc2-leaf1a_Po3 = 'up' | NOT RUN | - |
@@ -1886,7 +1886,7 @@
| 1803 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 1806 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 1807 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1808 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1809 | dc2-leaf2a | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc2-leaf2b_Po3 = 'up' | NOT RUN | - |
@@ -2049,7 +2049,7 @@
| 1966 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet6 - P2P_LINK_TO_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 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 1969 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 1970 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1971 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 1972 | dc2-leaf2b | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel3 - MLAG_PEER_dc2-leaf2a_Po3 = 'up' | NOT RUN | - |
@@ -2281,7 +2281,7 @@
| 2198 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_PEER_dc2-leaf3b.arista.com_Ethernet3 = 'up' | NOT RUN | - |
| 2199 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_PEER_dc2-leaf3b.arista.com_Ethernet4 = 'up' | NOT RUN | - |
| 2200 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - |
-| 2201 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 2201 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 2202 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 2203 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 2204 | dc2-leaf3a.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel11 - dc2-leaf3-fw1_PortChannel = 'up' | NOT RUN | - |
@@ -2440,7 +2440,7 @@
| 2357 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet3 - MLAG_PEER_dc2-leaf3a.arista.com_Ethernet3 = 'up' | NOT RUN | - |
| 2358 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Ethernet4 - MLAG_PEER_dc2-leaf3a.arista.com_Ethernet4 = 'up' | NOT RUN | - |
| 2359 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback0 - ROUTER_ID = 'up' | NOT RUN | - |
-| 2360 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up' | NOT RUN | - |
+| 2360 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up' | NOT RUN | - |
| 2361 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback10 - VRF10_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 2362 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Loopback11 - VRF11_VTEP_DIAGNOSTICS = 'up' | NOT RUN | - |
| 2363 | dc2-leaf3b.arista.com | Interfaces | VerifyInterfacesStatus | Verifies the status of the provided interfaces. | Interface Port-Channel11 - dc2-leaf3-fw1_PortChannel = 'up' | 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 259bf6547ce..84fad480f8d 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
@@ -606,7 +606,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 7275ea2b260..08adce87622 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
@@ -597,7 +597,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 f9dc9cc41f3..62196fc5fd9 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
@@ -543,7 +543,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'"
},
{
"name": "dc1-leaf2a",
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 c305004732a..cba72d82109 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
@@ -498,7 +498,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 31ee593d491..d43cdefcc93 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
@@ -498,7 +498,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'"
},
{
"name": "dc1-svc-leaf1b",
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 b6e3a7b3a8c..846c6cdcfb6 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
@@ -525,7 +525,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 20d29b16784..de60c2b73e6 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
@@ -525,7 +525,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 5e88460376c..c8dce96578e 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
@@ -570,7 +570,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 aab60c5af7d..1603dac8374 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
@@ -534,7 +534,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 4b181bef8ef..6651ec032e2 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
@@ -507,7 +507,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = '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 9604e53e4d8..27eda7bbc56 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
@@ -507,7 +507,7 @@
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
- "custom_field": "Interface Loopback1 - VTEP_VXLAN_Tunnel_Source = 'up'"
+ "custom_field": "Interface Loopback1 - VXLAN_TUNNEL_SOURCE = 'up'"
},
{
"name": "dc2-leaf3b.arista.com",
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 9a49fb1a9d2..bd43bc58412 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
@@ -414,14 +414,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.10/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -442,7 +442,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
isis enable EVPN_UNDERLAY
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 6c3371ce701..81966dda9a5 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
@@ -399,14 +399,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.11/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -427,7 +427,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
isis enable EVPN_UNDERLAY
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 bba44d87cef..e0da5d23ed9 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
@@ -414,14 +414,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.6/32 |
-| Loopback10 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback10 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback10 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback10 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -442,7 +442,7 @@ interface Loopback0
isis passive
!
interface Loopback10
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
isis enable EVPN_UNDERLAY
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 e47e09d9802..a7a19f1912a 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
@@ -414,14 +414,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.7/32 |
-| Loopback10 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback10 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback10 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback10 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -442,7 +442,7 @@ interface Loopback0
isis passive
!
interface Loopback10
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
isis enable EVPN_UNDERLAY
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 9b18bfe7b6c..6d75463da51 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
@@ -415,14 +415,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.8/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -443,7 +443,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
isis enable EVPN_UNDERLAY
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 c58e049d315..2779114bb9b 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
@@ -415,14 +415,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.9/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
##### ISIS
@@ -443,7 +443,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
isis enable EVPN_UNDERLAY
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 919e8f6ea63..99bf85c85cd 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
@@ -123,7 +123,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
isis enable EVPN_UNDERLAY
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 ba3e78880dd..b341489b9f7 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
@@ -110,7 +110,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
isis enable EVPN_UNDERLAY
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 3d6a745caac..3a12611f269 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
@@ -123,7 +123,7 @@ interface Loopback0
isis passive
!
interface Loopback10
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
isis enable EVPN_UNDERLAY
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 4bdb6ac256c..bef75578a0b 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
@@ -123,7 +123,7 @@ interface Loopback0
isis passive
!
interface Loopback10
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
isis enable EVPN_UNDERLAY
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 94ecb4d7222..688d2e38310 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
@@ -124,7 +124,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
isis enable EVPN_UNDERLAY
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 c0563974504..721f3d2d6d3 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
@@ -124,7 +124,7 @@ interface Loopback0
isis passive
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
isis enable EVPN_UNDERLAY
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 276875efb80..aaace82870a 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
@@ -254,7 +254,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
isis_enable: EVPN_UNDERLAY
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 09af7c0c2ea..3192e08c384 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
@@ -239,7 +239,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
isis_enable: EVPN_UNDERLAY
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 4d3436178d1..976ba08cce7 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
@@ -256,7 +256,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback10
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
isis_enable: EVPN_UNDERLAY
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 b485be96577..b9a5c24b53e 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
@@ -256,7 +256,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback10
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
isis_enable: EVPN_UNDERLAY
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 f0a8b5d6c49..17038cf00a4 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
@@ -256,7 +256,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
isis_enable: EVPN_UNDERLAY
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 af46785d072..5d3aab70c95 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
@@ -256,7 +256,7 @@ loopback_interfaces:
isis_enable: EVPN_UNDERLAY
isis_passive: true
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
isis_enable: EVPN_UNDERLAY
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 7138259644c..60a47c651af 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
@@ -383,14 +383,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.10/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -403,7 +403,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
ip ospf area 0.0.0.0
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 74ca75f82ed..33226fd5ccb 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
@@ -383,14 +383,14 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.11/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -403,7 +403,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
ip ospf area 0.0.0.0
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 6522364c75a..9c8d96f0db2 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
@@ -290,14 +290,14 @@ interface Ethernet4
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.5/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -310,7 +310,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
ip ospf area 0.0.0.0
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 0515bf28175..a86777af896 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
@@ -409,14 +409,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.6/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -429,7 +429,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
ip ospf area 0.0.0.0
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 76173a40ec1..0488a3bfe83 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
@@ -409,14 +409,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.7/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -429,7 +429,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
ip ospf area 0.0.0.0
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 06187ed32ac..b40f9d9f915 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
@@ -410,14 +410,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.8/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -430,7 +430,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
ip ospf area 0.0.0.0
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 4c23b14af31..34c8410fba0 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
@@ -410,14 +410,14 @@ interface Port-Channel7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.9/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -430,7 +430,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
ip ospf area 0.0.0.0
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 064abb4b90c..5b123936ce1 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
@@ -105,7 +105,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
ip ospf area 0.0.0.0
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 490b2704a8d..45eac4b0100 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
@@ -105,7 +105,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
ip ospf area 0.0.0.0
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 a7cc422ed4d..db94f8ef097 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
@@ -78,7 +78,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
ip ospf area 0.0.0.0
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 4cd2bde99cd..5aa9ac8ea1f 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
@@ -127,7 +127,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
ip ospf area 0.0.0.0
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 5400e0f14b9..8954b036b42 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
@@ -127,7 +127,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
ip ospf area 0.0.0.0
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 58056fbee13..7a4b7a4fd91 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
@@ -128,7 +128,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
ip ospf area 0.0.0.0
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 17cdb8b4655..3fed9fd51aa 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
@@ -128,7 +128,7 @@ interface Loopback0
ip ospf area 0.0.0.0
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
ip ospf area 0.0.0.0
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 a6de6ff0a76..29d371881fe 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
@@ -258,7 +258,7 @@ loopback_interfaces:
ip_address: 192.168.255.10/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
ospf_area: 0.0.0.0
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 06c3768e927..76705da3f72 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
@@ -258,7 +258,7 @@ loopback_interfaces:
ip_address: 192.168.255.11/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
ospf_area: 0.0.0.0
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 c377fb6d9ec..bbe5d964fdf 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
@@ -196,7 +196,7 @@ loopback_interfaces:
ip_address: 192.168.255.5/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
ospf_area: 0.0.0.0
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 4678a820e97..d38feb4929e 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
@@ -343,7 +343,7 @@ loopback_interfaces:
ip_address: 192.168.255.6/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
ospf_area: 0.0.0.0
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 5d69bc005ef..24eb04df9ef 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
@@ -343,7 +343,7 @@ loopback_interfaces:
ip_address: 192.168.255.7/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
ospf_area: 0.0.0.0
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 d876d6725cb..2e713f77357 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
@@ -343,7 +343,7 @@ loopback_interfaces:
ip_address: 192.168.255.8/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
ospf_area: 0.0.0.0
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 d716da6aafc..87000db8bc2 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
@@ -343,7 +343,7 @@ loopback_interfaces:
ip_address: 192.168.255.9/32
ospf_area: 0.0.0.0
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
ospf_area: 0.0.0.0
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 3ce47f4b383..87fd2a9d47e 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
@@ -359,14 +359,14 @@ interface Ethernet4000
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.10/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.10/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.10/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -378,7 +378,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
```
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 473d9443dcb..c3ec8b9d10d 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
@@ -360,14 +360,14 @@ interface Ethernet4000
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.11/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.11/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.11/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -379,7 +379,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.11/32
```
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 aefc262a146..b51eec8881d 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
@@ -347,14 +347,14 @@ interface Ethernet7
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.5/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.5/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.5/32 |
##### IPv6
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
#### Loopback Interfaces Device Configuration
@@ -366,7 +366,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
```
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 192c172f22a..21d00a461e2 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
@@ -534,7 +534,7 @@ interface Port-Channel12
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.6/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.6/32 |
##### IPv6
@@ -542,7 +542,7 @@ interface Port-Channel12
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -555,7 +555,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 5885e15a672..3a19ae2756d 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
@@ -534,7 +534,7 @@ interface Port-Channel12
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.7/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.6/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.6/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.7/32 |
##### IPv6
@@ -542,7 +542,7 @@ interface Port-Channel12
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -555,7 +555,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 4d4f28bc7d4..73d47886811 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
@@ -460,7 +460,7 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.12/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.12/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.12/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.12/32 |
##### IPv6
@@ -468,7 +468,7 @@ interface Port-Channel5
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | 2001:1::c/128 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -482,7 +482,7 @@ interface Loopback0
ipv6 address 2001:1::c/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 5fa149f8c19..39e9a213520 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
@@ -460,7 +460,7 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.13/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.12/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.12/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.13/32 |
##### IPv6
@@ -468,7 +468,7 @@ interface Port-Channel5
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | 2001:1::d/128 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -482,7 +482,7 @@ interface Loopback0
ipv6 address 2001:1::d/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 a3f4c42da3f..cbb1684c871 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
@@ -452,7 +452,7 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.14/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.14/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.14/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.14/32 |
##### IPv6
@@ -460,7 +460,7 @@ interface Port-Channel5
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | 2001:1::e/128 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -474,7 +474,7 @@ interface Loopback0
ipv6 address 2001:1::e/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.14/32
!
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 1388ebd0c0a..de865747f94 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
@@ -452,7 +452,7 @@ interface Port-Channel5
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.15/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.14/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.14/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.15/32 |
##### IPv6
@@ -460,7 +460,7 @@ interface Port-Channel5
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | 2001:1::f/128 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -474,7 +474,7 @@ interface Loopback0
ipv6 address 2001:1::f/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.14/32
!
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 81659094bd3..4935749d7d8 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
@@ -647,7 +647,7 @@ interface Port-Channel15
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.8/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.8/32 |
##### IPv6
@@ -655,7 +655,7 @@ interface Port-Channel15
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -668,7 +668,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 d28697ce32f..d68d580b150 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
@@ -621,7 +621,7 @@ interface Port-Channel15
| Interface | Description | VRF | IP Address |
| --------- | ----------- | --- | ---------- |
| Loopback0 | ROUTER_ID | default | 192.168.255.9/32 |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 192.168.254.8/32 |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | 192.168.254.8/32 |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | 10.255.1.9/32 |
##### IPv6
@@ -629,7 +629,7 @@ interface Port-Channel15
| Interface | Description | VRF | IPv6 Address |
| --------- | ----------- | --- | ------------ |
| Loopback0 | ROUTER_ID | default | - |
-| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
+| Loopback1 | VXLAN_TUNNEL_SOURCE | default | - |
| Loopback100 | Tenant_A_OP_Zone_VTEP_DIAGNOSTICS | Tenant_A_OP_Zone | - |
#### Loopback Interfaces Device Configuration
@@ -642,7 +642,7 @@ interface Loopback0
ip address 192.168.255.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 64a772cbdbc..bc5f363bea8 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
@@ -106,7 +106,7 @@ interface Loopback0
ip address 192.168.255.10/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.10/32
!
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 68a7d7258c4..dcc3c008234 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
@@ -107,7 +107,7 @@ interface Loopback0
ip address 192.168.255.11/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.11/32
!
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 fc8f4d995bf..e48ed4028d4 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
@@ -101,7 +101,7 @@ interface Loopback0
ip address 192.168.255.5/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.5/32
!
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 e090ad9f24a..fd337560c77 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
@@ -221,7 +221,7 @@ interface Loopback0
ip address 192.168.255.6/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 45751b4f564..cfdd09a32aa 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
@@ -221,7 +221,7 @@ interface Loopback0
ip address 192.168.255.7/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.6/32
!
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 3fe0a8f5929..8e590f47317 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
@@ -157,7 +157,7 @@ interface Loopback0
ipv6 address 2001:1::c/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 8da4334c113..3b5dfd138c0 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
@@ -157,7 +157,7 @@ interface Loopback0
ipv6 address 2001:1::d/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.12/32
!
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 5ff9401a851..bfe5fcb2e53 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
@@ -150,7 +150,7 @@ interface Loopback0
ipv6 address 2001:1::e/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.14/32
!
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 f438cfd5e0a..3db0c2f5ebe 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
@@ -150,7 +150,7 @@ interface Loopback0
ipv6 address 2001:1::f/128
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.14/32
!
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 28a0a2ee73d..f7ba1ee5ef7 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
@@ -321,7 +321,7 @@ interface Loopback0
ip address 192.168.255.8/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 9ea91066e4e..086cb1b610e 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
@@ -305,7 +305,7 @@ interface Loopback0
ip address 192.168.255.9/32
!
interface Loopback1
- description VTEP_VXLAN_Tunnel_Source
+ description VXLAN_TUNNEL_SOURCE
no shutdown
ip address 192.168.254.8/32
!
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 145a1e17e22..6d33fc89b8a 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
@@ -372,7 +372,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.10/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.10/32
prefix_lists:
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 c0ce12c28f9..4951cb9be4d 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
@@ -373,7 +373,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.11/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.11/32
prefix_lists:
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 efd21185835..df2b707b3ee 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
@@ -297,7 +297,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.5/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.5/32
prefix_lists:
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 12e54802e39..059450eaab1 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
@@ -843,7 +843,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.6/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
- name: Loopback100
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 2875201264a..2685e8393eb 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
@@ -843,7 +843,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.7/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.6/32
- name: Loopback100
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 53e8a979d90..6a139cb68df 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
@@ -705,7 +705,7 @@ loopback_interfaces:
ip_address: 192.168.255.12/32
ipv6_address: 2001:1::c/128
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.12/32
- name: Loopback100
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 cd14a9b9d54..741ad0ef9c0 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
@@ -705,7 +705,7 @@ loopback_interfaces:
ip_address: 192.168.255.13/32
ipv6_address: 2001:1::d/128
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.12/32
- name: Loopback100
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 0c04ad0e9b7..6c84f43b325 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
@@ -691,7 +691,7 @@ loopback_interfaces:
ip_address: 192.168.255.14/32
ipv6_address: 2001:1::e/128
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.14/32
- name: Loopback100
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 3c1fca0d109..1dd83d4bab0 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
@@ -691,7 +691,7 @@ loopback_interfaces:
ip_address: 192.168.255.15/32
ipv6_address: 2001:1::f/128
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.14/32
- name: Loopback100
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 c46558c13da..2b41b3703ca 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
@@ -1120,7 +1120,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.8/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
- name: Loopback100
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 f6ad5c71672..7719e204716 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
@@ -1099,7 +1099,7 @@ loopback_interfaces:
shutdown: false
ip_address: 192.168.255.9/32
- name: Loopback1
- description: VTEP_VXLAN_Tunnel_Source
+ description: VXLAN_TUNNEL_SOURCE
shutdown: false
ip_address: 192.168.254.8/32
- name: Loopback100
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 2956c5ef15b..6673dbfb117 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
@@ -27,6 +27,7 @@
| [ vrf_admin_subfield](## "overlay_rt_type.vrf_admin_subfield") | String | | `vrf_id` | | The method for deriving RT Administrator subfield (first part of RT) for VRF services:
- 'id' means `(vrf_id or vrf_vni)`.
- 'vrf_id' means `(vrf_id or vrf_vni)`.
- 'vrf_vni' means `(vrf_vni or vrf_id)`.
- 'bgp_as' means the AS number of the device.
- Integer between <0-65535>.
- Integer between <0-4294967295>.
'vrf_admin_subfield' takes precedence for VRF RDs if set. Otherwise the 'admin_subfield' value will be used.
|
| [ vlan_assigned_number_subfield](## "overlay_rt_type.vlan_assigned_number_subfield") | String | | `mac_vrf_id` | Valid Values:
- mac_vrf_id
- mac_vrf_vni
- vlan_id
| The method for deriving RT Assigned Number subfield for VLAN services (second part of RT):
- 'mac_vrf_id' means `(mac_vrf_id_base or mac_vrf_vni_base) + vlan_id`.
- 'mac_vrf_vni' means `(mac_vrf_vni_base or mac_vrf_id_base) + vlan_id`.
- 'vlan_id' will only use the 'vlan_id' and ignores all base values.
These methods can be overridden per VLAN if either 'rt_override' or 'vni_override' is set (preferred in this order).
|
| [router_id_loopback_description](## "router_id_loopback_description") | String | | `ROUTER_ID` | | Customize the description on Router ID interface Loopback0. |
+ | [vtep_loopback_description](## "vtep_loopback_description") | String | | `VXLAN_TUNNEL_SOURCE` | | Customize the description on VTEP interface, typically Loopback1. |
| [vtep_vvtep_ip](## "vtep_vvtep_ip") | String | | | | IP Address used as Virtual VTEP. Will be configured as secondary IP on Loopback1.
This is only needed for centralized routing designs.
|
=== "YAML"
@@ -180,6 +181,9 @@
# Customize the description on Router ID interface Loopback0.
router_id_loopback_description:
+ # Customize the description on VTEP interface, typically Loopback1.
+ vtep_loopback_description:
+
# IP Address used as Virtual VTEP. Will be configured as secondary IP on Loopback1.
# This is only needed for centralized routing designs.
vtep_vvtep_ip:
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 903c347d060..3bbc2e4bb64 100644
--- a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
+++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
@@ -4192,6 +4192,12 @@ keys:
description: 'Generate AVD configurations directly from a given CloudVision topology.
See `cv_topology` for details.'
+ vtep_loopback_description:
+ documentation_options:
+ table: overlay-settings
+ description: Customize the description on VTEP interface, typically Loopback1.
+ type: str
+ default: VXLAN_TUNNEL_SOURCE
vtep_vvtep_ip:
documentation_options:
table: overlay-settings
diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/vtep_loopback_description.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/vtep_loopback_description.schema.yml
new file mode 100644
index 00000000000..01eb8ed8d89
--- /dev/null
+++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/vtep_loopback_description.schema.yml
@@ -0,0 +1,14 @@
+# 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:
+ vtep_loopback_description:
+ documentation_options:
+ table: overlay-settings
+ description: Customize the description on VTEP interface, typically Loopback1.
+ type: str
+ default: VXLAN_TUNNEL_SOURCE
diff --git a/python-avd/pyavd/_eos_designs/structured_config/underlay/loopback_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/underlay/loopback_interfaces.py
index 2b4333672b5..bdb28336759 100644
--- a/python-avd/pyavd/_eos_designs/structured_config/underlay/loopback_interfaces.py
+++ b/python-avd/pyavd/_eos_designs/structured_config/underlay/loopback_interfaces.py
@@ -77,7 +77,11 @@ def loopback_interfaces(self: AvdStructuredConfigUnderlay) -> list | None:
vtep_loopback = {
"name": self.shared_utils.vtep_loopback,
"description": self.shared_utils.interface_descriptions.vtep_loopback_interface(
- InterfaceDescriptionData(shared_utils=self.shared_utils, interface=self.shared_utils.vtep_loopback)
+ InterfaceDescriptionData(
+ shared_utils=self.shared_utils,
+ interface=self.shared_utils.vtep_loopback,
+ description=get(self._hostvars, "vtep_loopback_description", default="VXLAN_TUNNEL_SOURCE"),
+ )
),
"shutdown": False,
"ip_address": f"{self.shared_utils.vtep_ip}/32",
diff --git a/python-avd/pyavd/api/interface_descriptions/__init__.py b/python-avd/pyavd/api/interface_descriptions/__init__.py
index 7253290fc7f..b4cf111c424 100644
--- a/python-avd/pyavd/api/interface_descriptions/__init__.py
+++ b/python-avd/pyavd/api/interface_descriptions/__init__.py
@@ -245,23 +245,21 @@ def router_id_loopback_interface(self, data: InterfaceDescriptionData) -> str:
return data.description
- def vtep_loopback_interface(
- self,
- data: InterfaceDescriptionData, # pylint: disable=unused-argument # NOSONAR # noqa: ARG002
- ) -> str:
+ def vtep_loopback_interface(self, data: InterfaceDescriptionData) -> str:
"""
Build VTEP loopback interface description.
Available data:
+ - description
- mpls_overlay_role
- mpls_lsr
- overlay_routing_protocol
- type
"""
if template_path := self.shared_utils.interface_descriptions_templates.get("vtep_loopback_interface"):
- return self._template(template_path)
+ return self._template(template_path, vtep_loopback_description=data.description)
- return "VTEP_VXLAN_Tunnel_Source"
+ return data.description
class InterfaceDescriptionData: