Use shared warnings and wait times in IS-IS integration tests

tests/integration/isis/01-ipv4.yml

@@ -5,6 +5,8 @@ message: |
   the adjacent routers is a level-1-2 router to catch the potential router
   level mismatch.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ isis ]
 defaults.interfaces.mtu: 1500
 
@@ -33,7 +35,7 @@ validate:
   adj:
     description: Check IS-IS adjacencies
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 30
+    wait: isis_adj_p2p
     nodes: [ x1, x2 ]
     plugin: isis_neighbor('dut',area='49.0042')
   adj_l:
@@ -43,7 +45,7 @@ validate:
   pfx:
     description: Check IS-IS prefix
     wait_msg: Waiting for IS-IS SPF run
-    wait: 45
+    wait: isis_spf_long
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv4,level='1')
   sys_id:
@@ -56,6 +58,6 @@ validate:
   ping:
     description: End-to-end connectivity test
     wait_msg: Waiting for IS-IS SPF run
-    wait: 10
+    wait: ping_long
     nodes: [ x1 ]
     plugin: ping(nodes.x2.loopback.ipv4,src=nodes.x1.loopback.ipv4)

tests/integration/isis/02-ipv6.yml

@@ -6,7 +6,7 @@ message: |
 module: [ isis ]
 
 defaults.interfaces.mtu: 1500
-defaults.sources.extra: [ defaults-ipv6.yml ]
+defaults.sources.extra: [ defaults-ipv6.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -34,18 +34,18 @@ validate:
   adj:
     description: Check IS-IS adjacencies
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 30
+    wait: isis_adj_p2p
     nodes: [ x1, x2 ]
     plugin: isis_neighbor('dut',level='L2')
   pfx:
     description: Check IS-IS IPv6 prefix
     wait_msg: Waiting for IS-IS SPF run
-    wait: 45
+    wait: isis_spf_long
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv6,af='ipv6')
   ping:
     description: End-to-end IPv6 connectivity test
     wait_msg: Waiting for IS-IS SPF run
-    wait: 10
+    wait: ping_long
     nodes: [ x1 ]
     plugin: ping(nodes.x2.loopback.ipv6,src=nodes.x1.loopback.ipv6,af='ipv6')

tests/integration/isis/03-dual-stack.yml

@@ -7,7 +7,7 @@ message: |
 module: [ isis ]
 
 defaults.interfaces.mtu: 1500
-defaults.sources.extra: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -32,25 +32,25 @@ validate:
   adj:
     description: Check IS-IS adjacencies
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 30
+    wait: isis_adj_p2p
     nodes: [ x1, x2 ]
     plugin: isis_neighbor('dut',level='L1L2')
   pfx_v4:
     description: Check IS-IS IPv4 prefix
     wait_msg: Waiting for IS-IS SPF run
-    wait: 45
+    wait: isis_spf_long
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv4,level='1')
   pfx_v6:
     description: Check IS-IS IPv6 prefix
     wait_msg: Waiting for IS-IS SPF run
-    wait: 10
+    wait: isis_spf
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv6,af='ipv6',level='2')
   ping_v4:
     description: End-to-end IPv4 connectivity test
     wait_msg: Waiting for IS-IS SPF run
-    wait: 5
+    wait: ping
     nodes: [ x1 ]
     plugin: ping(nodes.x2.loopback.ipv4,src=nodes.x1.loopback.ipv4)
   ping_v6:

tests/integration/isis/10-network.yml

@@ -4,6 +4,8 @@ message: |
   interfaces with IS-IS network type set to 'broadcast' and 'point-to-point'. It
   has to establish IS-IS adjacencies over both.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ isis ]
 defaults.interfaces.mtu: 1500
 
@@ -40,6 +42,6 @@ validate:
   adj:
     description: Check IS-IS adjacencies
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 50
+    wait: isis_adj_lan
     nodes: [ x1, x2 ]
     plugin: isis_neighbor('dut',state='Up')

tests/integration/isis/11-cost.yml

@@ -3,6 +3,8 @@ message: |
   This lab tests whether (large) IS-IS costs are correctly applied
   to physical interfaces, and whether the device is using wide metrics.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ isis ]
 defaults.interfaces.mtu: 1500
 
@@ -34,31 +36,31 @@ validate:
   adj:
     description: Check IS-IS adjacencies
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 30
+    wait: isis_adj_lan
     nodes: [ x1, x2 ]
     plugin: isis_neighbor('dut')
   pfx_l1_x1:
     description: Check L1 IS-IS prefix on X1
     wait_msg: Waiting for IS-IS SPF run
-    wait: 45
+    wait: isis_spf_long
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv4,level='1')
   pfx_l2_x1:
     description: Check L2 IS-IS prefix on X1
     wait_msg: Waiting for IS-IS SPF run
-    wait: 5
+    wait: isis_spf
     nodes: [ x1 ]
     plugin: isis_prefix(pfx=nodes.x2.loopback.ipv4,level='2')
   pfx_l1_x2:
     description: Check L1 IS-IS prefix on X2
     wait_msg: Waiting for IS-IS SPF run
