diff options
Diffstat (limited to 'tests/topotests/lib/bgp.py')
| -rw-r--r-- | tests/topotests/lib/bgp.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py index 04e4b6ebac..a4b65cb987 100644 --- a/tests/topotests/lib/bgp.py +++ b/tests/topotests/lib/bgp.py @@ -883,14 +883,6 @@ def clear_bgp_and_verify(tgen, topo, router): peer_uptime_before_clear_bgp = {} # Verifying BGP convergence before bgp clear command for retry in range(1, 11): - show_bgp_json = rnode.vtysh_cmd("show bgp summary json", - isjson=True) - logger.info(show_bgp_json) - # Verifying output dictionary show_bgp_json is empty or not - if not bool(show_bgp_json): - errormsg = "BGP is not running" - return errormsg - sleeptime = 2 * retry if sleeptime <= BGP_CONVERGENCE_TIMEOUT: # Waiting for BGP to converge @@ -902,6 +894,14 @@ def clear_bgp_and_verify(tgen, topo, router): " router {}".format(BGP_CONVERGENCE_TIMEOUT, router) return errormsg + show_bgp_json = rnode.vtysh_cmd("show bgp summary json", + isjson=True) + logger.info(show_bgp_json) + # Verifying output dictionary show_bgp_json is empty or not + if not bool(show_bgp_json): + errormsg = "BGP is not running" + return errormsg + # To find neighbor ip type bgp_addr_type = topo["routers"][router]["bgp"]["address_family"] for addr_type in bgp_addr_type.keys(): @@ -964,13 +964,6 @@ def clear_bgp_and_verify(tgen, topo, router): peer_uptime_after_clear_bgp = {} # Verifying BGP convergence after bgp clear command for retry in range(1, 11): - show_bgp_json = rnode.vtysh_cmd("show bgp summary json", - isjson=True) - # Verifying output dictionary show_bgp_json is empty or not - if not bool(show_bgp_json): - errormsg = "BGP is not running" - return errormsg - sleeptime = 2 * retry if sleeptime <= BGP_CONVERGENCE_TIMEOUT: # Waiting for BGP to converge @@ -982,6 +975,13 @@ def clear_bgp_and_verify(tgen, topo, router): " router {}".format(BGP_CONVERGENCE_TIMEOUT, router) return errormsg + show_bgp_json = rnode.vtysh_cmd("show bgp summary json", + isjson=True) + # Verifying output dictionary show_bgp_json is empty or not + if not bool(show_bgp_json): + errormsg = "BGP is not running" + return errormsg + # To find neighbor ip type bgp_addr_type = topo["routers"][router]["bgp"]["address_family"] |