From 3fba0cb7f5933e4c5df19f475330f32ef4bc0760 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 08:35:51 +1000
Subject: [PATCH 01/12] Standardise on DUT for device being tested pt1

---
 tests/integration/initial/01-interfaces.yml | 10 +++++-----
 tests/integration/initial/02-loopback.yml   | 12 ++++++------
 tests/integration/initial/03-unnumbered.yml | 12 ++++++------
 tests/integration/initial/07-router.yml     |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/integration/initial/01-interfaces.yml b/tests/integration/initial/01-interfaces.yml
index 71e3c0c659..72327143ff 100644
--- a/tests/integration/initial/01-interfaces.yml
+++ b/tests/integration/initial/01-interfaces.yml
@@ -19,10 +19,10 @@ groups:
     module: [ routing ]
     routing.static:
     - pool: loopback
-      nexthop.node: r
+      nexthop.node: dut
 
 nodes:
-  r:
+  dut:
     id: 132
     loopback: True
     eos.systemmacaddr: ca-fe-0b-ad-00-01          # Check cEOS ceos-config clab template
@@ -31,13 +31,13 @@ nodes:
   h3:
 
 links:
-- r:
+- dut:
   h1:
   bandwidth: 1000
-- r:
+- dut:
   h2:
   bandwidth: 2000
-- r:
+- dut:
     shutdown: True
   h3:
 
diff --git a/tests/integration/initial/02-loopback.yml b/tests/integration/initial/02-loopback.yml
index a7cdf73b67..694e6c0cbc 100644
--- a/tests/integration/initial/02-loopback.yml
+++ b/tests/integration/initial/02-loopback.yml
@@ -20,22 +20,22 @@ groups:
     module: [ routing ]
     routing.static:
     - pool: loopback
-      nexthop.node: r
+      nexthop.node: dut
     - pool: vrf_loopback
-      nexthop.node: r
+      nexthop.node: dut
 
 nodes:
-  r:
+  dut:
     loopback: True
   h1:
   h2:
 
 links:
-- r:
+- dut:
   h1:
-- r:
+- dut:
   h2:
-- r:
+- dut:
   type: loopback
   pool: vrf_loopback
 
diff --git a/tests/integration/initial/03-unnumbered.yml b/tests/integration/initial/03-unnumbered.yml
index f1fac02ee2..4b03531388 100644
--- a/tests/integration/initial/03-unnumbered.yml
+++ b/tests/integration/initial/03-unnumbered.yml
@@ -13,19 +13,19 @@ addressing:
     ipv6: 2001:db8:1::/48
 
 nodes:
-  r:
+  dut:
 
 links:
-- r:
+- dut:
     ipv4: True
     ipv6: True
-- r:
+- dut:
     ipv4: True
     ipv6: False
-- r:
+- dut:
     ipv6: True
     ipv4: False
-- r:
+- dut:
     ipv4: True            # IPv6 numbered from LAN pool
-- r:
+- dut:
     ipv6: True            # IPv4 numbered from LAN pool
diff --git a/tests/integration/initial/07-router.yml b/tests/integration/initial/07-router.yml
index f3b816671f..8580151fc4 100644
--- a/tests/integration/initial/07-router.yml
+++ b/tests/integration/initial/07-router.yml
@@ -12,7 +12,7 @@ addressing:
     ipv6: 2001:db8:1::/48
 
 nodes:
-  r:
+  dut:
     id: 132
     role: router
   h1:
@@ -23,9 +23,9 @@ nodes:
     provider: clab
 
 links:
-- r:
+- dut:
   h1:
-- r:
+- dut:
   h2:
 
 validate:

From 2a09f7a18bf2c88085b97af951086fef71e4cbeb Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 18:52:28 +1000
Subject: [PATCH 02/12] Standardize with dut or dut_ for vxlan integration
 tests

---
 .../vxlan/02-vxlan-bridging-multinode.yml      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/integration/vxlan/02-vxlan-bridging-multinode.yml b/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
index 0ae43cc4f3..4343977e6e 100644
--- a/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
+++ b/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
@@ -20,7 +20,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2, s3 ]
+    members: [ dut_s1, dut_s2, s3 ]
     module: [ vlan, vxlan, ospf ]
     role: router
   probes:
@@ -32,20 +32,20 @@ vlans:
   red:
     vni: 5000
     mode: bridge
-    links: [ s1-h1, s1-h1a, s2-h2, s2-h2a, s3-h3 ]
+    links: [ dut_s1-h1, s1-h1a, dut_s2-h2, s2-h2a, s3-h3 ]
   blue:
     vni: 5001
     mode: bridge
-    links: [ s1-h4, s1-h4a, s2-h5, s2-h5a, s3-h6 ]
+    links: [ dut_s1-h4, s1-h4a, dut_s2-h5, s2-h5a, s3-h6 ]
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
-- s2:
+- dut_s2:
   s3:
   mtu: 1600
-- s1:
+- dut_s1:
   s3:
   mtu: 1600
 
@@ -55,14 +55,14 @@ validate:
     wait_msg: Waiting for OSPF adjacency process to complete
     wait: ospfv2_adj_p2p
     nodes: [ s3 ]
-    plugin: ospf_neighbor(nodes.s1.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut_s1.ospf.router_id)
     stop_on_error: True
   ospf_adj_s2:
     description: Check OSPF adjacencies
     wait_msg: Waiting for OSPF adjacency process to complete
     wait: ospfv2_adj_p2p
     nodes: [ s3 ]
-    plugin: ospf_neighbor(nodes.s2.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut_s2.ospf.router_id)
     stop_on_error: True
   stp_red_s1:
     description: Waiting for STP to enable ports in red VLAN on S1

From b4d9549187092c298b4112f5d1828566707ba84a Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 18:54:23 +1000
Subject: [PATCH 03/12] Standardize with dut or dut_ for eigrp integration
 tests

---
 tests/integration/eigrp/01-eigrp-ipv4.yml | 6 +++---
 tests/integration/eigrp/02-eigrp-ipv6.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/integration/eigrp/01-eigrp-ipv4.yml b/tests/integration/eigrp/01-eigrp-ipv4.yml
index 3912259793..52c85156fe 100644
--- a/tests/integration/eigrp/01-eigrp-ipv4.yml
+++ b/tests/integration/eigrp/01-eigrp-ipv4.yml
@@ -1,7 +1,7 @@
 ---
 message: |
   Use this topology to test basic EIGRP IPv4 implementation and route
-  propagation. Two routers (r1, r2) run EIGRP AS 2 and should establish
+  propagation. Two routers (dut, r2) run EIGRP AS 2 and should establish
   adjacency and exchange routes, enabling end-to-end connectivity between
   two Linux hosts connected to the routers.
 
@@ -14,7 +14,7 @@ groups:
     device: linux
     provider: clab
   routers:
-    members: [ r1, r2 ]
+    members: [ dut, r2 ]
     module: [ eigrp ]
     eigrp.as: 2
   probes:
@@ -22,7 +22,7 @@ groups:
     device: iol
     provider: clab
 
-links: [ h1-r1, r1-r2, r2-h2 ]
+links: [ h1-dut, dut-r2, r2-h2 ]
 
 validate:
   ping_h1_h2:
diff --git a/tests/integration/eigrp/02-eigrp-ipv6.yml b/tests/integration/eigrp/02-eigrp-ipv6.yml
index 291a2786ba..7a25faca2a 100644
--- a/tests/integration/eigrp/02-eigrp-ipv6.yml
+++ b/tests/integration/eigrp/02-eigrp-ipv6.yml
@@ -1,7 +1,7 @@
 ---
 message: |
   Use this topology to test EIGRP IPv6 implementation and route propagation
-  in an IPv6-only network. Two routers (r1, r2) run EIGRP AS 2 and should
+  in an IPv6-only network. Two routers (dut, r2) run EIGRP AS 2 and should
   establish adjacency and exchange routes. Linux hosts should receive IPv6
   default routes via router advertisements, enabling end-to-end IPv6
   connectivity.
@@ -26,7 +26,7 @@ groups:
     device: linux
     provider: clab
   routers:
-    members: [ r1, r2 ]
+    members: [ dut, r2 ]
     module: [ eigrp ]
     eigrp.as: 2
   probes:
@@ -34,7 +34,7 @@ groups:
     device: iol
     provider: clab
 
-links: [ h1-r1, r1-r2, r2-h2 ]
+links: [ h1-dut, dut-r2, r2-h2 ]
 
 validate:
   ra:

From 8381fe70d24e15c9814c836194dbbfaebc42f10f Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 18:57:12 +1000
Subject: [PATCH 04/12] Standardize with dut or dut_ for lag integration tests

---
 tests/integration/lag/10-mlag.yml         | 8 ++++----
 tests/integration/lag/11-mlag-anycast.yml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/integration/lag/10-mlag.yml b/tests/integration/lag/10-mlag.yml
