Use shared warnings and wait times in ripv2 and routing tests

tests/integration/ripv2/01-ipv4.yml

@@ -3,6 +3,8 @@ message: |
   This lab tests the basic RIPv2 deployment. The device under test has two
   RIPv2 interfaces and has to exchange RIPv2 routes over both of them.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ ripv2 ]
 
 groups:
@@ -27,12 +29,12 @@ validate:
   pfx_x1:
     description: Check RIPv2 prefixes on X1
     wait_msg: Waiting for RIPv2 startup
-    wait: 60
+    wait: rip_start
     nodes: [ x1 ]
     plugin: rt_prefix(nodes.x2.loopback.ipv4,af='ipv4',proto='rip')
   pfx_x2:
     description: Check RIPv2 prefixes on X2
-    wait_msg: Waiting for RIPv2 startup
-    wait: 20
+    wait_msg: Waiting for RIPv2 updates
+    wait: rip_update
     nodes: [ x2 ]
     plugin: rt_prefix(nodes.x1.loopback.ipv4,af='ipv4',proto='rip')

tests/integration/ripv2/02-ipv6.yml

@@ -3,7 +3,7 @@ message: |
   This lab tests the basic RIPng deployment. The device under test has two
   RIPng interfaces and has to exchange RIPng routes over both of them.
 
-defaults.sources.extra: [ ipv6-defaults.yml ]
+defaults.sources.extra: [ ipv6-defaults.yml, ../wait_times.yml, ../warnings.yml ]
 
 module: [ ripv2 ]
 
@@ -32,12 +32,12 @@ validate:
   pfx_x1:
     description: Check RIPng prefixes on X1
     wait_msg: Waiting for RIPng startup
-    wait: 60
+    wait: rip_start
     nodes: [ x1 ]
     plugin: rt_prefix(nodes.x2.interfaces[1].ipv6,af='ipv6',proto='ripng')
   pfx_x2:
     description: Check RIPng prefixes on X2
     wait_msg: Waiting for RIPng startup
-    wait: 20
+    wait: rip_update
     nodes: [ x2 ]
     plugin: rt_prefix(nodes.x1.interfaces[1].ipv6,af='ipv6',proto='ripng')

tests/integration/ripv2/10-passive-ipv4.yml

@@ -4,6 +4,8 @@ message: |
   the link with X2, so the route from X2 to DUT should go over X1 (and have
   metric=3)
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ ripv2 ]
 
 groups:
@@ -34,6 +36,6 @@ validate:
   pfx_x2:
     description: Check RIPv2 prefixes on X2
     wait_msg: Waiting for RIPv2 startup
-    wait: 50
+    wait: rip_start
     nodes: [ x2 ]
     plugin: rt_prefix(nodes.dut.interfaces[-1].ipv4,af='ipv4',proto='rip',metric=3)

tests/integration/ripv2/11-passive-ipv6.yml

@@ -4,7 +4,7 @@ message: |
   the link with X2, so the route from X2 to DUT should go over X1 (and have
   metric=3)
 
-defaults.sources.extra: [ ipv6-defaults.yml ]
+defaults.sources.extra: [ ipv6-defaults.yml, ../wait_times.yml, ../warnings.yml ]
 
 module: [ ripv2 ]
 
@@ -36,6 +36,6 @@ validate:
   pfx_x2:
     description: Check RIPv2 prefixes on X2
     wait_msg: Waiting for RIPv2 startup
-    wait: 50
+    wait: rip_start
     nodes: [ x2 ]
     plugin: rt_prefix(nodes.dut.interfaces[-1].ipv6,af='ipv6',proto='rip',metric=3)

tests/integration/ripv2/21-import-ds.yml

@@ -8,7 +8,7 @@ defaults.interfaces.mtu: 1500
 
 defaults.paths.prepend.plugin: [ "topology:../plugin" ]
 plugin: [ static_import ]
-defaults.sources.extra: [ ../wait_times.yml ]
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 addressing:
   loopback:
@@ -54,72 +54,72 @@ validate:
   ipv4_ebgp:
     description: IPv4 EBGP session (X1-DUT) should be established
     wait_msg: Wait for EBGP session
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
   ipv6_ebgp:
     description: IPv6 EBGP session (X1-DUT) should be established
     wait_msg: Wait for EBGP session
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',af='ipv6')
   ipv4_ospf:
-    description: OSPF session (R2-DUT) should be established
-    wait_msg: Wait for OSPF session
-    wait: 20
+    description: OSPFv2 session (R2-DUT) should be established
+    wait_msg: Wait for OSPFv2 session
+    wait: ospfv2_adj_p2p
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   ipv6_ospf:
     description: OSPFv3 session (R2-DUT) should be established
     wait_msg: Wait for OSPF session
-    wait: 30
+    wait: ospfv3_adj_p2p
     nodes: [ r2 ]
     plugin: ospf6_neighbor(nodes.dut.ospf.router_id)
   rip_bgp_v4:
     description: Check whether X1 BGP IPv4 prefix is redistributed into RIP
-    wait: 30
+    wait: rip_start
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r3 ]
     plugin: rt_prefix(pfx=nodes.x1.loopback.ipv4,af='ipv4',proto='rip')
   rip_bgp_v6:
     description: Check whether X1 BGP IPv6 prefix is redistributed into RIP
-    wait: 10
+    wait: rip_update
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r3 ]
     plugin: rt_prefix(pfx=nodes.x1.loopback.ipv6,af='ipv6',proto='rip')
   rip_ospf_v4:
     description: Check whether R2 OSPF IPv4 prefix is redistributed into RIP
-    wait: 15
+    wait: rip_update
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r3 ]
     plugin: rt_prefix(pfx=nodes.r2.loopback.ipv4,af='ipv4',proto='rip')
   rip_ospf_v6:
     description: Check whether R2 OSPF IPv6 prefix is redistributed into RIP
-    wait: 10
+    wait: rip_update
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r3 ]
     plugin: rt_prefix(pfx=nodes.r2.loopback.ipv6,af='ipv6',proto='rip')
   ospf_v4:
-    description: Check whether R3 RIP IPv4 prefix is redistributed into OSPF
-    wait: 20
+    description: Check whether R3 RIP IPv4 prefix is redistributed into OSPFv2
+    wait: ospfv2_spf
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r2 ]
     plugin: ospf_prefix(pfx=nodes.r3.loopback.ipv4)
   ospf_v6:
-    description: Check whether R3 RIP IPv6 prefix is redistributed into OSPF
-    wait: 15
+    description: Check whether R3 RIP IPv6 prefix is redistributed into OSPFv3
+    wait: ospfv3_spf
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r2 ]
     plugin: ospf6_prefix(pfx=nodes.r3.interfaces[0].ipv6)
   bgp_v4:
     description: Check whether R3 RIP IPv4 prefix is redistributed into BGP
-    wait: 5
+    wait: bgp_scan_time
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ x1 ]
     plugin: bgp_prefix(pfx=nodes.r3.loopback.ipv4,af='ipv4')
   bgp_v6:
     description: Check whether R3 RIP IPv6 prefix is redistributed into BGP
-    wait: 5
+    wait: bgp_ios_redist
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ x1 ]
     plugin: bgp_prefix(pfx=nodes.r3.interfaces[0].ipv6,af='ipv6')

tests/integration/ripv2/31-vrf-ipv4.yml

@@ -11,6 +11,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:
   ce_rip:
     members: [ r1, r3 ]
