From af9c65d44a4f21ac3899b28dd0dbbe900b17f544 Mon Sep 17 00:00:00 2001
From: Kuldeep Kashyap <kashyapk@vmware.com>
Date: Mon, 16 Mar 2020 19:51:41 +0000
Subject: [PATCH] tests: Optimize bgp-basic-functionality-topo1 test suite

1. Used aggresive values to verify keepalive and holddown timers functionality
2. Modified variable name in lib/bgp.py

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
---
 .../test_bgp_basic_functionality.py                      | 9 +++++----
 tests/topotests/lib/bgp.py                               | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
index e99111d90b..43639a81d1 100755
--- a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
+++ b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
@@ -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. """
 
diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py
index f3c17be684..997b72d691 100644
--- a/tests/topotests/lib/bgp.py
+++ b/tests/topotests/lib/bgp.py
@@ -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)
 
-- 
2.39.5