Merge pull request #6009 from kuldeepkash/bgp_basic_functionality

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

View File

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

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",
False)
keep_alive = peer.setdefault("keep_alive", 60)
hold_down = peer.setdefault("hold_down", 180)
keep_alive = peer.setdefault("keepalivetimer", 60)
hold_down = peer.setdefault("holddowntimer", 180)
password = peer.setdefault("password", None)
max_hop_limit = peer.setdefault("ebgp_multihop", 1)