proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 10:38:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6009 from kuldeepkash/bgp_basic_functionality

Browse Source 
tests: Optimize bgp-basic-functionality-topo1 test suite
This commit is contained in:
Donald Sharp 2020-03-16 21:37:07 -04:00 committed by GitHub
commit 328ecc394b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
View File

@ -79,6 +79,9 @@ try:
except IOError: except IOError:
assert False, "Could not read file {}".format(jsonFile) assert False, "Could not read file {}".format(jsonFile)
#Global Variable
KEEPALIVETIMER = 2
HOLDDOWNTIMER = 6
class CreateTopo(Topo): class CreateTopo(Topo):
""" """
@ -292,8 +295,8 @@ def test_bgp_timers_functionality(request):
"r2": { "r2": {
"dest_link":{ "dest_link":{
"r1": { "r1": {
"keepalivetimer": 60, "keepalivetimer": KEEPALIVETIMER,
"holddowntimer": 180, "holddowntimer": HOLDDOWNTIMER
} }
} }
} }
@ -319,8 +322,6 @@ def test_bgp_timers_functionality(request):
write_test_footer(tc_name) write_test_footer(tc_name)
def test_static_routes(request): def test_static_routes(request):
""" Test to create and verify static routes. """ """ Test to create and verify static routes. """

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

@ -382,8 +382,8 @@ def __create_bgp_neighbor(topo, input_dict, router, addr_type, add_neigh=True):
disable_connected = peer.setdefault("disable_connected_check", disable_connected = peer.setdefault("disable_connected_check",
False) False)
keep_alive = peer.setdefault("keep_alive", 60) keep_alive = peer.setdefault("keepalivetimer", 60)
hold_down = peer.setdefault("hold_down", 180) hold_down = peer.setdefault("holddowntimer", 180)
password = peer.setdefault("password", None) password = peer.setdefault("password", None)
max_hop_limit = peer.setdefault("ebgp_multihop", 1) max_hop_limit = peer.setdefault("ebgp_multihop", 1)