@@ -49,11 +51,11 @@ validate:
     wait_msg: Waiting for EBGP sessions to start
     nodes: [ r2, r4 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
-    wait: 10
+    wait: ebgp_session
     stop_on_error: true
   red_c_rip:
     description: Check connected subnet as RIPv2 prefix on R1
-    wait: 15
+    wait: rip_update
     wait_msg: Waiting for RIPv2 convergence
     fail: DUT is not redistributing connected subnets into RIPv2
     nodes: [ r1 ]
@@ -62,14 +64,14 @@ validate:
     description: Check for BGP prefix in RIPv2
     wait_msg: Waiting for BGP and RIPv2 convergence
     fail: BGP is not redistributed into RIPv2
-    wait: 10
+    wait: rip_update
     nodes: [ r1 ]
     plugin: rt_prefix(nodes.r2.loopback.ipv4,af='ipv4',proto='rip')
   red_rip_bgp:
     description: Check for RIPv2 prefix in BGP
     wait_msg: Waiting for RIPv2 and BGP convergence
     fail: RIPv2 is not redistributed into BGP
-    wait: 3
+    wait: bgp_scan_time
     nodes: [ r2 ]
     plugin: bgp_prefix(nodes.r1.loopback.ipv4)
   red_lb_ping:
@@ -82,7 +84,7 @@ validate:
     plugin: ping('r1')
   blue_lb_ping:
     description: Loopback-to-loopback reachability test in VRF blue
-    wait: 10
+    wait: ping_long
     nodes: [ r3 ]
     plugin: ping('r4',src=nodes.r3.loopback.ipv4)
   inter_vrf:

tests/integration/ripv2/32-vrf-ipv6.yml

@@ -11,7 +11,7 @@ message: |
   * r3 and r4 should be able to ping each other
   * r1 should not be able to reach r3
 
-defaults.sources.extra: [ ipv6-defaults.yml ]
+defaults.sources.extra: [ ipv6-defaults.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   ce_rip:
@@ -54,11 +54,11 @@ validate:
     wait_msg: Waiting for EBGP sessions to start
     nodes: [ r2, r4 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',af='ipv6')
-    wait: 20
+    wait: ebgp_session
     stop_on_error: true
   red_c_rip:
     description: Check connected subnet as RIPng prefix on R1
-    wait: 15
+    wait: rip_update
     wait_msg: Waiting for RIPng convergence
     fail: DUT is not redistributing connected subnets into RIPv2
     nodes: [ r1 ]
@@ -67,14 +67,14 @@ validate:
     description: Check for BGP prefix in RIPng
     wait_msg: Waiting for BGP and RIPng convergence
     fail: BGP is not redistributed into RIPng
-    wait: 10
+    wait: rip_update
     nodes: [ r1 ]
     plugin: rt_prefix(nodes.r2.loopback.ipv6,af='ipv6',proto='rip')
   red_rip_bgp:
     description: Check for RIPng prefix in BGP
     wait_msg: Waiting for RIPng and BGP convergence
     fail: RIPng is not redistributed into BGP
-    wait: 40
+    wait: bgp_ios_redist
     nodes: [ r2 ]
     plugin: bgp_prefix(nodes.r1.interfaces[0].ipv6,af='ipv6')
   red_lb_ping:
@@ -87,7 +87,7 @@ validate:
     plugin: ping(nodes.r1.interfaces[0].ipv6,af='ipv6')
   blue_lb_ping:
     description: Loopback-to-loopback reachability test in VRF blue
-    wait: 10
+    wait: ping_long
     nodes: [ r3 ]
     plugin: ping('r4',src=nodes.r3.interfaces[0].ipv6,af='ipv6')
   inter_vrf:

tests/integration/routing/01-locpref.yml

@@ -7,7 +7,7 @@ message: |
 plugin: [ bgp.policy ]
 module: [ bgp, ospf, routing ]
 
-defaults.sources.extra: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -50,72 +50,72 @@ links:
 validate:
   ebgp_v4:
     description: Check IPv4 EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   ibgp_v4:
     description: Check IPv4 IBGP sessions with DUT
-    wait: 40
+    wait: ibgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   ebgp_v6:
     description: Check IPv6 EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',af='ipv6')
 
   ibgp_v6:
     description: Check IPv6 IBGP sessions with DUT
-    wait: 40
+    wait: ibgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',af='ipv6')
 
   pfx_x1_v4:
     description: Check for IPv4 X1 prefix on Probe
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv4)
 
   pfx_x1_v6:
     description: Check for IPv6 X1 prefix on Probe
-    wait: 15
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv6,af='ipv6')
 
   pfx_x2_v4:
     description: Check for IPv4 X2 prefix on Probe
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)
 
   pfx_x2_v6:
     description: Check for IPv6 X2 prefix on Probe
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv6,af='ipv6')
 
   locpref_x1_v4:
     description: Check for node-wide locpref set on IPv4 X1 prefix
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv4,locpref=17)
 
   locpref_x1_v6:
     description: Check for node-wide locpref set on IPv6 X1 prefix
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv6,af='ipv6',locpref=17)
 
   locpref_x2_v4:
     description: Check for session-level locpref set on IPv4 X2 prefix
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4,locpref=42)
 
   locpref_x2_v6:
     description: Check for session-level locpref set on IPv4 X2 prefix
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv6,af='ipv6',locpref=42)