Use shared warnings and wait times in bgp.policy integration tests (#2522)

Note: some tests have an arbitrary wait time between checking for a
prefix and for its attributes due to the wonderful behavior of Aruba CX.

Author: ipspace

tests/integration/bgp.policy/10-bgp-bandwidth-auto.yml

@@ -3,6 +3,8 @@ message: |
   Use this topology to test the 'auto bgp bandwidth' functionality. The DUT has to copy
   interface bandwidth into BGP bandwidth community and propagate that on IBGP updates.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 plugin: [ bgp.policy ]
 module: [ bgp, ospf ]
 
@@ -33,12 +35,12 @@ links:
 validate:
   session:
     description: Check BGP sessions with DUT
-    wait: 40
+    wait: ibgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   prefix:
     description: Check for X2 prefix on X1
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ x1, x2 ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)

tests/integration/bgp.policy/11-bgp-bandwidth-value.yml

@@ -4,6 +4,8 @@ message: |
   The DUT has to set BGP bandwidth community on updates received from X2 to 100
   Mbps and propagate that on IBGP updates.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 plugin: [ bgp.policy ]
 module: [ bgp, ospf ]
 
@@ -33,12 +35,12 @@ links:
 validate:
   session:
     description: Check BGP sessions with DUT
-    wait: 40
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   prefix:
     description: Check for X2 prefix on X1
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ x1, x2 ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)

tests/integration/bgp.policy/12-bgp-bandwidth-value-out.yml

@@ -4,6 +4,8 @@ message: |
   The DUT has to set BGP bandwidth community on updates received from X2 to 100
   Mbps and propagate that on IBGP updates.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 plugin: [ bgp.policy ]
 module: [ bgp, ospf ]
 
@@ -33,12 +35,12 @@ links:
 validate:
   session:
     description: Check BGP sessions with DUT
-    wait: 40
+    wait: ibgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   prefix:
     description: Check for X2 prefix on X1
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ x1, x2 ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)

tests/integration/bgp.policy/21-locpref.yml

@@ -4,11 +4,11 @@ message: |
   has to set node-wide local preference on prefixes received from X1 and
   neighbor-specific local preference on prefixes received from X2.
 
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
+
 plugin: [ bgp.policy ]
 module: [ bgp, ospf ]
 
-defaults.sources.extra: [ defaults-ds.yml ]
-
 groups:
   probes:
     device: frr
@@ -44,72 +44,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')
 
   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_v4:
     description: Check IBGP IPv4 sessions with DUT
-    wait: 30
+    wait: ibgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   ibgp_v6:
     description: Check IBGP IPv6 sessions with DUT
-    wait: 30
+    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_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv4)
 
   pfx_x1_v6:
     description: Check for IPv6 X1 prefix on Probe
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv6,af='ipv6')
 
   pfx_x2_v4:
     description: Check for IPv4 X2 prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)
 
   pfx_x2_v6:
     description: Check for IPv6 X2 prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     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
     nodes: [ probe ]
-    wait: 10
+    wait: bgp_scan_time
     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)

tests/integration/bgp.policy/22-locpref-unnumbered.yml

@@ -7,7 +7,7 @@ message: |
 plugin: [ bgp.policy ]
 module: [ bgp, ospf ]
 
-defaults.sources.extra: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -46,60 +46,60 @@ links:
 validate:
   ebgp:
     description: Check EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',intf=node.interfaces[0].ifname)
 
   ibgp:
     description: Check IBGP sessions with DUT
-    wait: 30
+    wait: ibgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   pfx_x1_v4:
     description: Check for IPv4 X1 prefix on Probe
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv4)
 
   pfx_x1_v6:
     description: Check for IPv6 X1 prefix on Probe
-    wait: 10
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x1.loopback.ipv6,af='ipv6')
 
   pfx_x2_v4:
     description: Check for IPv4 X2 prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.x2.loopback.ipv4)
 
   pfx_x2_v6:
     description: Check for IPv6 X2 prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     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)

tests/integration/bgp.policy/31-med.yml

@@ -6,7 +6,7 @@ message: |
 plugin: [ bgp.policy ]
 module: [ bgp ]
 
-defaults.sources.extra: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -33,36 +33,36 @@ links:
 validate:
   ebgp_v4:
     description: Check IPv4 EBGP session with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   ebgp_v6:
     description: Check IPv6 EBGP session with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',af='ipv6')
 
   pfx_v4:
     description: Check for IPv4 DUT prefix on Probe
-    wait: 30
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv4)
 
   pfx_v6:
     description: Check for IPv6 DUT prefix on Probe
-    wait: 30
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv6,af='ipv6')
 
   med_v4:
     description: Check for MED on DUT IPv4 prefix
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv4,med=42)
 
   med_v6:
     description: Check for MED on DUT IPv6 prefix
-    wait: 10
+    wait: bgp_scan_long
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv6,af='ipv6',med=42)

tests/integration/bgp.policy/32-med-unnumbered.yml

@@ -6,7 +6,7 @@ message: |
 plugin: [ bgp.policy ]
 module: [ bgp ]
 
-defaults.sources.extra: [ defaults-ds.yml ]
+defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
 groups:
   probes:
@@ -34,30 +34,30 @@ links:
 validate:
   ebgp:
     description: Check EBGP session with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ probe ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut',intf=node.interfaces[0].ifname)
 
   pfx_v4:
     description: Check for IPv4 DUT prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv4)
 
   pfx_v6:
     description: Check for IPv6 DUT prefix on Probe
-    wait: 5
+    wait: bgp_scan_time
     nodes: [ probe ]
     plugin: bgp_prefix(nodes.dut.loopback.ipv6,af='ipv6')
 
   med_v4:
     description: Check for MED on DUT IPv4 X1 prefix
-    wait: 10
     nodes: [ probe ]
+    wait: bgp_scan_long
     plugin: bgp_prefix(nodes.dut.loopback.ipv4,med=42)
 
   med_v6:
     description: Check for MED on DUT IPv6 X1 prefix
-    wait: 10
     nodes: [ probe ]
+    wait: bgp_scan_long
     plugin: bgp_prefix(nodes.dut.loopback.ipv6,af='ipv6',med=42)

tests/integration/bgp.policy/41-prepend.yml

@@ -3,6 +3,8 @@ message: |
   Use this topology to test the AS path prepending. The DUT has prepend its AS
   once on updates sent to X1 and prepend AS 64999 to updates sent to X2.
 
+defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+
 plugin: [ bgp.policy ]
 module: [ bgp ]
 
@@ -32,24 +34,24 @@ links:
 validate:
   session:
     description: Check EBGP sessions with DUT
-    wait: 20
+    wait: ebgp_session
     nodes: [ x1, x2 ]
     plugin: bgp_neighbor(node.bgp.neighbors,'dut')
 
   prefix:
     description: Check for DUT prefix on X1 and X2
-    wait: 30
+    wait: bgp_scan_long
     nodes: [ x1, x2 ]
     plugin: bgp_prefix('10.0.0.1/32')
 
   pfx_x1:
     description: Check the DUT prefix AS path on X1
-    wait: 10
     nodes: [ x1 ]
+    wait: bgp_scan_long
     plugin: bgp_prefix('10.0.0.1/32',aspath='65000 65000')
 
   pfx_x2:
     description: Check the DUT prefix AS path on X2
-    wait: 10
     nodes: [ x2 ]
+    wait: bgp_scan_long
     plugin: bgp_prefix('10.0.0.1/32',as_elements=[ 64999, 65000 ])