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

tests: print actual time spent waiting for bgp convergence

Browse Source 
Stop printing hard-coded 30 seconds in a couple of places in
bgp.py in the topojson infra - print the actual time
spent waiting.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-07-09 09:51:16 -04:00
parent 1cbb3675f2
commit 526d442fe4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1467,9 +1467,10 @@ def clear_bgp_and_verify(tgen, topo, router):
rnode = tgen.routers()[router] rnode = tgen.routers()[router]
peer_uptime_before_clear_bgp = {} peer_uptime_before_clear_bgp = {}
sleeptime = 3
# Verifying BGP convergence before bgp clear command # Verifying BGP convergence before bgp clear command
for retry in range(44): for retry in range(44):
sleeptime = 3
# Waiting for BGP to converge # Waiting for BGP to converge
logger.info( logger.info(
"Waiting for %s sec for BGP to converge on router" " %s...", "Waiting for %s sec for BGP to converge on router" " %s...",
@ -1536,8 +1537,8 @@ def clear_bgp_and_verify(tgen, topo, router):
) )
else: else:
errormsg = ( errormsg = (
"TIMEOUT!! BGP is not converged in 30 seconds for" "TIMEOUT!! BGP is not converged in {} seconds for"
" router {}".format(router) " router {}".format(retry * sleeptime, router)
) )
return errormsg return errormsg
@ -1552,7 +1553,7 @@ def clear_bgp_and_verify(tgen, topo, router):
peer_uptime_after_clear_bgp = {} peer_uptime_after_clear_bgp = {}
# Verifying BGP convergence after bgp clear command # Verifying BGP convergence after bgp clear command
for retry in range(44): for retry in range(44):
sleeptime = 3
# Waiting for BGP to converge # Waiting for BGP to converge
logger.info( logger.info(
"Waiting for %s sec for BGP to converge on router" " %s...", "Waiting for %s sec for BGP to converge on router" " %s...",
@ -1615,8 +1616,8 @@ def clear_bgp_and_verify(tgen, topo, router):
) )
else: else:
errormsg = ( errormsg = (
"TIMEOUT!! BGP is not converged in 30 seconds for" "TIMEOUT!! BGP is not converged in {} seconds for"
" router {}".format(router) " router {}".format(retry * sleeptime, router)
) )
return errormsg return errormsg