index ff43bfd419..fa879ba37d 100644
--- a/tests/integration/lag/10-mlag.yml
+++ b/tests/integration/lag/10-mlag.yml
@@ -6,7 +6,7 @@ message: |
 groups:
   _auto_create: true
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ lag, vlan ]
   probes:
     members: [ x1 ]
@@ -19,13 +19,13 @@ groups:
 
 vlans:
   red:
-    links: [ h1-x1, h2-s1, h3-s2 ]
+    links: [ h1-x1, h2-dut_s1, h3-dut_s2 ]
 
 links:
 - lag:
-    members: [s1-s2]
+    members: [dut_s1-dut_s2]
     mlag.peergroup: true
-- lag.members: [ x1-s1, x1-s2 ]
+- lag.members: [ x1-dut_s1, x1-dut_s2 ]
   vlan.access: red
 
 defaults.devices.dellos10.netlab_validate.lag.wait: 120
diff --git a/tests/integration/lag/11-mlag-anycast.yml b/tests/integration/lag/11-mlag-anycast.yml
index 30f2c1e3cb..ac750c5a85 100644
--- a/tests/integration/lag/11-mlag-anycast.yml
+++ b/tests/integration/lag/11-mlag-anycast.yml
@@ -8,7 +8,7 @@ message: |
 groups:
   _auto_create: true
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ lag, vlan, gateway ]
   probes:
     members: [ x1 ]
@@ -28,9 +28,9 @@ vlans:
 
 links:
 - lag:
-    members: [s1-s2]
+    members: [dut_s1-dut_s2]
     mlag.peergroup: true
-- lag.members: [ x1-s1, x1-s2 ]
+- lag.members: [ x1-dut_s1, x1-dut_s2 ]
   vlan.access: red
 
 defaults.devices.dellos10.netlab_validate.lag.wait: 120

From dd7df73508205fd84b9d9b96652692a8d34167e7 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 19:10:21 +1000
Subject: [PATCH 05/12] Standardize with dut or dut_ for evpn integration tests

---
 .../evpn/04-vxlan-central-routing.yml         | 26 +++++++++----------
 tests/integration/evpn/12-vxlan-ibgp-ebgp.yml | 18 ++++++-------
 tests/integration/evpn/14-vxlan-ebgp-ebgp.yml | 26 +++++++++----------
 .../evpn/15-vxlan-ebgp-unnumbered.yml         | 20 +++++++-------
 tests/integration/evpn/20-vxlan-irb-ospf.yml  | 16 ++++++------
 .../evpn/41-vxlan-ipv6-bridging.yml           | 26 +++++++++----------
 .../x-03-vxlan-symmetric-irb-same-vendor.yml  | 20 +++++++-------
 7 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/tests/integration/evpn/04-vxlan-central-routing.yml b/tests/integration/evpn/04-vxlan-central-routing.yml
index 84825b5f89..641a274eed 100644
--- a/tests/integration/evpn/04-vxlan-central-routing.yml
+++ b/tests/integration/evpn/04-vxlan-central-routing.yml
@@ -20,7 +20,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ l1, l2, spine ]
+    members: [ dut_l1, dut_l2, dut_spine ]
     bgp.as: 65000
     vrfs:
       customer:
@@ -32,7 +32,7 @@ groups:
         vrf: customer
         mode: bridge
   core:
-    members: [ spine ]
+    members: [ dut_spine ]
     vlans:
       red:
         mode: irb
@@ -40,41 +40,41 @@ groups:
         mode: irb
     bgp.rr: True
   x_switches:
-    members: [ l2 ]
+    members: [ dut_l2 ]
     device: frr
     provider: clab
 
 vlans:
   red:
     role: external
-    links: [ l1-h1, l2-h2 ]
+    links: [ dut_l1-h1, dut_l2-h2 ]
   blue:
     role: external
-    links: [ l1-h3, l2-h4 ]
+    links: [ dut_l1-h3, dut_l2-h4 ]
 
 links:
-- l1:
-  spine:
+- dut_l1:
+  dut_spine:
   mtu: 1600
-- l2:
-  spine:
+- dut_l2:
+  dut_spine:
   mtu: 1600
 
 validate:
   ospf_spine:
     description: Check OSPF adjacencies with spine
     wait: ospfv2_adj_p2p
-    nodes: [ l2 ]
+    nodes: [ dut_l2 ]
     wait_msg: Waiting for OSPF adjacency process to complete
-    plugin: ospf_neighbor(nodes.spine.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut_spine.ospf.router_id)
     stop_on_error: True
 
   ibgp_spine:
     description: Check IBGP adjacencies with spine
     wait: ibgp_session
-    nodes: [ l2 ]
+    nodes: [ dut_l2 ]
     wait_msg: Waiting for IGBP session
-    plugin: bgp_neighbor(node.bgp.neighbors,'spine')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_spine')
     stop_on_error: True
 
   ping_red:
diff --git a/tests/integration/evpn/12-vxlan-ibgp-ebgp.yml b/tests/integration/evpn/12-vxlan-ibgp-ebgp.yml
index 1928c9eeed..33991894c8 100644
--- a/tests/integration/evpn/12-vxlan-ibgp-ebgp.yml
+++ b/tests/integration/evpn/12-vxlan-ibgp-ebgp.yml
@@ -22,10 +22,10 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ l1, l2 ]
+    members: [ dut_l1, l2 ]
     module: [ vlan, vxlan, bgp, evpn ]
   core:
-    members: [ spine ]
+    members: [ dut_spine ]
     module: [ bgp, evpn ]
     bgp.rr: True
   x_switches:
@@ -40,21 +40,21 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ l1-h1, l2-h2 ]
+    links: [ dut_l1-h1, l2-h2 ]
 
 bgp.as: 65000
 bgp.activate.ipv4: [ ebgp ]
 defaults.bgp.warnings.missing_igp: False
 
 links:
-- l1:
+- dut_l1:
     bgp.local_as: 65201
-  spine:
+  dut_spine:
     bgp.local_as: 65100
   mtu: 1600
 - l2:
     bgp.local_as: 65202
-  spine:
+  dut_spine:
     bgp.local_as: 65100
   mtu: 1600
 
@@ -64,7 +64,7 @@ validate:
     wait: ebgp_session
     nodes: [ l2 ]
     wait_msg: Waiting for EGBP session
-    plugin: bgp_neighbor([ n for n in node.bgp.neighbors if n.type == 'ebgp'],'spine')
+    plugin: bgp_neighbor([ n for n in node.bgp.neighbors if n.type == 'ebgp'],'dut_spine')
 
   evpn_adj:
     description: Check EVPN/IBGP adjacencies with Spine
@@ -74,7 +74,7 @@ validate:
     plugin: >-
       bgp_neighbor(
         [ n for n in node.bgp.neighbors if n.type == 'ibgp'],
-        'spine',
+        'dut_spine',
         activate='evpn')
 
   ibgp_adj:
@@ -85,7 +85,7 @@ validate:
     plugin: >-
       bgp_neighbor(
         [ n for n in node.bgp.neighbors if n.type == 'ibgp'],
-        'spine',
+        'dut_spine',
         activate='ipv4',
         state='missing')
 
diff --git a/tests/integration/evpn/14-vxlan-ebgp-ebgp.yml b/tests/integration/evpn/14-vxlan-ebgp-ebgp.yml
index 8dd067f367..63e1cb69f5 100644
--- a/tests/integration/evpn/14-vxlan-ebgp-ebgp.yml
+++ b/tests/integration/evpn/14-vxlan-ebgp-ebgp.yml
@@ -21,8 +21,8 @@ bgp.community.ebgp: [ standard, extended ]      # Propagate extended community o
 bgp.sessions.ipv4: [ ebgp ]                     # ... and activate IPv4 AF only on EBGP sessions
 
 bgp.multihop.sessions:                          # Add loopback-to-loopback EBGP multihop sessions
-- l1-spine
-- l2-spine
+- dut_l1-dut_spine
+- l2-dut_spine
 
 groups:
   _auto_create: True
@@ -31,10 +31,10 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ l1, l2 ]
+    members: [ dut_l1, l2 ]
     module: [ vlan, vxlan, bgp, evpn ]
   core:
-    members: [ spine ]
+    members: [ dut_spine ]
     module: [ bgp, evpn ]
   x_switches:
     module: [ vlan, vxlan, bgp, evpn ]
@@ -48,22 +48,22 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ l1-h1, l2-h2 ]
+    links: [ dut_l1-h1, l2-h2 ]
 
 nodes:
-  spine:
+  dut_spine:
     bgp.as: 65100
-  l1:
+  dut_l1:
     bgp.as: 65200
   l2:
     bgp.as: 65201
 
 links:
-- l1:
-  spine:
+- dut_l1:
+  dut_spine:
   mtu: 1600
 - l2:
-  spine:
+  dut_spine:
   mtu: 1600
 
 validate:
@@ -72,7 +72,7 @@ validate:
     wait: ebgp_session
     nodes: [ l2 ]
     wait_msg: Waiting for EGBP session
-    plugin: bgp_neighbor([ n for n in node.bgp.neighbors if 'multihop' not in n],'spine')
+    plugin: bgp_neighbor([ n for n in node.bgp.neighbors if 'multihop' not in n],'dut_spine')
 
   evpn_adj:
     description: Check EVPN/EBGP adjacencies with Spine
@@ -82,7 +82,7 @@ validate:
     plugin: >-
       bgp_neighbor(
         [ n for n in node.bgp.neighbors if 'multihop' in n],
-        'spine',
+        'dut_spine',
         activate='evpn')
 
   ibgp_adj:
@@ -91,7 +91,7 @@ validate:
     plugin: >-
       bgp_neighbor(
         [ n for n in node.bgp.neighbors if 'multihop' in n],
-        'spine',
+        'dut_spine',
         activate='ipv4',
         state='missing')
 
diff --git a/tests/integration/evpn/15-vxlan-ebgp-unnumbered.yml b/tests/integration/evpn/15-vxlan-ebgp-unnumbered.yml
index c8f5999529..47b3e8c785 100644
--- a/tests/integration/evpn/15-vxlan-ebgp-unnumbered.yml
+++ b/tests/integration/evpn/15-vxlan-ebgp-unnumbered.yml
@@ -20,10 +20,10 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ l1, l2 ]
+    members: [ dut_l1, l2 ]
     module: [ vlan, vxlan, bgp, evpn ]
   core:
-    members: [ spine ]
+    members: [ dut_spine ]
     module: [ bgp, evpn ]
   x_switches:
     members: [ l2 ]
@@ -35,27 +35,27 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ l1-h1, l2-h2 ]
+    links: [ dut_l1-h1, l2-h2 ]
 
 evpn.as: 65000
 evpn.session: [ ibgp, ebgp ]
 bgp.community.ebgp: [ standard, extended ]
 
 nodes:
-  spine:
+  dut_spine:
     bgp.as: 65100
-  l1:
+  dut_l1:
     bgp.as: 65201
   l2:
     bgp.as: 65202
 
 links:
-- l1:
-  spine:
+- dut_l1:
+  dut_spine:
   mtu: 1600
   prefix.ipv4: True
 - l2:
-  spine:
+  dut_spine:
   mtu: 1600
   prefix.ipv4: True
 
@@ -65,12 +65,12 @@ validate:
     wait: ebgp_session
     wait_msg: Wait for interface EBGP session to be established
     nodes: [ l2 ]
-    plugin: bgp_neighbor(node.bgp.neighbors,'spine',intf=node.interfaces[0].ifname)
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_spine',intf=node.interfaces[0].ifname)
 
   evpn_af:
     description: Check EVPN AF on EBGP session with Spine
     nodes: [ l2 ]
-    plugin: bgp_neighbor(node.bgp.neighbors,'spine',intf=node.interfaces[0].ifname,activate='evpn')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_spine',intf=node.interfaces[0].ifname,activate='evpn')
     stop_on_error: True
 
   ping_red:
diff --git a/tests/integration/evpn/20-vxlan-irb-ospf.yml b/tests/integration/evpn/20-vxlan-irb-ospf.yml
index 30f72bf524..c62de59f5d 100644
--- a/tests/integration/evpn/20-vxlan-irb-ospf.yml
+++ b/tests/integration/evpn/20-vxlan-irb-ospf.yml
@@ -16,16 +16,16 @@ vrfs:
 vlans:
   red:
     vrf: tenant
-    links: [ s1-h1 ]
+    links: [ dut_s1-h1 ]
   blue:
     vrf: tenant
-    links: [ s2-h2 ]
+    links: [ dut_s2-h2 ]
   green:
     vrf: tenant
-    links: [ s1-h3 ]
+    links: [ dut_s1-h3 ]
   purple:
     vrf: tenant
-    links: [ s2-h4 ]
+    links: [ dut_s2-h4 ]
 
 vxlan.vlans: [ red, blue ]
 evpn.vlans: [ red, blue ]
@@ -37,16 +37,16 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     vlans:
       red:
       blue:
 
-nodes: [ s1, s2, h1, h2, h3, h4 ]
+nodes: [ dut_s1, dut_s2, h1, h2, h3, h4 ]
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
 
 defaults.devices.vjunos-router.netlab_validate:
diff --git a/tests/integration/evpn/41-vxlan-ipv6-bridging.yml b/tests/integration/evpn/41-vxlan-ipv6-bridging.yml
index ad71612589..82c0b1778f 100644
--- a/tests/integration/evpn/41-vxlan-ipv6-bridging.yml
+++ b/tests/integration/evpn/41-vxlan-ipv6-bridging.yml
@@ -33,7 +33,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
   x_switches:
     module: [ ospf, bgp, evpn ]
     members: [ probe ]
@@ -47,19 +47,19 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut_s1-h1, dut_s2-h2 ]
   blue:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut_s1-h3, dut_s2-h4 ]
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
-- s1-probe
-- s2-probe
+- dut_s1-probe
+- dut_s2-probe
 
 validate:
   ospf_adj_s1:
@@ -67,36 +67,36 @@ validate:
     wait: ospfv3_adj_p2p
     nodes: [ probe ]
     wait_msg: Waiting for OSPFv3 adjacency process to complete
-    plugin: ospf6_neighbor(nodes.s1.ospf.router_id)
+    plugin: ospf6_neighbor(nodes.dut_s1.ospf.router_id)
   ospf_adj_s2:
     description: Check OSPFv3 adjacencies with S2
     wait: ospfv3_adj_p2p
     nodes: [ probe ]
     wait_msg: Waiting for OSPFv3 adjacency process to complete
-    plugin: ospf6_neighbor(nodes.s2.ospf.router_id)
+    plugin: ospf6_neighbor(nodes.dut_s2.ospf.router_id)
 
   ibgp_adj_s1:
     description: Check IBGP adjacencies with S1
     wait: ibgp_session
     nodes: [ probe ]
     wait_msg: Waiting for IBGP session
-    plugin: bgp_neighbor(node.bgp.neighbors,'s1',af='ipv6')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_s1',af='ipv6')
   ibgp_adj_s2:
     description: Check IBGP adjacencies with S2
     wait: ibgp_session
     nodes: [ probe ]
     wait_msg: Waiting for IBGP session
-    plugin: bgp_neighbor(node.bgp.neighbors,'s2',af='ipv6')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_s2',af='ipv6')
 
   evpn_adj_s1:
     description: Check EVPN AF on IBGP adjacencies with S1
     nodes: [ probe ]
-    plugin: bgp_neighbor(node.bgp.neighbors,'s1',activate='evpn',af='ipv6')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_s1',activate='evpn',af='ipv6')
     stop_on_error: True
   evpn_adj_s2:
     description: Check EVPN AF on IBGP adjacencies with S2
     nodes: [ probe ]
-    plugin: bgp_neighbor(node.bgp.neighbors,'s2',activate='evpn',af='ipv6')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_s2',activate='evpn',af='ipv6')
     stop_on_error: True
 
   ping_red:
diff --git a/tests/integration/evpn/x-03-vxlan-symmetric-irb-same-vendor.yml b/tests/integration/evpn/x-03-vxlan-symmetric-irb-same-vendor.yml
index 04aa396299..bc8f5284b5 100644
--- a/tests/integration/evpn/x-03-vxlan-symmetric-irb-same-vendor.yml
+++ b/tests/integration/evpn/x-03-vxlan-symmetric-irb-same-vendor.yml
@@ -18,7 +18,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ vlan, vxlan, vrf, ospf, bgp, evpn, gateway ]
 
 bgp.as: 65000
@@ -31,39 +31,39 @@ vrfs:
 vlans:
   red:
     role: external
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut_s1-h1, dut_s2-h2 ]
     vrf: customer
     gateway: True
   blue:
     role: external
-    links: [ s1-h3 ]
+    links: [ dut_s1-h3 ]
     vrf: customer
     gateway: True
   green:
     role: external
-    links: [ s2-h4 ]
+    links: [ dut_s2-h4 ]
     vrf: customer
     gateway: True
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
 
 validate:
   ospf_adj_s1:
     description: Check OSPF adjacencies with S1
     wait: 40
-    nodes: [ s2 ]
+    nodes: [ dut_s2 ]
     wait_msg: Waiting for OSPF adjacency process to complete
-    plugin: ospf_neighbor(nodes.s1.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut_s1.ospf.router_id)
 
   ibgp_adj_s1:
     description: Check IBGP adjacencies with S1
     wait: 40
-    nodes: [ s2 ]
+    nodes: [ dut_s2 ]
     wait_msg: Waiting for IGBP session
