Use symbolic wait times in OSPFv2/OSPFv3 validation tests

Author: ipspace

tests/integration/ospf/ospfv2/01-network.yml

@@ -8,6 +8,7 @@ message: |
   likely on the 'broadcast' link) or due to MTU mismatch (in which case both
   adjacencies would fail).
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -34,6 +35,6 @@ validate:
   adj:
     description: Check OSPF adjacencies
     wait_msg: Waiting for OSPF adjacency process to complete
-    wait: 50
+    wait: ospfv2_adj_lan
     nodes: [ x1, x2 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)

tests/integration/ospf/ospfv2/02-areas.yml

@@ -3,6 +3,7 @@ message: |
   This lab tests the OSPF areas. The device under test has three interfaces
   in three different areas and the loopback interface in one of those areas.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -42,19 +43,19 @@ links:
 validate:
   adj:
     description: Check OSPF adjacencies
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     nodes: [ x1, x2, x3 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   lb:
     description: Check for DUT loopback prefix being an inter-area route in areas 0 and 3
-    wait: 20
+    wait: ospfv2_spf
     wait_msg: Waiting for DUT and SPF to do their magic
     nodes: [ x1, x3 ]
     plugin: ospf_prefix('10.0.0.1/32',rt='N IA')
   lb2:
     description: Check for DUT loopback prefix being an intra-area route in area 2
-    wait: 10
+    wait: ospfv2_spf
     wait_msg: Waiting for SPF to do its magic
     nodes: [ x2 ]
     plugin: ospf_prefix('10.0.0.1/32',rt='N')

tests/integration/ospf/ospfv2/03-cost.yml

@@ -3,6 +3,7 @@ message: |
   This lab tests whether the OSPF costs are correctly applied
   to physical and loopback interfaces.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -33,19 +34,19 @@ links:
 validate:
   adj:
     description: Check OSPF adjacencies
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     nodes: [ x1, x2 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   c_x1:
     description: Check cost X2 => X1
-    wait: 10
+    wait: ospfv2_spf
     wait_msg: Wait for SPF run to complete
     nodes: [ x1 ]
     plugin: ospf_prefix(nodes.x2.loopback.ipv4,cost=20)
   c_x2:
     description: Check cost X1 => X2
-    wait: 10
+    wait: ospfv2_spf
     wait_msg: Wait for SPF run to complete
     nodes: [ x2 ]
     plugin: ospf_prefix(nodes.x1.loopback.ipv4,cost=27)

tests/integration/ospf/ospfv2/04-passive.yml

@@ -3,6 +3,7 @@ message: |
   This lab tests whether the OSPF interfaces on device under test are correctly
   configured as passive interfaces.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -43,7 +44,7 @@ links:
 validate:
   adj_x1:
     description: Is DUT a neigbor of X1?
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     pass: OK, X1 has DUT as a neighbor
     nodes: [ x1 ]

tests/integration/ospf/ospfv2/05-unnumbered.yml

@@ -2,6 +2,7 @@
 message: |
   This lab tests OSPF running over unnumbered IPv4 interfaces.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -24,14 +25,14 @@ links:
 validate:
   adj:
     description: Is DUT a neigbor of X1?
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     pass: OK, X1 has DUT as a neighbor
     nodes: [ x1 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   lb:
     description: Check the DUT loopback prefix on X1
-    wait: 10
+    wait: ospfv2_spf
     wait_msg: Waiting for SPF process to complete
     nodes: [ x1 ]
     plugin: ospf_prefix(nodes.dut.loopback.ipv4,rt='N')

tests/integration/ospf/ospfv2/06-vlan-mtu.yml

@@ -8,6 +8,7 @@ message: |
   potential problem with system MTU. Failure to establish X3-DUT adjacency
   indicates the MTU is not set correctly on VLAN/SVI interface.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf, vlan ]
 
 defaults.vlan.start_vlan_id: 500
@@ -49,6 +50,6 @@ validate:
   adj:
     description: Check OSPF adjacencies
     wait_msg: Waiting for OSPF adjacency process to complete
-    wait: 60
+    wait: ospfv2_adj_lan
     nodes: [ x1, x2, x3 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)

tests/integration/ospf/ospfv2/10-import.yml

@@ -2,6 +2,7 @@
 message: |
   This lab tests the simple import of BGP routes into OSPF.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 groups:
   probes:
     device: frr
@@ -25,18 +26,18 @@ validate:
   adj_ospf:
     description: Check OSPF adjacency
     wait_msg: Waiting for OSPF adjacency process to complete
-    wait: 50
+    wait: ospfv2_adj_p2p
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   adj_bgp:
     description: Check EBGP sessions with DUT
     wait_msg: Wait for BGP sessions to be established
-    wait: 30
+    wait: ebgp_session
     nodes: [ x1 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
   redist:
     description: Check for redistributed X1 loopback on R2
-    wait: 20
+    wait: ospf_import
     wait_msg: Waiting for routing protocols to do their magic
     nodes: [ r2 ]
     plugin: ospf_prefix(nodes.x1.loopback.ipv4)

tests/integration/ospf/ospfv2/11-import-policy.yml

@@ -2,6 +2,7 @@
 message: |
   This lab tests the simple import of IPv4 BGP routes into OSPF via a route-map
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 groups:
   probes:
     device: frr
@@ -44,24 +45,24 @@ validate:
   adj_ospf:
     description: Check OSPF adjacency
     wait_msg: Waiting for OSPF adjacency process to complete
-    wait: 50
+    wait: ospfv2_adj_p2p
     nodes: [ r2 ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   adj_bgp:
     description: Check EBGP sessions with DUT
     wait_msg: Wait for BGP sessions to be established
-    wait: 30
+    wait: ebgp_session
     nodes: [ x1 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
   r_bcn:
     description: Check for redistributed beacon prefix R2
-    wait: 20
+    wait: ospf_import
     wait_msg: Waiting for routing protocols to do their magic
     nodes: [ r2 ]
     plugin: ospf_prefix(prefix.beacon.ipv4)
   r_lb:
     description: Check for redistributed X1 loopback on R2
-    wait: 20
+    wait: ospf_import
     wait_msg: Waiting for routing protocols to do their magic
     nodes: [ r2 ]
     plugin: ospf_prefix(nodes.x1.loopback.ipv4,state='missing')

tests/integration/ospf/ospfv2/20-default.yml

@@ -4,6 +4,7 @@ message: |
   should originate the default route, one always, the other one based one
   BGP default route.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -43,29 +44,29 @@ links:
 validate:
   adj_a:
     description: Check OSPF adjacencies with DUT_A
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     nodes: [ probe ]
     plugin: ospf_neighbor(nodes.dut_a.ospf.router_id)
     stop_on_error: True
   adj_c:
     description: Check OSPF adjacencies with DUT_C
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     nodes: [ probe ]
     plugin: ospf_neighbor(nodes.dut_c.ospf.router_id)
     stop_on_error: True
   adj_x:
     description: Check EBGP sessions with DUT_C
     wait_msg: Wait for BGP sessions to be established
-    wait: 30
+    wait: ebgp_session
     nodes: [ xf ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut_c')
     stop_on_error: True
   df_a:
     description: Do we have at least some default route?
     wait_msg: Wait for SPF to complete
-    wait: 10
+    wait: ospfv2_spf
     nodes: [ probe ]
     plugin: ospf_prefix('0.0.0.0/0')
     stop_on_error: True
@@ -92,7 +93,7 @@ validate:
   df_c:
     description: Check for the conditional default route
     wait_msg: Wait for SPF to complete
-    wait: 10
+    wait: ospfv2_spf
     nodes: [ probe ]
     plugin: ospf_prefix('0.0.0.0/0')
   df_c_cost:

tests/integration/ospf/ospfv2/21-default-policy.yml

@@ -4,6 +4,7 @@ message: |
   under test should originate the default route if the external router
   advertises its loopback interface.
 
+defaults.sources.extra: [ ../../wait_times.yml ]
 module: [ ospf ]
 
 groups:
@@ -42,20 +43,20 @@ links:
 validate:
   adj_ospf:
     description: Check OSPF adjacencies with DUT
-    wait: 30
+    wait: ospfv2_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     nodes: [ probe ]
     plugin: ospf_neighbor(nodes.dut.ospf.router_id)
   adj_bgp:
     description: Check EBGP sessions with DUT
     wait_msg: Wait for BGP sessions to be established
-    wait: 30
+    wait: ebgp_session
     nodes: [ xf ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
   df:
     description: Do we have at least some default route?
     wait_msg: Wait for SPF to complete
-    wait: 10
+    wait: ospfv2_spf
     nodes: [ probe ]
     plugin: ospf_prefix('0.0.0.0/0')
   bgp_lbd:
@@ -68,7 +69,7 @@ validate:
   df_c:
     description: Check for the conditional default route
     wait_msg: Wait for SPF to complete
-    wait: 10
+    wait: ospfv2_spf
     nodes: [ probe ]
     plugin: ospf_prefix('0.0.0.0/0',state='missing')
   bgp_lbe: