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

isis-topo1: allow up to 90 sec for convergence

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2018-02-07 18:06:00 -05:00 committed by Donald Sharp
parent d868d685e3
commit cf469a232b
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/topotests/isis-topo1/test_isis_topo1.py
View File

@ -32,6 +32,7 @@ import os
import re import re
import sys import sys
import pytest import pytest
import time
CWD = os.path.dirname(os.path.realpath(__file__)) CWD = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(CWD, '../')) sys.path.append(os.path.join(CWD, '../'))
@ -126,21 +127,32 @@ def test_isis_convergence():
if tgen.routers_have_failure(): if tgen.routers_have_failure():
pytest.skip(tgen.errors) pytest.skip(tgen.errors)
topotest.sleep(45, "waiting for ISIS protocol to converge") logger.info("waiting for ISIS protocol to converge")
# Code to generate the json files. # Code to generate the json files.
# for rname, router in tgen.routers().iteritems(): # for rname, router in tgen.routers().iteritems():
# open('/tmp/{}_topology.json'.format(rname), 'w').write( # open('/tmp/{}_topology.json'.format(rname), 'w').write(
# json.dumps(show_isis_topology(router), indent=2, sort_keys=True) # json.dumps(show_isis_topology(router), indent=2, sort_keys=True)
# ) # )
wait = 90
for rname, router in tgen.routers().iteritems(): startt = time.time()
filename = '{0}/{1}/{1}_topology.json'.format(CWD, rname) loop = True
expected = json.loads(open(filename, 'r').read()) done = False
actual = show_isis_topology(router) while loop and not done:
assertmsg = "Router '{}' topology mismatch".format(rname) delta = time.time() - startt
assert topotest.json_cmp(actual, expected) is None, assertmsg loop = delta < wait
done = True
for rname, router in tgen.routers().iteritems():
filename = '{0}/{1}/{1}_topology.json'.format(CWD, rname)
expected = json.loads(open(filename, 'r').read())
actual = show_isis_topology(router)
if topotest.json_cmp(actual, expected) != None:
done = False
if loop == False:
assertmsg = "Router '%s' topology mismatch after +%4.2f secs" % (rname, delta)
assert topotest.json_cmp(actual, expected) is None, assertmsg
if loop and not done:
time.sleep (0.5)
logger.info("ISIS protocol converged after +%4.2f secs" % (delta))
def test_isis_route_installation(): def test_isis_route_installation():
"Check whether all expected routes are present" "Check whether all expected routes are present"