-    plugin: bgp_neighbor(node.bgp.neighbors,'s1')
+    plugin: bgp_neighbor(node.bgp.neighbors,'dut_s1')
 
   ping_vlan:
     description: Intra-VLAN ping-based reachability test

From 31a2446e4af56720dd9493dacc009e20b28d9faa Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 19:22:06 +1000
Subject: [PATCH 06/12] Standardize with dut or dut_ for dhcp integration tests

---
 tests/integration/dhcp/01-ipv4-client.yml           | 10 +++++-----
 tests/integration/dhcp/02-ipv6-client.yml           | 10 +++++-----
 tests/integration/dhcp/03-ipv4-server.yml           |  4 ++--
 tests/integration/dhcp/04-ipv6-server.yml           |  4 ++--
 tests/integration/dhcp/11-ipv4-relay.yml            | 10 +++++-----
 tests/integration/dhcp/12-ipv6-relay.yml            | 10 +++++-----
 tests/integration/dhcp/21-ipv4-relay-vrf-global.yml |  6 +++---
 tests/integration/dhcp/31-ipv4-client-ospf.yml      |  6 +++---
 tests/integration/dhcp/32-ipv6-client-ospf.yml      |  6 +++---
 9 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/integration/dhcp/01-ipv4-client.yml b/tests/integration/dhcp/01-ipv4-client.yml
index 70206cfec1..d638b08d4d 100644
--- a/tests/integration/dhcp/01-ipv4-client.yml
+++ b/tests/integration/dhcp/01-ipv4-client.yml
@@ -13,11 +13,11 @@ plugin: [ no_dhcp_server ]
 
 groups:
   dhcp_clients:
-    members: [ c1, c2 ]
+    members: [ dut_c1, dut_c2 ]
 
 nodes:
-  c1:
-  c2:
+  dut_c1:
+  dut_c2:
   server:
     module: [ dhcp ]
     device: dnsmasq
@@ -25,9 +25,9 @@ nodes:
     provider: clab
 
 links:
-- c1:
+- dut_c1:
     ipv4: dhcp
-  c2:
+  dut_c2:
     ipv4: dhcp
     dhcp.client.default: False
   server:
diff --git a/tests/integration/dhcp/02-ipv6-client.yml b/tests/integration/dhcp/02-ipv6-client.yml
index 27d6e95bd9..c33e8a5844 100644
--- a/tests/integration/dhcp/02-ipv6-client.yml
+++ b/tests/integration/dhcp/02-ipv6-client.yml
@@ -10,15 +10,15 @@ plugin: [ no_dhcp_server ]
 
 groups:
   dhcp_clients:
-    members: [ c1, c2 ]
+    members: [ dut_c1, dut_c2 ]
 
 addressing.lan:
   ipv4: false
   ipv6: 2001:db8:cafe::/48
 
 nodes:
-  c1:
-  c2:
+  dut_c1:
+  dut_c2:
   server:
     module: [ dhcp ]
     device: dnsmasq
@@ -26,9 +26,9 @@ nodes:
     provider: clab
 
 links:
-- c1:
+- dut_c1:
     ipv6: dhcp
-  c2:
+  dut_c2:
     ipv6: dhcp
   server:
 
diff --git a/tests/integration/dhcp/03-ipv4-server.yml b/tests/integration/dhcp/03-ipv4-server.yml
index 611b5bbab4..1974a67201 100644
--- a/tests/integration/dhcp/03-ipv4-server.yml
+++ b/tests/integration/dhcp/03-ipv4-server.yml
@@ -14,7 +14,7 @@ groups:
 nodes:
   c1:
   c2:
-  server:
+  dut:
     module: [ dhcp ]
     dhcp.server: true
 
@@ -23,7 +23,7 @@ links:
     ipv4: dhcp
   c2:
     ipv4: dhcp
-  server:
+  dut:
 
 validate:
   get_lease:
diff --git a/tests/integration/dhcp/04-ipv6-server.yml b/tests/integration/dhcp/04-ipv6-server.yml
index e21226716d..301b2d07af 100644
--- a/tests/integration/dhcp/04-ipv6-server.yml
+++ b/tests/integration/dhcp/04-ipv6-server.yml
@@ -18,7 +18,7 @@ groups:
 nodes:
   c1:
   c2:
-  server:
+  dut:
     module: [ dhcp ]
     dhcp.server: true
 
@@ -27,7 +27,7 @@ links:
     ipv6: dhcp
   c2:
     ipv6: dhcp
-  server:
+  dut:
 
 validate:
   lease:
diff --git a/tests/integration/dhcp/11-ipv4-relay.yml b/tests/integration/dhcp/11-ipv4-relay.yml
index 60ffcfc339..162f9d2a06 100644
--- a/tests/integration/dhcp/11-ipv4-relay.yml
+++ b/tests/integration/dhcp/11-ipv4-relay.yml
@@ -21,7 +21,7 @@ groups:
     provider: clab
 
 nodes:
-  relay:
+  dut:
     module: [ dhcp ]
     role: router
 
@@ -30,16 +30,16 @@ links:
     ipv4: dhcp
   c2:
     ipv4: dhcp
-  relay:
+  dut:
     dhcp.server: s1
 - c3:
     ipv4: dhcp
   c4:
     ipv4: dhcp
-  relay:
+  dut:
     dhcp.server: s2
-- relay-s1
-- relay-s2
+- dut-s1
+- dut-s2
 
 validate:
   get_lease:
diff --git a/tests/integration/dhcp/12-ipv6-relay.yml b/tests/integration/dhcp/12-ipv6-relay.yml
index 11fd844715..67dc88481e 100644
--- a/tests/integration/dhcp/12-ipv6-relay.yml
+++ b/tests/integration/dhcp/12-ipv6-relay.yml
@@ -24,7 +24,7 @@ groups:
     provider: clab
 
 nodes:
-  relay:
+  dut:
     module: [ dhcp ]
 
 links:
@@ -32,16 +32,16 @@ links:
     ipv6: dhcp
   c2:
     ipv6: dhcp
-  relay:
+  dut:
     dhcp.server: s1
 - c3:
     ipv6: dhcp
   c4:
     ipv6: dhcp
-  relay:
+  dut:
     dhcp.server: s2
-- relay-s1
-- relay-s2
+- dut-s1
+- dut-s2
 
 validate:
   address:
diff --git a/tests/integration/dhcp/21-ipv4-relay-vrf-global.yml b/tests/integration/dhcp/21-ipv4-relay-vrf-global.yml
index 5204d3fe5f..b7fbb9a651 100644
--- a/tests/integration/dhcp/21-ipv4-relay-vrf-global.yml
+++ b/tests/integration/dhcp/21-ipv4-relay-vrf-global.yml
@@ -22,7 +22,7 @@ groups:
     role: host
 
 nodes:
-  relay:
+  dut:
     module: [ dhcp, vrf ]
 
 vrfs:
@@ -33,12 +33,12 @@ links:
     ipv4: dhcp
   c2:
     ipv4: dhcp
-  relay:
+  dut:
     dhcp.server: server
     dhcp.vrf: global
   vrf: c_vrf
 
-- relay-server
+- dut-server
 
 validate:
   get_lease:
diff --git a/tests/integration/dhcp/31-ipv4-client-ospf.yml b/tests/integration/dhcp/31-ipv4-client-ospf.yml
index 94710cf5b4..dc37239841 100644
--- a/tests/integration/dhcp/31-ipv4-client-ospf.yml
+++ b/tests/integration/dhcp/31-ipv4-client-ospf.yml
@@ -11,7 +11,7 @@ module: [ dhcp ]
 groups:
   _auto_create: true
   clients:
-    members: [ c1, c2 ]
+    members: [ dut_c1, dut_c2 ]
     module: [ ospf, dhcp ]
   servers:
     members: [ server ]
@@ -26,9 +26,9 @@ nodes:
     module: [ ospf, dhcp ]
 
 links:
-- c1:
+- dut_c1:
     ipv4: dhcp
-  c2:
+  dut_c2:
     ipv4: dhcp
   relay:
     dhcp.server: server
diff --git a/tests/integration/dhcp/32-ipv6-client-ospf.yml b/tests/integration/dhcp/32-ipv6-client-ospf.yml
index 4a84fe8a3d..43837649e5 100644
--- a/tests/integration/dhcp/32-ipv6-client-ospf.yml
+++ b/tests/integration/dhcp/32-ipv6-client-ospf.yml
@@ -15,7 +15,7 @@ module: [ dhcp ]
 groups:
   _auto_create: true
   clients:
-    members: [ c1, c2 ]
+    members: [ dut_c1, dut_c2 ]
     module: [ ospf, dhcp ]
   servers:
     members: [ server ]
@@ -30,9 +30,9 @@ nodes:
     module: [ ospf, dhcp ]
 
 links:
-- c1:
+- dut_c1:
     ipv6: dhcp
