Fix: Cisco IOS/XE takes forever to redistribute into IPv6 BGP AF

The IS-IS redistribution test was failing on IOS/XE devices, and the
only way to "fix" that was to extend the timer. Oh, well...

Author: ipspace

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

@@ -115,6 +115,14 @@ validate:
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ r2 ]
     plugin: ospf6_prefix(pfx=nodes.r3.loopback.ipv6)
+  static_4:
+    description: Check whether static IPv4 prefix is redistributed into IS-IS
+    nodes: [ r3 ]
+    plugin: isis_prefix(pfx=nodes.dut.routing.static[0].ipv4,af='ipv4')
+  static_6:
+    description: Check whether static IPv6 prefix is redistributed into IS-IS
+    nodes: [ r3 ]
+    plugin: isis_prefix(pfx=nodes.dut.routing.static[1].ipv6,af='ipv6')
   bgp_v4:
     description: Check whether R3 IS-IS IPv4 prefix is redistributed into BGP
     wait: bgp_scan_time
@@ -123,15 +131,7 @@ validate:
     plugin: bgp_prefix(pfx=nodes.r3.loopback.ipv4,af='ipv4')
   bgp_v6:
     description: Check whether R3 IS-IS IPv6 prefix is redistributed into BGP
-    wait: bgp_scan_time
+    wait: bgp_ios_redist
     wait_msg: Waiting for the loopback prefix to be originated and redistributed
     nodes: [ x1 ]
     plugin: bgp_prefix(pfx=nodes.r3.loopback.ipv6,af='ipv6')
-  static_4:
-    description: Check whether static IPv4 prefix is redistributed into IS-IS
-    nodes: [ r3 ]
-    plugin: isis_prefix(pfx=nodes.dut.routing.static[0].ipv4,af='ipv4')
-  static_6:
-    description: Check whether static IPv6 prefix is redistributed into IS-IS
-    nodes: [ r3 ]
-    plugin: isis_prefix(pfx=nodes.dut.routing.static[1].ipv6,af='ipv6')

tests/integration/wait_times.yml

@@ -18,7 +18,8 @@ const.validate:
   ebgp_session: 30
   ibgp_session: 30
   bgp_scan_time: 5
-  bgp_scan_long: 15               # Needed for things that might require multiple scans like aggregate prefixes
+  bgp_scan_long: 15       # Needed for things that might require multiple scans like aggregate prefixes
+  bgp_ios_redist: 60      # The ridiculously long time it takes Cisco IOS/XE to start redistribution into IPv6 AF
 
   isis_adj_p2p: 20
   isis_spf: 15