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

tests: bgp_multiview_topo1 was taking too long

Browse Source 
The bgp_multiview_topo1 test had two issues

a) An abbundance of sleeps that are not necessary
b) The convergence time was too short.

The upshoot of this is that the test goes from 72 -> 33 seconds
run time on my machine.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2020-02-19 07:56:50 -05:00
parent 40b0108887
commit 12a939b7e7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
View File

@ -151,8 +151,7 @@ def setup_module(module):
net['r%s' % i].startRouter() net['r%s' % i].startRouter()
# Starting PE Hosts and init ExaBGP on each of them # Starting PE Hosts and init ExaBGP on each of them
print('*** Starting BGP on all 8 Peers in 10s') print('*** Starting BGP on all 8 Peers')
sleep(10)
for i in range(1, 9): for i in range(1, 9):
net['peer%s' % i].cmd('cp %s/exabgp.env /etc/exabgp/exabgp.env' % thisDir) net['peer%s' % i].cmd('cp %s/exabgp.env /etc/exabgp/exabgp.env' % thisDir)
net['peer%s' % i].cmd('cp %s/peer%s/* /etc/exabgp/' % (thisDir, i)) net['peer%s' % i].cmd('cp %s/peer%s/* /etc/exabgp/' % (thisDir, i))
@ -191,7 +190,6 @@ def test_router_running():
print("\n\n** Check if FRR/Quagga is running on each Router node") print("\n\n** Check if FRR/Quagga is running on each Router node")
print("******************************************\n") print("******************************************\n")
sleep(5)
# Starting Routers # Starting Routers
for i in range(1, 2): for i in range(1, 2):
@ -215,7 +213,7 @@ def test_bgp_converge():
# Wait for BGP to converge (All Neighbors in either Full or TwoWay State) # Wait for BGP to converge (All Neighbors in either Full or TwoWay State)
print("\n\n** Verify for BGP to converge") print("\n\n** Verify for BGP to converge")
print("******************************************\n") print("******************************************\n")
timeout = 60 timeout = 125
while timeout > 0: while timeout > 0:
print("Timeout in %s: " % timeout), print("Timeout in %s: " % timeout),
sys.stdout.flush() sys.stdout.flush()
@ -240,9 +238,9 @@ def test_bgp_converge():
bgpStatus = net['r%s' % i].cmd('vtysh -c "show ip bgp view %s summary"' % view) bgpStatus = net['r%s' % i].cmd('vtysh -c "show ip bgp view %s summary"' % view)
assert False, "BGP did not converge:\n%s" % bgpStatus assert False, "BGP did not converge:\n%s" % bgpStatus
# Wait for an extra 30s to announce all routes # Wait for an extra 5s to announce all routes
print('Waiting 30s for routes to be announced'); print('Waiting 5s for routes to be announced');
sleep(30) sleep(5)
print("BGP converged.") print("BGP converged.")