-  c2:
+  dut_c2:
     ipv6: dhcp
   relay:
     dhcp.server: server

From 035fb2c46e0d49a54c4a1d05b3d2e50c867251b6 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 19:45:09 +1000
Subject: [PATCH 07/12] Standardize with dut or dut_ for vlan integration tests

---
 .../vlan/01-vlan-bridge-single.yml            |  6 +-
 .../vlan/02-vlan-bridge-multiple.yml          |  6 +-
 tests/integration/vlan/21-vlan-irb-single.yml | 14 ++--
 .../integration/vlan/22-vlan-irb-multiple.yml |  6 +-
 .../vlan/23-vlan-mixed-multiple.yml           |  8 +--
 .../{31-s2-native.py => 31-dut_s2-native.py}  |  0
 .../integration/vlan/31-vlan-bridge-trunk.yml | 16 ++---
 .../vlan/32-vlan-bridge-trunk-router.yml      | 10 +--
 tests/integration/vlan/33-vlan-irb-trunk.yml  | 12 ++--
 .../vlan/41-vlan-bridge-native.yml            | 10 +--
 tests/integration/vlan/42-vlan-irb-native.yml | 12 ++--
 .../integration/vlan/51-vlan-routed-trunk.yml | 16 ++---
 tests/integration/vlan/52-vlan-vrf-lite.yml   | 64 +++++++++----------
 .../vlan/61-vlan-routed-native.yml            | 16 ++---
 .../integration/vlan/62-vlan-mixed-trunk.yml  | 10 +--
 .../integration/vlan/63-vlan-mixed-native.yml | 10 +--
 tests/integration/vlan/70-vlan-1-trunk.yml    | 14 ++--
 17 files changed, 115 insertions(+), 115 deletions(-)
 rename tests/integration/vlan/{31-s2-native.py => 31-dut_s2-native.py} (100%)

diff --git a/tests/integration/vlan/01-vlan-bridge-single.yml b/tests/integration/vlan/01-vlan-bridge-single.yml
index 957fc6cead..a05e64fcac 100644
--- a/tests/integration/vlan/01-vlan-bridge-single.yml
+++ b/tests/integration/vlan/01-vlan-bridge-single.yml
@@ -14,15 +14,15 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
 
 vlans:
   red:
     mode: bridge
-    links: [ s1-h1, s1-h2 ]
+    links: [ dut-h1, dut-h2 ]
 
-links: [ s1-h3 ]
+links: [ dut-h3 ]
 
 validate:
   ping:
diff --git a/tests/integration/vlan/02-vlan-bridge-multiple.yml b/tests/integration/vlan/02-vlan-bridge-multiple.yml
index c2f9678e07..5e0f8703af 100644
--- a/tests/integration/vlan/02-vlan-bridge-multiple.yml
+++ b/tests/integration/vlan/02-vlan-bridge-multiple.yml
@@ -17,7 +17,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
 
 vlans:
@@ -25,12 +25,12 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h1, s1-h2 ]
+    links: [ dut-h1, dut-h2 ]
   blue:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h3, s1-h4 ]
+    links: [ dut-h3, dut-h4 ]
 
 validate:
   ping_red:
diff --git a/tests/integration/vlan/21-vlan-irb-single.yml b/tests/integration/vlan/21-vlan-irb-single.yml
index b647ac46d2..9da5d86ea0 100644
--- a/tests/integration/vlan/21-vlan-irb-single.yml
+++ b/tests/integration/vlan/21-vlan-irb-single.yml
@@ -3,7 +3,7 @@ message: |
   The device under test is a layer-3 switch bridging VLAN
   between ports and having an IP address in the red VLAN
 
-  h1 and h2 should be able to ping s1 and each other
+  h1 and h2 should be able to ping dut and each other
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
@@ -17,18 +17,18 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     role: router
     module: [ vlan ]
 
 nodes:
-  s1.id: 132
+  dut.id: 132
 
 vlans:
   red:
-    links: [ s1-h1, s1-h2 ]
+    links: [ dut-h1, dut-h2 ]
 
-links: [ s1-h3 ]
+links: [ dut-h3 ]
 
 validate:
   ping_host:
@@ -42,7 +42,7 @@ validate:
     wait_msg: Waiting for IRB interface to become ready
     wait: ping_irb
     nodes: [ h1, h2 ]
-    plugin: ping('s1',af='ipv4')
+    plugin: ping('dut',af='ipv4')
   ra:
     description: Check RA-generated default route
     wait: ra_send
@@ -56,7 +56,7 @@ validate:
     level: warning
     wait: ping
     nodes: [ h1, h2 ]
-    plugin: ping('s1',af='ipv6')
+    plugin: ping('dut',af='ipv6')
   ping_h3:
     description: Inter-subnet reachability
     nodes: [ h1, h2 ]
diff --git a/tests/integration/vlan/22-vlan-irb-multiple.yml b/tests/integration/vlan/22-vlan-irb-multiple.yml
index c2deb5ece8..fc405e08e8 100644
--- a/tests/integration/vlan/22-vlan-irb-multiple.yml
+++ b/tests/integration/vlan/22-vlan-irb-multiple.yml
@@ -18,15 +18,15 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
     role: router
 
 vlans:
   red:
-    links: [ s1-h1, s1-h2 ]
+    links: [ dut-h1, dut-h2 ]
   blue:
-    links: [ s1-h3, s1-h4 ]
+    links: [ dut-h3, dut-h4 ]
 
 validate:
   ping_red:
diff --git a/tests/integration/vlan/23-vlan-mixed-multiple.yml b/tests/integration/vlan/23-vlan-mixed-multiple.yml
index f4d663dcb0..0aa654748f 100644
--- a/tests/integration/vlan/23-vlan-mixed-multiple.yml
+++ b/tests/integration/vlan/23-vlan-mixed-multiple.yml
@@ -16,18 +16,18 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
     role: router
 
 vlans:
   red:
     mode: bridge
-    links: [ s1-h1, s1-h2 ]
+    links: [ dut-h1, dut-h2 ]
   blue:
-    links: [ s1-h3 ]
+    links: [ dut-h3 ]
   green:
-    links: [ s1-h4 ]
+    links: [ dut-h4 ]
 
 validate:
   intra:
diff --git a/tests/integration/vlan/31-s2-native.py b/tests/integration/vlan/31-dut_s2-native.py
similarity index 100%
rename from tests/integration/vlan/31-s2-native.py
rename to tests/integration/vlan/31-dut_s2-native.py
diff --git a/tests/integration/vlan/31-vlan-bridge-trunk.yml b/tests/integration/vlan/31-vlan-bridge-trunk.yml
index aeb77d09f4..e7dbfef4bd 100644
--- a/tests/integration/vlan/31-vlan-bridge-trunk.yml
+++ b/tests/integration/vlan/31-vlan-bridge-trunk.yml
@@ -12,7 +12,7 @@ message: |
   Please note it might take a while for the lab to work due to
   STP learning phase
 
-plugin: [ 31-s2-native ]
+plugin: [ 31-dut_s2-native ]
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
@@ -23,10 +23,10 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ vlan ]
   probes:
-    members: [ s2 ]
+    members: [ dut_s2 ]
     device: eos
     provider: clab
 
@@ -35,22 +35,22 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut_s1-h1, dut_s2-h2 ]
   blue:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut_s1-h3, dut_s2-h4 ]
   untagged: # Untagged links to test that device isn't passing the default VLAN on the trunk
     id: 1
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h5, s2-h6 ]
+    links: [ dut_s1-h5, dut_s2-h6 ]
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   vlan.trunk: [ red, blue ]
 
 validate:
diff --git a/tests/integration/vlan/32-vlan-bridge-trunk-router.yml b/tests/integration/vlan/32-vlan-bridge-trunk-router.yml
index 11f6f63b77..0cda471bae 100644
--- a/tests/integration/vlan/32-vlan-bridge-trunk-router.yml
+++ b/tests/integration/vlan/32-vlan-bridge-trunk-router.yml
@@ -17,7 +17,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ vlan ]
   routers:
     members: [ r1 ]
@@ -27,14 +27,14 @@ groups:
 vlans:
   red:
     mode: bridge
-    links: [ s1-h1, r1-s2 ]
+    links: [ dut_s1-h1, r1-dut_s2 ]
   blue:
     mode: bridge
-    links: [ s1-h2, r1-s2 ]
+    links: [ dut_s1-h2, r1-dut_s2 ]
 
 links:
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   vlan.trunk: [ red, blue ]
 
 validate:
diff --git a/tests/integration/vlan/33-vlan-irb-trunk.yml b/tests/integration/vlan/33-vlan-irb-trunk.yml
index 6d80f9a1c2..02fb8a47bf 100644
--- a/tests/integration/vlan/33-vlan-irb-trunk.yml
+++ b/tests/integration/vlan/33-vlan-irb-trunk.yml
@@ -20,7 +20,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
     role: router
   probes:
