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

tests: fix check for nhid in ipv6 table output

Browse Source 
Check based on actual output instead of assuming output based
on kernel version

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2020-03-20 23:53:39 +01:00
parent 14c40525be
commit 6214e11a6a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/ospf6-topo1/test_ospf6_topo1.py
View File

@ -319,18 +319,18 @@ def test_linux_ipv6_kernel_routingTable():
# Now compare the routing tables (after substituting link-local addresses)
for i in range(1, 5):
if topotest.version_cmp(platform.release(), '5.3') < 0:
# Actual output from router
actual = tgen.gears['r{}'.format(i)].run('ip -6 route').rstrip()
if "nhid" in actual:
refTableFile = os.path.join(CWD, 'r{}/ip_6_address.nhg.ref'.format(i))
else:
refTableFile = os.path.join(CWD, 'r{}/ip_6_address.ref'.format(i))
else:
refTableFile = os.path.join(CWD, 'r{}/ip_6_address.nhg.ref'.format(i))
if os.path.isfile(refTableFile):
if os.path.isfile(refTableFile):
expected = open(refTableFile).read().rstrip()
# Fix newlines (make them all the same)
expected = ('\n'.join(expected.splitlines())).splitlines(1)
# Actual output from router
actual = tgen.gears['r{}'.format(i)].run('ip -6 route').rstrip()
# Mask out Link-Local mac addresses
for ll in linklocals:
actual = actual.replace(ll[1], "fe80::__(%s)__" % ll[0])