-    wait: 30
+    wait: isis_spf
     nodes: [ x2 ]
     plugin: isis_prefix(pfx=nodes.x1.loopback.ipv4,level='1')
   pfx_l2_x2:
     description: Check L2 IS-IS prefix on X2
     wait_msg: Waiting for IS-IS SPF run
-    wait: 15
+    wait: isis_spf
     nodes: [ x2 ]
     plugin: isis_prefix(pfx=nodes.x1.loopback.ipv4,level='2')
   c_x1_l1:

tests/integration/isis/12-passive.yml

@@ -3,6 +3,8 @@ message: |
   This lab tests whether the OSPF interfaces on device under test are correctly
   configured as passive interfaces.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 module: [ isis ]
 defaults.interfaces.mtu: 1500
 
@@ -51,7 +53,7 @@ validate:
     pass: Link X2-DUT reenabled
   adj_x1:
     description: Is DUT a neigbor of X1?
-    wait: 30
+    wait: isis_adj_p2p
     wait_msg: Waiting for OSPF adjacency process to complete
     pass: OK, X1 has DUT as a neighbor
     nodes: [ x1 ]

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

@@ -6,7 +6,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:

tests/integration/isis/30-vrf.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: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 isis.type: level-2
 
 groups:
@@ -63,20 +63,20 @@ validate:
   isis:
     description: Check IS-IS adjacencies with DUT
     wait_msg: Waiting for IS-IS adjacency process to complete
-    wait: 30
+    wait: isis_adj_p2p
     nodes: [ r1, r3 ]
     plugin: isis_neighbor('dut',level='L2')
     stop_on_error: true
   red_c_isis4:
     description: Check connected IPv4 subnet as IS-IS prefix on R1
-    wait: 15
+    wait: isis_spf
     wait_msg: Waiting for IS-IS convergence
     fail: DUT is not redistributing connected subnets into IS-IS
     nodes: [ r1 ]
     plugin: isis_prefix(pfx=nodes.r2.interfaces[0].ipv4,level='2')
   red_c_isis6:
     description: Check connected IPv6 subnet as IS-IS prefix on R1
-    wait: 3
+    wait: isis_spf
     wait_msg: Waiting for IS-IS convergence
     fail: DUT is not redistributing connected subnets into IS-IS
     nodes: [ r1 ]
@@ -85,28 +85,28 @@ validate:
     description: Check for IPv4 BGP prefix in IS-IS
     wait_msg: Waiting for BGP and IS-IS convergence
     fail: BGP is not redistributed into IS-IS
-    wait: 10
+    wait: isis_spf
     nodes: [ r1 ]
     plugin: isis_prefix(pfx=nodes.r2.loopback.ipv4,af='ipv4',level='2')
   red_bgp_isis6:
     description: Check for IPv6 BGP prefix in IS-IS
     wait_msg: Waiting for BGP and IS-IS convergence
     fail: BGP is not redistributed into IS-IS
-    wait: 5
+    wait: isis_spf
     nodes: [ r1 ]
     plugin: isis_prefix(nodes.r2.loopback.ipv6,af='ipv6',level='2')
   red_isis_bgp4:
     description: Check for IS-IS IPv4 prefix in BGP
     wait_msg: Waiting for IS-IS and BGP convergence
     fail: IS-IS IPv4 prefixes are not redistributed into BGP
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ r2 ]
     plugin: bgp_prefix(nodes.r1.loopback.ipv4,af='ipv4')
   red_isis_bgp6:
     description: Check for IS-IS IPv6 prefix in BGP
     wait_msg: Waiting for IS-IS and BGP convergence
     fail: IS-IS IPv6 prefixes are not redistributed into BGP
-    wait: 5
+    wait: bgp_scan_time
     nodes: [ r2 ]
     plugin: bgp_prefix(nodes.r1.loopback.ipv6,af='ipv6')
   red_lb_ping4:
@@ -127,11 +127,11 @@ validate:
     plugin: ping(nodes.r1.interfaces[0].ipv4,af='ipv4')
   blue_lb_ping4:
     description: Loopback-to-loopback IPv4 reachability test in VRF blue
-    wait: 10
+    wait: ping_long
     nodes: [ r3 ]
     plugin: ping('r4',src=nodes.r3.loopback.ipv4,af='ipv4')
-  blue_lb_ping:
+  blue_lb_ping6:
     description: Loopback-to-loopback IPv6 reachability test in VRF blue
-    wait: 10
+    wait: ping_long
     nodes: [ r3 ]
     plugin: ping(nodes.r4.loopback.ipv6,src=nodes.r3.loopback.ipv6,af='ipv6')

tests/integration/wait_times.yml

@@ -24,7 +24,9 @@ const.validate:
   bgp_ios_redist: 60      # The ridiculously long time it takes Cisco IOS/XE to start redistribution into IPv6 AF
 
   isis_adj_p2p: 20
+  isis_adj_lan: 50
   isis_spf: 15
+  isis_spf_long: 45
 
   rip_start: 60
   rip_update: 20