tests: bgp_flowspec expand timings

Attempt to set the hold time in the bgp flowspec exabgp
config.  In addition it was noticed that upstream bgp_flowspec
tests are still not negotiating peering within the time frame
specified.  This is because the first tcp packet is missed
and no keepalive/hold time are negotiated and exabgp will
not attempt a reconnect for quite some time.  Make this
test slower when things go south.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/tests/topotests/bgp_flowspec/peer1/exabgp.cfg b/tests/topotests/bgp_flowspec/peer1/exabgp.cfg
index cd1fae5aba2454071bfa72185424f12524fb017e..383a95b6dd57983594951cd8745ca3edcf69664b 100644 (file)
--- a/tests/topotests/bgp_flowspec/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_flowspec/peer1/exabgp.cfg
@@ -1,5 +1,6 @@
 neighbor 10.0.1.1 {
 router-id 10.0.1.101;
+hold-time 10;
 local-address 10.0.1.101;
 local-as 100;
 peer-as 100;

diff --git a/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py b/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py
index b1bec1034befe06c1f859b0ab839bb4c452de4e0..a2be85962feb3294518d028a07bdce79b1fd0491 100644 (file)
--- a/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py
+++ b/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py
@@ -138,11 +138,12 @@ def test_bgp_convergence():
     test_func = functools.partial(
         topotest.router_json_cmp, router, "show bgp summary json", expected
     )
-    _, res = topotest.run_and_expect(test_func, None, count=90, wait=0.5)
+    _, res = topotest.run_and_expect(test_func, None, count=210, wait=1)
     assertmsg = "BGP router network did not converge"
     if res is not None:
         generate_support_bundle()
         assert res is None, assertmsg
+    generate_support_bundle()
 
 
 def test_bgp_flowspec():