@@ -32,12 +32,12 @@ groups:
 
 vlans:
   red:
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut-h1, s2-h2 ]
   blue:
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut-h3, s2-h4 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, blue ]
 
@@ -60,8 +60,8 @@ validate:
     wait_msg: Waiting for IRB interface to become ready
     nodes: [ h1, h2, h3 ]
     plugin: ping('h4')
-  ping_s1:
+  ping_dut:
     description: Ping default gateway (S1)
     wait: ping_irb
     nodes: [ h1, h2, h3, h4 ]
-    plugin: ping('s1')
+    plugin: ping('dut')
diff --git a/tests/integration/vlan/41-vlan-bridge-native.yml b/tests/integration/vlan/41-vlan-bridge-native.yml
index e4e2a21f70..de31323dff 100644
--- a/tests/integration/vlan/41-vlan-bridge-native.yml
+++ b/tests/integration/vlan/41-vlan-bridge-native.yml
@@ -23,7 +23,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
   probes:
     members: [ s2 ]
@@ -36,20 +36,20 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut-h1, s2-h2 ]
   blue:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut-h3, s2-h4 ]
   green: # VLAN not in trunk, to test for devices opening the trunk to more vlans than requested
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-h5, s2-h6 ]
+    links: [ dut-h5, s2-h6 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, blue ]
   vlan.native: red
diff --git a/tests/integration/vlan/42-vlan-irb-native.yml b/tests/integration/vlan/42-vlan-irb-native.yml
index 38661c6fba..75396b9093 100644
--- a/tests/integration/vlan/42-vlan-irb-native.yml
+++ b/tests/integration/vlan/42-vlan-irb-native.yml
@@ -21,7 +21,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan ]
     role: router
   probes:
@@ -33,12 +33,12 @@ groups:
 
 vlans:
   red:
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut-h1, s2-h2 ]
   blue:
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut-h3, s2-h4 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, blue ]
   vlan.native: red
@@ -62,7 +62,7 @@ validate:
     wait_msg: Waiting for IRB interface to become ready
     nodes: [ h1, h2, h3 ]
     plugin: ping('h4')
-  ping_s1:
+  ping_dut:
     description: Ping default gateway (S1)
     nodes: [ h1, h2, h3, h4 ]
-    plugin: ping('s1')
+    plugin: ping('dut')
diff --git a/tests/integration/vlan/51-vlan-routed-trunk.yml b/tests/integration/vlan/51-vlan-routed-trunk.yml
index 96cefbdef9..029b04da17 100644
--- a/tests/integration/vlan/51-vlan-routed-trunk.yml
+++ b/tests/integration/vlan/51-vlan-routed-trunk.yml
@@ -3,7 +3,7 @@ message: |
   A router-on-a-stick is attached to a VLAN trunk and runs OSPF
   on all attached VLANs
 
-  * r1, r2, and ros should be able to ping each other
+  * r1, r2, and dut should be able to ping each other
 
   Please note it might take a while for the lab to work due to
   STP and OSPF setup phase
@@ -18,7 +18,7 @@ groups:
     device: frr
     provider: clab
   routers:
-    members: [ r1, r2, ros ]
+    members: [ r1, r2, dut ]
     module: [ ospf ]
     role: router
   external:
@@ -33,7 +33,7 @@ vlans:
     links: [ r2-s1 ]
 
 nodes:
-  ros:
+  dut:
     module: [ ospf, vlan ]
     vlan.mode: route
     role: router
@@ -43,7 +43,7 @@ links:
   s2:
   vlan.trunk: [ red, blue ]
 - s2:
-  ros:
+  dut:
   vlan.trunk: [ red, blue ]
 
 validate:
@@ -52,15 +52,15 @@ validate:
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ r1, r2 ]
-    plugin: ospf_neighbor(nodes.ros.ospf.router_id)
-  ping_ros:
+    plugin: ospf_neighbor(nodes.dut.ospf.router_id)
+  ping_dut:
     description: Reaching router-on-stick
     wait: ping_long
     wait_msg: Waiting for OSPF SPF to do its magic
     nodes: [ r1 ]
-    plugin: ping('ros',src=nodes.r1.loopback.ipv4)
+    plugin: ping('dut',src=nodes.r1.loopback.ipv4)
   ping_x:
-    description: Cross-VLAN reachability
+    description: Cduts-VLAN reachability
     wait: ping
     wait_msg: Waiting for OSPF SPF to do its magic
     nodes: [ r1 ]
diff --git a/tests/integration/vlan/52-vlan-vrf-lite.yml b/tests/integration/vlan/52-vlan-vrf-lite.yml
index dd65aabfd1..b7184ac15b 100644
--- a/tests/integration/vlan/52-vlan-vrf-lite.yml
+++ b/tests/integration/vlan/52-vlan-vrf-lite.yml
@@ -19,7 +19,7 @@ defaults.sources.extra: [ ../vrf/defaults-ipv6-only.yml, ../wait_times.yml, ../w
 groups:
   _auto_create: True
   routers:
-    members: [ r1, r2, r3 ]
+    members: [ dut_a, r2, dut_b ]
     module: [ ospf, vrf, vlan ]
     role: router
   x_routers:
@@ -39,69 +39,69 @@ vlans:
   red:
     mode: route
     vrf: red
-    links: [ r1-h1, r3-h2, r1-h5 ]
+    links: [ dut_a-h1, dut_b-h2, dut_a-h5 ]
   blue:
     mode: route
     vrf: blue
-    links: [ r1-h3, r3-h4 ]
+    links: [ dut_a-h3, dut_b-h4 ]
 
 links:
-- r1:
+- dut_a:
   r2:
   vlan.trunk: [ red, blue ]
 - r2:
-  r3:
+  dut_b:
   vlan.trunk: [ red, blue ]
 
 validate:
-  adj_v2_r1_b:
-    description: Check OSPFv2 adjacencies (R2-R1)
-    wait_msg: Waiting for OSPFv2 adjacencies to form
+  adj_dut_a_blue:
+    description: Check OSPF adjacencies VRF Blue (R2-DUT_A)
+    wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ r2 ]
-    plugin: ospf_neighbor(nodes.r1.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v2_r1_r:
-    description: Check OSPFv2 adjacencies (R2-R1)
-    wait_msg: Waiting for OSPFv2 adjacencies to form
+    plugin: ospf_neighbor(nodes.dut_a.vrfs.blue.ospf.router_id,vrf='blue')
+  adj_dut_a_red:
+    description: Check OSPF adjacencies VRF Red (R2-DUT_B)
+    wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
-    plugin: ospf_neighbor(nodes.r1.vrfs.red.ospf.router_id,vrf='red')
-  adj_v2_r3_b:
-    description: Check OSPFv2 adjacencies (R2-R3)
-    wait_msg: Waiting for OSPFv2 adjacencies to form
+    plugin: ospf_neighbor(nodes.dut_a.vrfs.red.ospf.router_id,vrf='red')
+  adj_dut_b_blue:
+    description: Check OSPF adjacencies VRT Blue (R2-DUT_B)
+    wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
-    plugin: ospf_neighbor(nodes.r3.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v2_r3_r:
-    description: Check OSPFv2 adjacencies (R2-R3)
+    plugin: ospf_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
+  adj_v2_dut_a_red:
+    description: Check OSPFv2 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv2 adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
-    plugin: ospf_neighbor(nodes.r3.vrfs.red.ospf.router_id,vrf='red')
-  adj_v3_r1_b:
-    description: Check OSPFv3 adjacencies (R2-R1)
+    plugin: ospf_neighbor(nodes.dut_b.vrfs.red.ospf.router_id,vrf='red')
+  adj_v3_dut_b_blue:
+    description: Check OSPFv3 adjacencies VRF Blue (R2-DUT_A)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_stp
     nodes: [ r2 ]
-    plugin: ospf6_neighbor(nodes.r1.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v3_r1_r:
-    description: Check OSPFv3 adjacencies (R2-R1)
+    plugin: ospf6_neighbor(nodes.dut_a.vrfs.blue.ospf.router_id,vrf='blue')
+  adj_v3_dut_a_red:
+    description: Check OSPFv3 adjacencies VRF Red (R2-DUT_A)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
-    plugin: ospf6_neighbor(nodes.r1.vrfs.red.ospf.router_id,vrf='red')
-  adj_v3_r3_b:
-    description: Check OSPFv3 adjacencies (R2-R3)
+    plugin: ospf6_neighbor(nodes.dut_a.vrfs.red.ospf.router_id,vrf='red')
+  adj_v3_dut_b_blue:
+    description: Check OSPFv3 adjacencies VRF Blue (R2-DUT_B)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
-    plugin: ospf6_neighbor(nodes.r3.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v3_r3_r:
-    description: Check OSPFv3 adjacencies (R2-R3)
+    plugin: ospf6_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
+  adj_v3_dut_a_red:
+    description: Check OSPFv3 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
-    plugin: ospf6_neighbor(nodes.r3.vrfs.red.ospf.router_id,vrf='red')
+    plugin: ospf6_neighbor(nodes.dut_b.vrfs.red.ospf.router_id,vrf='red')
   red_v4:
     description: IPv4 intra-VLAN reachability (red)
     wait_msg: Waiting for STP forwarding state
diff --git a/tests/integration/vlan/61-vlan-routed-native.yml b/tests/integration/vlan/61-vlan-routed-native.yml
index 106e58d85a..485d2b9cfe 100644
--- a/tests/integration/vlan/61-vlan-routed-native.yml
+++ b/tests/integration/vlan/61-vlan-routed-native.yml
@@ -3,7 +3,7 @@ message: |
   A router-on-a-stick is attached to a VLAN trunk and runs OSPF on all attached
   VLANs. One of the VLANs is a native VLAN between router-on-stick and switch.
 
-  * r1, r2, and ros should be able to ping each other
+  * r1, r2, and dut should be able to ping each other
 
   Please note it might take a while for the lab to work due to
   STP and OSPF setup phase
@@ -18,7 +18,7 @@ groups:
     device: frr
     provider: clab
   routers:
-    members: [ r1, r2, ros ]
+    members: [ r1, r2, dut ]
     module: [ ospf ]
   external:
     members: [ r1, r2 ]
@@ -32,7 +32,7 @@ vlans:
     links: [ r2-s1 ]
 
 nodes:
-  ros:
+  dut:
     module: [ ospf, vlan ]
     vlan.mode: route
     role: router
@@ -42,7 +42,7 @@ links:
   s2:
   vlan.trunk: [ red, blue ]
 - s2:
-  ros:
+  dut:
   vlan.trunk: [ red, blue ]
   vlan.native: red
 
@@ -52,15 +52,15 @@ validate:
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ r1, r2 ]
-    plugin: ospf_neighbor(nodes.ros.ospf.router_id)
-  ping_ros:
+    plugin: ospf_neighbor(nodes.dut.ospf.router_id)
+  ping_dut:
     description: Reaching router-on-stick
     wait: ospfv2_adj_lan
     wait_msg: Waiting for OSPF SPF to do its magic
     nodes: [ r1 ]
-    plugin: ping('ros',src=nodes.r1.loopback.ipv4)
+    plugin: ping('dut',src=nodes.r1.loopback.ipv4)
   ping_x:
-    description: Cross-VLAN reachability
+    description: Cduts-VLAN reachability
     wait: ping_long
     wait_msg: Waiting for OSPF SPF to do its magic
     nodes: [ r1 ]
diff --git a/tests/integration/vlan/62-vlan-mixed-trunk.yml b/tests/integration/vlan/62-vlan-mixed-trunk.yml
index cee949efe9..843aa4b2a9 100644
--- a/tests/integration/vlan/62-vlan-mixed-trunk.yml
+++ b/tests/integration/vlan/62-vlan-mixed-trunk.yml
@@ -16,7 +16,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan, ospf ]
     role: router
   probes:
@@ -28,13 +28,13 @@ groups:
 vlans:
   red:
     mode: bridge
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut-h1, s2-h2 ]
   blue:
     mode: route
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut-h3, s2-h4 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, blue ]
 
