Standardise to DUT in integration tests (#3536)

Author: snuffy22

tests/integration/dhcp/01-ipv4-client.yml

@@ -13,21 +13,21 @@ plugin: [ no_dhcp_server ]
 
 groups:
   dhcp_clients:
-    members: [ c1, c2 ]
+    members: [ dutc1, dutc2 ]
 
 nodes:
-  c1:
-  c2:
+  dutc1:
+  dutc2:
   server:
     module: [ dhcp ]
     device: dnsmasq
     dhcp.server: true
     provider: clab
 
 links:
-- c1:
+- dutc1:
     ipv4: dhcp
-  c2:
+  dutc2:
     ipv4: dhcp
     dhcp.client.default: False
   server:
@@ -43,7 +43,7 @@ validate:
     show:
       eos: "dhcp server leases | json"
     exec:
-      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' c[1-9] ' | wc -l"
+      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' dutc[1-9] ' | wc -l"
     valid:
       eos: len(vrfs.default.ipv4ActiveLeases) == 2
       dnsmasq: stdout.rstrip() == '2'

tests/integration/dhcp/02-ipv6-client.yml

@@ -10,25 +10,25 @@ 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
     dhcp.server: true
     provider: clab
 
 links:
-- c1:
+- dut_c1:
     ipv6: dhcp
-  c2:
+  dut_c2:
     ipv6: dhcp
   server:
 

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:

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:

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:

tests/integration/dhcp/12-ipv6-relay.yml

@@ -24,24 +24,24 @@ groups:
     provider: clab
 
 nodes:
-  relay:
+  dut:
     module: [ dhcp ]
 
 links:
 - c1:
     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:

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:

tests/integration/dhcp/31-ipv4-client-ospf.yml

@@ -11,7 +11,7 @@ module: [ dhcp ]
 groups:
   _auto_create: true
   clients:
-    members: [ c1, c2 ]
+    members: [ dutc1, dutc2 ]
     module: [ ospf, dhcp ]
   servers:
     members: [ server ]
@@ -26,9 +26,9 @@ nodes:
     module: [ ospf, dhcp ]
 
 links:
-- c1:
+- dutc1:
     ipv4: dhcp
-  c2:
+  dutc2:
     ipv4: dhcp
   relay:
     dhcp.server: server
@@ -45,7 +45,7 @@ validate:
     show:
       eos: "dhcp server leases | json"
     exec:
-      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' c[1-9] ' | wc -l"
+      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' dutc[1-9] ' | wc -l"
     valid:
       eos: vrfs.default.ipv4ActiveLeases
       dnsmasq: stdout.rstrip() > '0'
@@ -59,7 +59,7 @@ validate:
     show:
       eos: "dhcp server leases | json"
     exec:
-      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' c[1-9] ' | wc -l"
+      dnsmasq: "cat /var/lib/misc/dnsmasq.leases | grep --color=never -E ' dutc[1-9] ' | wc -l"
     valid:
       eos: len(vrfs.default.ipv4ActiveLeases) == 2
       dnsmasq: stdout.rstrip() == '2'

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

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,15 +14,15 @@ groups:
     device: linux
     provider: clab
   routers:
-    members: [ r1, r2 ]
+    members: [ dut, r2 ]
     module: [ eigrp ]
     eigrp.as: 2
   probes:
     members: [ r2 ]
     device: iol
     provider: clab
 
-links: [ h1-r1, r1-r2, r2-h2 ]
+links: [ h1-dut, dut-r2, r2-h2 ]
 
 validate:
   ping_h1_h2: