From: Christian Hopps Date: Wed, 1 Sep 2021 07:44:42 +0000 (-0400) Subject: tests: add global BGP json config for [re]connect timer X-Git-Tag: base_8.1~126^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e99b4bd6baea760dcdfc2f9c6ca9eafba51d4550;p=matthieu%2Ffrr.git tests: add global BGP json config for [re]connect timer - Fix the syntax. Signed-off-by: Christian Hopps --- diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py index afa7f7fdaf..519cd6735b 100644 --- a/tests/topotests/lib/bgp.py +++ b/tests/topotests/lib/bgp.py @@ -727,6 +727,7 @@ def __create_bgp_neighbor(topo, input_dict, router, addr_type, add_neigh=True): tgen = get_topogen() bgp_data = input_dict["address_family"] neigh_data = bgp_data[addr_type]["unicast"]["neighbor"] + global_connect = input_dict.get("connecttimer", 5) for name, peer_dict in neigh_data.items(): for dest_link, peer in peer_dict["dest_link"].items(): @@ -806,7 +807,7 @@ def __create_bgp_neighbor(topo, input_dict, router, addr_type, add_neigh=True): ) disable_connected = peer.setdefault("disable_connected_check", False) - connect = peer.setdefault("connecttimer", 120) + connect = peer.get("connecttimer", global_connect) keep_alive = peer.setdefault("keepalivetimer", 3) hold_down = peer.setdefault("holddowntimer", 10) password = peer.setdefault("password", None) @@ -837,7 +838,7 @@ def __create_bgp_neighbor(topo, input_dict, router, addr_type, add_neigh=True): "{} timers {} {}".format(neigh_cxt, keep_alive, hold_down) ) if int(connect) != 120: - config_data.append("{} connect {}".format(neigh_cxt, connect)) + config_data.append("{} timers connect {}".format(neigh_cxt, connect)) if graceful_restart: config_data.append("{} graceful-restart".format(neigh_cxt))