@@ -44,7 +44,7 @@ validate:
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ s2 ]
-    plugin: ospf_neighbor(nodes.s1.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   red:
     description: Intra-VLAN reachability (red)
     wait: ospfv2_adj_stp
diff --git a/tests/integration/vlan/63-vlan-mixed-native.yml b/tests/integration/vlan/63-vlan-mixed-native.yml
index 1b483750c2..4384d0e3e5 100644
--- a/tests/integration/vlan/63-vlan-mixed-native.yml
+++ b/tests/integration/vlan/63-vlan-mixed-native.yml
@@ -18,7 +18,7 @@ groups:
     device: linux
     provider: clab
   switches:
-    members: [ s1 ]
+    members: [ dut ]
     module: [ vlan, ospf ]
     role: router
   probes:
@@ -30,13 +30,13 @@ groups:
 vlans:
   red:
     mode: bridge
-    links: [ s1-h1, s2-h2 ]
+    links: [ dut-h1, s2-h2 ]
   blue:
     mode: route
-    links: [ s1-h3, s2-h4 ]
+    links: [ dut-h3, s2-h4 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, blue ]
   vlan.native: blue
@@ -47,7 +47,7 @@ validate:
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ s2 ]
-    plugin: ospf_neighbor(nodes.s1.ospf.router_id)
+    plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   red:
     description: Intra-VLAN reachability (red)
     wait: ping_stp
diff --git a/tests/integration/vlan/70-vlan-1-trunk.yml b/tests/integration/vlan/70-vlan-1-trunk.yml
index 4bb7161233..dac0df271b 100644
--- a/tests/integration/vlan/70-vlan-1-trunk.yml
+++ b/tests/integration/vlan/70-vlan-1-trunk.yml
@@ -18,7 +18,7 @@ defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 groups:
   _auto_create: True
   switches:
-    members: [ s1, s2, s3, s4 ]
+    members: [ dut, s2, s3, s4 ]
     module: [ vlan ]
   hosts:
     members: [ r1, r2, r3, r4, d1, d2, d3, d4 ]
@@ -29,7 +29,7 @@ groups:
     device: frr
 
 nodes:
-  s1:
+  dut:
     id: 1
 
 vlans:
@@ -37,23 +37,23 @@ vlans:
     mode: bridge
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-r1, s2-r2, s3-r3, s4-r4 ]
+    links: [ dut-r1, s2-r2, s3-r3, s4-r4 ]
   vlan_1:
     id: 1
     mode: irb
     prefix:
       ipv4: 172.31.1.0/24
-    links: [ s1-d1, s2-d2, s3-d3, s4-d4 ]
+    links: [ dut-d1, s2-d2, s3-d3, s4-d4 ]
 
 links:
-- s1:
+- dut:
   s2:
   vlan.trunk: [ red, vlan_1 ]             # Both VLANs are tagged
-- s1:
+- dut:
   s3:
   vlan.trunk: [ red, vlan_1 ]
   vlan.native: vlan_1                     # VLAN 1 is untagged
-- s1:
+- dut:
   s4:
   vlan.trunk: [ red, vlan_1 ]
   vlan.native: red                        # VLAN 1 is tagged, VLAN red is untagged

From 6915b58741ff9d62df256bafe11b31bd84423d59 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 19:50:02 +1000
Subject: [PATCH 08/12] Standardize with dut or dut_ for evpn.multihoming
 integration tests

---
 tests/integration/evpn.multihoming/01-esi-lag.yml  | 14 +++++++-------
 .../evpn.multihoming/02-esi-lag-auto-id.yml        | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/integration/evpn.multihoming/01-esi-lag.yml b/tests/integration/evpn.multihoming/01-esi-lag.yml
index 431f488327..99af241abc 100644
--- a/tests/integration/evpn.multihoming/01-esi-lag.yml
+++ b/tests/integration/evpn.multihoming/01-esi-lag.yml
@@ -15,7 +15,7 @@ evpn.ethernet_segments:
 groups:
   _auto_create: true
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ vlan, vxlan, ospf, bgp, evpn, lag ]
     evpn._junos_default_macvrf: true  # let's keep it simple for now
   probes:
@@ -30,27 +30,27 @@ groups:
 vlans:
   red:
     mode: bridge
-    links: [ h1-x1, h2-s1, h3-s2 ]
+    links: [ h1-x1, h2-dut_s1, h3-dut_s2 ]
 
 links:
 # EVPN/VXLAN Link
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
 # ESI-LAG
 - lag:
     members:
-    - s1:
+    - dut_s1:
         lag.lacp_system_id: 1
         evpn.es: seg_1
       x1:
-    - s2:
+    - dut_s2:
         lag.lacp_system_id: 1
         evpn.es: seg_1
       x1:
   vlan.access: red
 
-defaults.devices.dellos10.netlab_validate.lag.wait: 120
+defaults.devices.dellodut_s10.netlab_validate.lag.wait: 120
 
 validate:
   lag:
diff --git a/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml b/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
index 11a3d7e1ab..03af557dbe 100644
--- a/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
+++ b/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
@@ -13,7 +13,7 @@ bgp.as: 65000
 groups:
   _auto_create: true
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ vlan, vxlan, ospf, bgp, evpn, lag ]
     evpn._junos_default_macvrf: true  # let's keep it simple for now
   probes:
@@ -28,25 +28,25 @@ groups:
 vlans:
   red:
     mode: bridge
-    links: [ h1-x1, h2-s1, h3-s2 ]
+    links: [ h1-x1, h2-dut_s1, h3-dut_s2 ]
 
 links:
 # EVPN/VXLAN Link
-- s1:
-  s2:
+- dut_s1:
+  dut_s2:
   mtu: 1600
 # ESI-LAG
 - lag:
     members:
-    - s1:
+    - dut_s1:
         evpn.es: seg_auto_1
       x1:
-    - s2:
+    - dut_s2:
         evpn.es: seg_auto_1
       x1:
   vlan.access: red
 
-defaults.devices.dellos10.netlab_validate.lag.wait: 120
+defaults.devices.dellodut_s10.netlab_validate.lag.wait: 120
 
 validate:
   lag:

From 55ee68eb54fd4e7935337ff8dc8f740fd50aa65b Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 19:50:28 +1000
Subject: [PATCH 09/12] Standardize with dut or dut_ for lag integration tests
 missed one

---
 tests/integration/lag/x-12-mlag-dual-cross.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/lag/x-12-mlag-dual-cross.yml b/tests/integration/lag/x-12-mlag-dual-cross.yml
index 525b4162ff..6b57ce7ad3 100644
--- a/tests/integration/lag/x-12-mlag-dual-cross.yml
+++ b/tests/integration/lag/x-12-mlag-dual-cross.yml
@@ -6,7 +6,7 @@ message: |
 groups:
   _auto_create: true
   switches:
-    members: [ s1, s2 ]
+    members: [ dut_s1, dut_s2 ]
     module: [ lag, vlan ]
   probes:
     members: [ x1, x2 ]
@@ -19,16 +19,16 @@ groups:
 
 vlans:
   red:
-    links: [ h1-x1, h2-s1, h3-s2, h4-x2 ]
+    links: [ h1-x1, h2-dut_s1, h3-dut_s2, h4-x2 ]
 
 links:
 - lag:
-    members: [s1-s2]
+    members: [dut_s1-dut_s2]
     mlag.peergroup: true
 - lag:
     members: [x1-x2]
     mlag.peergroup: true
-- lag.members: [ x1-s1, x1-s2, x2-s1, x2-s2 ]
+- lag.members: [ x1-dut_s1, x1-dut_s2, x2-dut_s1, x2-dut_s2 ]
   vlan.access: red
 
 validate:

From 14a56e8b45c7ace3acf6985119404f77d5262c03 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Sun, 28 Jun 2026 20:44:52 -0400
Subject: [PATCH 10/12] Fix renaming typos

---
 tests/integration/vlan/52-vlan-vrf-lite.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/vlan/52-vlan-vrf-lite.yml b/tests/integration/vlan/52-vlan-vrf-lite.yml
index b7184ac15b..57b5ddf227 100644
--- a/tests/integration/vlan/52-vlan-vrf-lite.yml
+++ b/tests/integration/vlan/52-vlan-vrf-lite.yml
@@ -72,13 +72,13 @@ validate:
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v2_dut_a_red:
+  adj_v2_dut_b_red:
     description: Check OSPFv2 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv2 adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_b.vrfs.red.ospf.router_id,vrf='red')
-  adj_v3_dut_b_blue:
+  adj_v3_dut_a_blue:
     description: Check OSPFv3 adjacencies VRF Blue (R2-DUT_A)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_stp

From b13d59368eee224fe5f2f8642dc22e281952cc3b Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Sun, 28 Jun 2026 21:23:30 -0400
Subject: [PATCH 11/12] Another typo..

---
 tests/integration/vlan/52-vlan-vrf-lite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/vlan/52-vlan-vrf-lite.yml b/tests/integration/vlan/52-vlan-vrf-lite.yml
index 57b5ddf227..d7239d710f 100644
--- a/tests/integration/vlan/52-vlan-vrf-lite.yml
+++ b/tests/integration/vlan/52-vlan-vrf-lite.yml
@@ -96,7 +96,7 @@ validate:
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
     plugin: ospf6_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v3_dut_a_red:
+  adj_v3_dut_b_red:
     description: Check OSPFv3 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan

From 29538778552529d0f26e00491d9416b3f3229bd8 Mon Sep 17 00:00:00 2001
From: snuffy22 <22233310+snuffy22@users.noreply.github.com>
Date: Sun, 28 Jun 2026 21:36:21 -0400
Subject: [PATCH 12/12] More typo fixes

---
 .../integration/evpn.multihoming/01-esi-lag.yml  |  2 +-
 .../evpn.multihoming/02-esi-lag-auto-id.yml      |  2 +-
 tests/integration/vlan/52-vlan-vrf-lite.yml      | 16 ++++++++--------
 .../vxlan/02-vxlan-bridging-multinode.yml        |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/integration/evpn.multihoming/01-esi-lag.yml b/tests/integration/evpn.multihoming/01-esi-lag.yml
index 99af241abc..1bbad3f924 100644
--- a/tests/integration/evpn.multihoming/01-esi-lag.yml
+++ b/tests/integration/evpn.multihoming/01-esi-lag.yml
@@ -50,7 +50,7 @@ links:
       x1:
   vlan.access: red
 
-defaults.devices.dellodut_s10.netlab_validate.lag.wait: 120
+defaults.devices.dellos10.netlab_validate.lag.wait: 120
 
 validate:
   lag:
diff --git a/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml b/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
index 03af557dbe..2fef048dc6 100644
--- a/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
+++ b/tests/integration/evpn.multihoming/02-esi-lag-auto-id.yml
@@ -46,7 +46,7 @@ links:
       x1:
   vlan.access: red
 
-defaults.devices.dellodut_s10.netlab_validate.lag.wait: 120
+defaults.devices.dellos10.netlab_validate.lag.wait: 120
 
 validate:
   lag:
diff --git a/tests/integration/vlan/52-vlan-vrf-lite.yml b/tests/integration/vlan/52-vlan-vrf-lite.yml
index d7239d710f..7a7f8dd375 100644
--- a/tests/integration/vlan/52-vlan-vrf-lite.yml
+++ b/tests/integration/vlan/52-vlan-vrf-lite.yml
@@ -54,49 +54,49 @@ links:
   vlan.trunk: [ red, blue ]
 
 validate:
-  adj_dut_a_blue:
+  adj_dut_a_b:
     description: Check OSPF adjacencies VRF Blue (R2-DUT_A)
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_stp
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_a.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_dut_a_red:
+  adj_dut_a_r:
     description: Check OSPF adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_a.vrfs.red.ospf.router_id,vrf='red')
-  adj_dut_b_blue:
+  adj_dut_b_b:
     description: Check OSPF adjacencies VRT Blue (R2-DUT_B)
     wait_msg: Waiting for OSPF adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v2_dut_b_red:
+  adj_v2_dut_b_r:
     description: Check OSPFv2 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv2 adjacencies to form
     wait: ospfv2_adj_lan
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut_b.vrfs.red.ospf.router_id,vrf='red')
-  adj_v3_dut_a_blue:
+  adj_v3_dut_a_b:
     description: Check OSPFv3 adjacencies VRF Blue (R2-DUT_A)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_stp
     nodes: [ r2 ]
     plugin: ospf6_neighbor(nodes.dut_a.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v3_dut_a_red:
+  adj_v3_dut_a_r:
     description: Check OSPFv3 adjacencies VRF Red (R2-DUT_A)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
     plugin: ospf6_neighbor(nodes.dut_a.vrfs.red.ospf.router_id,vrf='red')
-  adj_v3_dut_b_blue:
+  adj_v3_dut_b_b:
     description: Check OSPFv3 adjacencies VRF Blue (R2-DUT_B)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
     nodes: [ r2 ]
     plugin: ospf6_neighbor(nodes.dut_b.vrfs.blue.ospf.router_id,vrf='blue')
-  adj_v3_dut_b_red:
+  adj_v3_dut_b_r:
     description: Check OSPFv3 adjacencies VRF Red (R2-DUT_B)
     wait_msg: Waiting for OSPFv3 adjacencies to form
     wait: ospfv3_adj_lan
diff --git a/tests/integration/vxlan/02-vxlan-bridging-multinode.yml b/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
index 4343977e6e..5f18b17fd9 100644
--- a/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
+++ b/tests/integration/vxlan/02-vxlan-bridging-multinode.yml
@@ -32,11 +32,11 @@ vlans:
   red:
     vni: 5000
     mode: bridge
-    links: [ dut_s1-h1, s1-h1a, dut_s2-h2, s2-h2a, s3-h3 ]
+    links: [ dut_s1-h1, dut_s1-h1a, dut_s2-h2, dut_s2-h2a, s3-h3 ]
   blue:
     vni: 5001
     mode: bridge
-    links: [ dut_s1-h4, s1-h4a, dut_s2-h5, s2-h5a, s3-h6 ]
+    links: [ dut_s1-h4, dut_s1-h4a, dut_s2-h5, dut_s2-h5a, s3-h6 ]
 
 links:
 - dut_s1: