diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-09-01 07:52:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-01 07:52:20 -0400 |
| commit | 1fc8c0946479e559892fbb4bc332df647f22c3d9 (patch) | |
| tree | 7c210075dc2391d4a6213d299b0adb8edb05e91b | |
| parent | e5fbfe01ae6239bc132b80c2cb374181ef16f227 (diff) | |
| parent | e99b4bd6baea760dcdfc2f9c6ca9eafba51d4550 (diff) | |
Merge pull request #9531 from LabNConsulting/chopps/bgp-fast-reconnect
tests: add global BGP json config for [re]connect timer
| -rw-r--r-- | tests/topotests/lib/bgp.py | 5 |
1 files changed, 3 insertions, 2 deletions
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)) |