Use shared warning/wait times in initial/vrf integration tests (#2537)

ipspace · web-flow · commit 8bf3297f6d6f · 2025-07-12T16:37:00.000+02:00
diff --git a/tests/integration/initial/01-interfaces.yml b/tests/integration/initial/01-interfaces.yml
@@ -3,7 +3,7 @@ message:
   This scenario tests basic interface, IPv4, and IPv6 configuration,
   including generation of IPv6 Router Advertisements
 
-defaults.sources.extra: [ ../wait_times.yml ]
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 addressing:
   loopback:
diff --git a/tests/integration/initial/02-loopback.yml b/tests/integration/initial/02-loopback.yml
@@ -2,7 +2,7 @@
 message:
   This scenario tests additional loopback interfaces
 
-defaults.sources.extra: [ ../wait_times.yml ]
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 addressing:
   loopback:
diff --git a/tests/integration/initial/03-unnumbered.yml b/tests/integration/initial/03-unnumbered.yml
@@ -1,4 +1,6 @@
 ---
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:0::/48
diff --git a/tests/integration/initial/04-mtu.yml b/tests/integration/initial/04-mtu.yml
@@ -2,6 +2,8 @@ message:
   This scenario tests MTU configuration and path MTU discovery
   (generation of ICMP unreachables)
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:0::/48
@@ -48,15 +50,15 @@ defaults.devices.vptx.netlab_validate.v6_p1300.wait: 30
 validate:
   v4_p1300:
     description: Initial IPv4 ping => target(1300)
-    wait: 10
+    wait: ping_long
     nodes: [ p1 ]
     exec:
       eos: ping t1300
     valid: |
       'bytes from' in stdout
   v6_p1300:
     description: Initial IPv6 ping => target(1300)
-    wait: 10
+    wait: ping_long
     nodes: [ p1 ]
     exec:
       eos: ping ipv6 t1300
@@ -65,15 +67,15 @@ validate:
 
   v4_p1400:
     description: Initial IPv4 ping => target(1400)
-    wait: 10
+    wait: ping_long
     nodes: [ p1 ]
     exec:
       eos: ping t1400
     valid: |
       'bytes from' in stdout
   v6_p1400:
     description: Initial IPv6 ping => target(1400)
-    wait: 10
+    wait: ping_long
     nodes: [ p1 ]
     exec:
       eos: ping ipv6 t1400
diff --git a/tests/integration/initial/05-host.yml b/tests/integration/initial/05-host.yml
@@ -3,6 +3,8 @@ message:
   This scenario tests basic interface, IPv4, and IPv6 configuration,
   including generation of IPv6 Router Advertisements
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:0::/48
@@ -54,13 +56,13 @@ links:
 validate:
   ping_dut_v4:
     description: IPv4 ping H2 => DUT
-    wait: 10
+    wait: ping_long
     wait_msg: Wait for IPv4 interfaces to become operational
     nodes: [ h2 ]
     plugin: ping(nodes.dut.interfaces[0].ipv4,af='ipv4')
   ping_dut_v6:
     description: IPv6 ping H2 => DUT
-    wait: 10
+    wait: ping_long
     wait_msg: Wait for IPv6 interfaces to become operational
     nodes: [ h2 ]
     plugin: ping(nodes.dut.interfaces[0].ipv6,af='ipv6')
@@ -79,7 +81,7 @@ validate:
     plugin: ping('h1',af='ipv6',expect='fail')
     level: warning
   wait_ra:
-    wait: 30
+    wait: ra_send
     description: Wait for the IPv6 RA messages
   ra_suppress:
     description: Check for RA-generated default route
diff --git a/tests/integration/initial/06-bridge.yml b/tests/integration/initial/06-bridge.yml
@@ -9,6 +9,8 @@ message: |
   * Whether the device configuration template handles VLAN 1, or the device
     quirks take extra efforts to work around that
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   _auto_create: True
   hosts:
@@ -29,13 +31,13 @@ links:
 validate:
   ping_h3:
     description: IPv4 ping H3 from H1/H2
-    wait: 40
+    wait: stp_forwarding
     wait_msg: Wait for STP to do its job
     nodes: [ h1, h2 ]
     plugin: ping('h3')
   ping_h5:
     description: IPv4 ping H5 from H4
-    wait: 20
+    wait: stp_forwarding
     wait_msg: Wait for STP to do its job
     nodes: [ h4 ]
     plugin: ping('h5')
diff --git a/tests/integration/initial/07-router.yml b/tests/integration/initial/07-router.yml
@@ -3,7 +3,7 @@ message:
   This scenario tests basic interface, IPv4, and IPv6 configuration,
   including generation of IPv6 Router Advertisements
 
-defaults.sources.extra: [ ../wait_times.yml ]
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 addressing:
   loopback:
diff --git a/tests/integration/vrf/01-multi-vrf.yml b/tests/integration/vrf/01-multi-vrf.yml
@@ -7,6 +7,8 @@ message: |
   * h3 and h4 should be able to ping each other
   * h1 should not be able to reach h3
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   _auto_create: True
   hosts:
@@ -26,12 +28,12 @@ vrfs:
 validate:
   red:
     description: Ping-based reachability test in VRF red
-    wait: 15
+    wait: ping_long
     nodes: [ h1 ]
     plugin: ping('h3')
   ping_blue:
     description: Ping-based reachability test in VRF blue
-    wait: 15
+    wait: ping_long
     nodes: [ h2 ]
     plugin: ping('h4')
   inter_vlan:
diff --git a/tests/integration/vrf/02-multi-vrf-ipv6.yml b/tests/integration/vrf/02-multi-vrf-ipv6.yml
@@ -7,7 +7,7 @@ message: |
   * h3 and h4 should be able to ping each other
   * h1 should not be able to reach h3
 
-defaults.sources.extra: [ defaults-ipv6-only.yml ]
+defaults.sources.extra: [ defaults-ipv6-only.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   _auto_create: True
@@ -28,20 +28,20 @@ vrfs:
 validate:
   ra:
     description: Check RA-generated default route
-    wait: 40
+    wait: ra_send
     wait_msg: Waiting for RA message to generate the default route
     nodes: [ h1, h2, h3, h4 ]
     plugin: default6()
     stop_on_error: True
   red:
     description: Ping-based reachability test in VRF red
-    wait: 10
+    wait: ping_long
     wait_msg: Waiting for RA to generate the default route
     nodes: [ h1 ]
     plugin: ping('h3',af='ipv6')
   ping_blue:
     description: Ping-based reachability test in VRF blue
-    wait: 10
+    wait: ping_long
     wait_msg: Waiting for RA to generate the default route
     nodes: [ h2 ]
     plugin: ping('h4',af='ipv6')
diff --git a/tests/integration/vrf/03-multi-vrf-loopback.yml b/tests/integration/vrf/03-multi-vrf-loopback.yml
@@ -7,6 +7,8 @@ message: |
   * h3 and h4 should be able to ping each other and the VRF loopback interface
   * h1 should not be able to reach h3
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   _auto_create: True
   hosts:
@@ -32,12 +34,12 @@ nodes:
 validate:
   red:
     description: Ping-based reachability test in VRF red (wait up to 10 seconds)
-    wait: 10
+    wait: ping_long
     nodes: [ h1 ]
     plugin: ping('h2')
   ping:
     description: Ping-based reachability test in VRF blue
-    wait: 5
+    wait: ping
     nodes: [ h3 ]
     plugin: ping('h4')
   red_lb:
diff --git a/tests/integration/vrf/04-multi-vrf-loopback-ipv6.yml b/tests/integration/vrf/04-multi-vrf-loopback-ipv6.yml
@@ -7,7 +7,7 @@ message: |
   * h3 and h4 should be able to ping each other and the VRF loopback interface
   * h1 should not be able to reach h3
 
-defaults.sources.extra: [ defaults-ipv6-only.yml, ../wait_times.yml ]
+defaults.sources.extra: [ defaults-ipv6-only.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   _auto_create: True
diff --git a/tests/integration/vrf/11-multi-vrf-ospf.yml b/tests/integration/vrf/11-multi-vrf-ospf.yml
@@ -10,7 +10,7 @@ message: |
   * r1 should not be able to reach r3
 
 defaults.interfaces.mtu: 1500
-defaults.sources.extra: [ ../wait_times.yml ]
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 module: [ ospf ]
 groups:
diff --git a/tests/integration/vrf/12-multi-vrf-bgp.yml b/tests/integration/vrf/12-multi-vrf-bgp.yml
@@ -11,6 +11,9 @@ message: |
 
   The test also checks whether DUT unnecessarily enables IPv6 AF over IPv4
   EBGP sessions
+
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:1::/48
@@ -52,28 +55,28 @@ nodes:
 validate:
   session:
     description: Check EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     wait_msg: Waiting for BGP sessions to start
     nodes: [ r1, r2, r3, r4 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
     stop_on_error: true
   pfx_red:
     description: Check BGP prefix on R1
-    wait: 15
+    wait: ping_long
     wait_msg: Waiting for BGP convergence
     fail: DUT is not propagating BGP prefixes between R1 and R2
     nodes: [ r1 ]
     plugin: bgp_prefix(nodes.r2.loopback.ipv4)
   pfx_red_c:
     description: Check connected subnet as BGP prefix on R1
-    wait: 3
+    wait: bgp_scan_time
     wait_msg: Waiting for BGP convergence
     fail: DUT is not redistributing connected subnets into BGP
     nodes: [ r1 ]
     plugin: bgp_prefix(nodes.r2.interfaces[0].ipv4)
   pfx_blue:
     description: Check BGP prefix on R3
-    wait: 15
+    wait: bgp_scan_long
     wait_msg: Waiting for BGP convergence
     fail: DUT is not propagating BGP prefixes between R3 and R4
     nodes: [ r3 ]
diff --git a/tests/integration/vrf/13-multi-vrf-bgp-loopback.yml b/tests/integration/vrf/13-multi-vrf-bgp-loopback.yml
@@ -9,6 +9,8 @@ message: |
   * r3 and r4 should be able to ping each other and rtr VRF loopback
   * r1 should not be able to reach r3
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   ce:
     members: [ r1, r2, r3, r4 ]
@@ -46,14 +48,14 @@ nodes:
 validate:
   session:
     description: Check EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     wait_msg: Waiting for BGP sessions to start
     nodes: [ r1, r2, r3, r4 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
     stop_on_error: true
   pfx_red:
     description: Check DUT loopback BGP prefix in red VRF
-    wait: 15
+    wait: bgp_scan_long
     wait_msg: Waiting for BGP convergence
     nodes: [ r1, r2 ]
     plugin: bgp_prefix(nodes.dut.vrfs.red.loopback_address.ipv4)
@@ -64,18 +66,18 @@ validate:
     level: warning
   pfx_blue:
     description: Check DUT loopback BGP prefix in blue VRF
-    wait: 5
+    wait: bgp_scan_time
     wait_msg: Waiting for BGP convergence
     nodes: [ r3, r4 ]
     plugin: bgp_prefix(nodes.dut.vrfs.blue.loopback_address.ipv4)
   red:
     description: Ping-based reachability test in VRF red
-    wait: 5
+    wait: ping
     nodes: [ r1 ]
     plugin: ping('r2')
   ping:
     description: Ping-based reachability test in VRF blue
-    wait: 5
+    wait: ping
     nodes: [ r3 ]
     plugin: ping('r4')
   red_lb:
diff --git a/tests/integration/vrf/14-multi-vrf-unnumbered.yml b/tests/integration/vrf/14-multi-vrf-unnumbered.yml
@@ -9,6 +9,8 @@ message: |
   * r3 and r4 should be able to ping each other
   * r1 should not be able to reach r3
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   _auto_create: True
   ce:
@@ -50,20 +52,20 @@ nodes:
 validate:
   session:
     description: Check EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     wait_msg: Waiting for BGP sessions to start
     nodes: [ r1, r2, r3, r4 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',intf=node.interfaces[0].ifname)
     stop_on_error: true
   pfx_red:
     description: Check BGP prefix on R1
-    wait: 15
+    wait: bgp_scan_long
     wait_msg: Waiting for BGP convergence
     nodes: [ r1 ]
     plugin: bgp_prefix(nodes.r2.loopback.ipv4)
   pfx_blue:
     description: Check BGP prefix on R3
-    wait: 15
+    wait: bgp_scan_long
     wait_msg: Waiting for BGP convergence
     nodes: [ r3 ]
     plugin: bgp_prefix(nodes.r4.loopback.ipv4)
diff --git a/tests/integration/vrf/16-vrf-bgp-community.yml b/tests/integration/vrf/16-vrf-bgp-community.yml
@@ -6,6 +6,8 @@ message: |
   Three BGP communities are attached to the prefix advertised by x1: a standard
   one, an extended one, and a long one (standard communitiy using 4-octet AS)
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 groups:
   probes:
     members: [ x1, x2 ]
@@ -36,13 +38,13 @@ validate:
   session:
     description: Check BGP sessions with DUT
     wait_msg: Wait for BGP sessions to be established
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
   prefix:
     description: Check whether DUT propagates the beacon prefix
     wait_msg: Wait for BGP convergence
-    wait: 15
+    wait: bgp_scan_long
     nodes: [ x2 ]
     plugin: bgp_prefix('172.0.42.0/24')
   std_comm:
diff --git a/tests/integration/vrf/21-multi-vrf-ospfv3.yml b/tests/integration/vrf/21-multi-vrf-ospfv3.yml
@@ -11,7 +11,7 @@ message: |
 
 defaults.interfaces.mtu: 1500
 
-defaults.sources.extra: [ defaults-ipv6-only.yml, ../wait_times.yml ]
+defaults.sources.extra: [ defaults-ipv6-only.yml, ../wait_times.yml, ../warnings.yml ]
 
 module: [ ospf ]
 groups:
diff --git a/tests/integration/vrf/22-multi-vrf-bgp-ipv6.yml b/tests/integration/vrf/22-multi-vrf-bgp-ipv6.yml
diff --git a/tests/integration/vrf/23-multi-vrf-mixed-ipv6.yml b/tests/integration/vrf/23-multi-vrf-mixed-ipv6.yml
diff --git a/tests/integration/vrf/31-vrf-common-hosts.yml b/tests/integration/vrf/31-vrf-common-hosts.yml
diff --git a/tests/integration/vrf/32-vrf-common-hosts-ipv6.yml b/tests/integration/vrf/32-vrf-common-hosts-ipv6.yml
diff --git a/tests/integration/vrf/33-vrf-common-ospf.yml b/tests/integration/vrf/33-vrf-common-ospf.yml
diff --git a/tests/integration/vrf/34-vrf-common-mixed.yml b/tests/integration/vrf/34-vrf-common-mixed.yml
