proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-26 02:13:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9531 from LabNConsulting/chopps/bgp-fast-reconnect

Browse Source 
tests: add global BGP json config for [re]connect timer
This commit is contained in:
Donald Sharp 2021-09-01 07:52:20 -04:00 committed by GitHub
commit 1fc8c09464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/topotests/lib/bgp.py
View File

@ -727,6 +727,7 @@ def __create_bgp_neighbor(topo, input_dict, router, addr_type, add_neigh=True):
tgen = get_topogen() tgen = get_topogen()
bgp_data = input_dict["address_family"] bgp_data = input_dict["address_family"]
neigh_data = bgp_data[addr_type]["unicast"]["neighbor"] neigh_data = bgp_data[addr_type]["unicast"]["neighbor"]
global_connect = input_dict.get("connecttimer", 5)
for name, peer_dict in neigh_data.items(): for name, peer_dict in neigh_data.items():
for dest_link, peer in peer_dict["dest_link"].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) 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) keep_alive = peer.setdefault("keepalivetimer", 3)
hold_down = peer.setdefault("holddowntimer", 10) hold_down = peer.setdefault("holddowntimer", 10)
password = peer.setdefault("password", None) 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) "{} timers {} {}".format(neigh_cxt, keep_alive, hold_down)
) )
if int(connect) != 120: if int(connect) != 120:
config_data.append("{} connect {}".format(neigh_cxt, connect)) config_data.append("{} timers connect {}".format(neigh_cxt, connect))
if graceful_restart: if graceful_restart:
config_data.append("{} graceful-restart".format(neigh_cxt)) config_data.append("{} graceful-restart".format(neigh_cxt))