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

tests: use std polling for results in zebra_rib test

Browse Source 
In particular, the fixed 2 second sleep here was not long enough.
Switch to standard run_and_expect polling to make test more robust.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2021-08-21 13:37:42 -04:00
parent 2570a9f165
commit b604f58641
1 changed files with 53 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
tests/topotests/zebra_rib/test_zebra_rib.py
View File

@ -104,13 +104,19 @@ def test_zebra_kernel_admin_distance():
r1 = tgen.gears["r1"] r1 = tgen.gears["r1"]
# Route with 255/8192 metric # Route with 255/8192 metric
r1.run("ip route add 4.5.1.0/24 via 192.168.210.2 dev r1-eth0 metric 4278198272")
distance = 255
metric = 8192
def makekmetric(dist, metric):
return (dist << 24) + metric
r1.run("ip route add 4.5.1.0/24 via 192.168.210.2 dev r1-eth0 metric " + str(makekmetric(255, 8192)))
# Route with 1/1 metric # Route with 1/1 metric
r1.run("ip route add 4.5.2.0/24 via 192.168.211.2 dev r1-eth1 metric 16777217") r1.run("ip route add 4.5.2.0/24 via 192.168.211.2 dev r1-eth1 metric " + str(makekmetric(1, 1)))
# Route with 10/1 metric # Route with 10/1 metric
r1.run("ip route add 4.5.3.0/24 via 192.168.212.2 dev r1-eth2 metric 167772161") r1.run("ip route add 4.5.3.0/24 via 192.168.212.2 dev r1-eth2 metric " + str(makekmetric(10, 1)))
# Same route with a 160/1 metric # Same route with a 160/1 metric
r1.run("ip route add 4.5.3.0/24 via 192.168.213.2 dev r1-eth3 metric 2684354561") r1.run("ip route add 4.5.3.0/24 via 192.168.213.2 dev r1-eth3 metric " + str(makekmetric(160, 1)))
# Currently I believe we have a bug here with the same route and different # Currently I believe we have a bug here with the same route and different
# metric. That needs to be properly resolved. Making a note for # metric. That needs to be properly resolved. Making a note for
@ -194,93 +200,69 @@ def test_route_map_usage():
static_rmapfile = "%s/r1/static_rmap.ref" % (thisDir) static_rmapfile = "%s/r1/static_rmap.ref" % (thisDir)
expected = open(static_rmapfile).read().rstrip() expected = open(static_rmapfile).read().rstrip()
expected = ("\n".join(expected.splitlines()) + "\n").rstrip() expected = ("\n".join(expected.splitlines()) + "\n").rstrip()
actual = r1.vtysh_cmd("show route-map static")
actual = ("\n".join(actual.splitlines()) + "\n").rstrip()
logger.info( logger.info(
"Does the show route-map static command run the correct number of times" "Does the show route-map static command run the correct number of times"
) )
def check_static_map_correct_runs():
diff = topotest.get_textdiff( actual = r1.vtysh_cmd("show route-map static")
actual, actual = ("\n".join(actual.splitlines()) + "\n").rstrip()
expected, return topotest.get_textdiff(
title1="Actual Route-map output", actual,
title2="Expected Route-map output", expected,
) title1="Actual Route-map output",
if diff: title2="Expected Route-map output",
logger.info("Actual:") )
logger.info(actual) ok, result = topotest.run_and_expect(check_static_map_correct_runs, "", count=5, wait=1)
logger.info("Expected:") assert ok, result
logger.info(expected)
srun = r1.vtysh_cmd("show run")
srun = ("\n".join(srun.splitlines()) + "\n").rstrip()
logger.info("Show run")
logger.info(srun)
assert 0, "r1 static route processing:\n"
sharp_rmapfile = "%s/r1/sharp_rmap.ref" % (thisDir) sharp_rmapfile = "%s/r1/sharp_rmap.ref" % (thisDir)
expected = open(sharp_rmapfile).read().rstrip() expected = open(sharp_rmapfile).read().rstrip()
expected = ("\n".join(expected.splitlines()) + "\n").rstrip() expected = ("\n".join(expected.splitlines()) + "\n").rstrip()
actual = r1.vtysh_cmd("show route-map sharp")
actual = ("\n".join(actual.splitlines()) + "\n").rstrip()
logger.info("Does the show route-map sharp command run the correct number of times") logger.info("Does the show route-map sharp command run the correct number of times")
def check_sharp_map_correct_runs():
diff = topotest.get_textdiff( actual = r1.vtysh_cmd("show route-map sharp")
actual, actual = ("\n".join(actual.splitlines()) + "\n").rstrip()
expected, return topotest.get_textdiff(
title1="Actual Route-map output", actual,
title2="Expected Route-map output", expected,
) title1="Actual Route-map output",
if diff: title2="Expected Route-map output",
logger.info("Actual:") )
logger.info(actual) ok, result = topotest.run_and_expect(check_sharp_map_correct_runs, "", count=5, wait=1)
logger.info("Expected:") assert ok, result
logger.info(expected)
srun = r1.vtysh_cmd("show run")
srun = ("\n".join(srun.splitlines()) + "\n").rstrip()
logger.info("Show run:")
logger.info(srun)
assert 0, "r1 sharp route-map processing:\n"
logger.info( logger.info(
"Add a extension to the static route-map to see the static route go away" "Add a extension to the static route-map to see the static route go away"
" and test that the routes installed are correct"
) )
r1.vtysh_cmd("conf\nroute-map sharp deny 5\nmatch ip address 5") r1.vtysh_cmd("conf\nroute-map sharp deny 5\nmatch ip address 5")
sleep(2)
# we are only checking the kernel here as that this will give us the implied # we are only checking the kernel here as that this will give us the implied
# testing of both the route-map and staticd withdrawing the route # testing of both the route-map and staticd withdrawing the route
# let's spot check that the routes were installed correctly # let's spot check that the routes were installed correctly
# in the kernel # in the kernel
logger.info("Test that the routes installed are correct")
sharp_ipfile = "%s/r1/iproute.ref" % (thisDir) sharp_ipfile = "%s/r1/iproute.ref" % (thisDir)
expected = open(sharp_ipfile).read().rstrip() expected = open(sharp_ipfile).read().rstrip()
expected = ("\n".join(expected.splitlines()) + "\n").rstrip() expected = ("\n".join(expected.splitlines()) + "\n").rstrip()
actual = r1.run("ip route show") def check_routes_installed():
actual = ("\n".join(actual.splitlines()) + "\n").rstrip() actual = r1.run("ip route show")
actual = re.sub(r" nhid [0-9][0-9]", "", actual) actual = ("\n".join(actual.splitlines()) + "\n").rstrip()
actual = re.sub(r" proto sharp", " proto XXXX", actual) actual = re.sub(r" nhid [0-9][0-9]", "", actual)
actual = re.sub(r" proto static", " proto XXXX", actual) actual = re.sub(r" proto sharp", " proto XXXX", actual)
actual = re.sub(r" proto 194", " proto XXXX", actual) actual = re.sub(r" proto static", " proto XXXX", actual)
actual = re.sub(r" proto 196", " proto XXXX", actual) actual = re.sub(r" proto 194", " proto XXXX", actual)
actual = re.sub(r" proto kernel", " proto XXXX", actual) actual = re.sub(r" proto 196", " proto XXXX", actual)
actual = re.sub(r" proto 2", " proto XXXX", actual) actual = re.sub(r" proto kernel", " proto XXXX", actual)
# Some platforms have double spaces? Why?????? actual = re.sub(r" proto 2", " proto XXXX", actual)
actual = re.sub(r" proto XXXX ", " proto XXXX ", actual) # Some platforms have double spaces? Why??????
actual = re.sub(r" metric", " metric", actual) actual = re.sub(r" proto XXXX ", " proto XXXX ", actual)
actual = re.sub(r" link ", " link ", actual) actual = re.sub(r" metric", " metric", actual)
diff = topotest.get_textdiff( actual = re.sub(r" link ", " link ", actual)
actual, expected, title1="Actual ip route show", title2="Expected ip route show" return topotest.get_textdiff(
) actual, expected, title1="Actual ip route show", title2="Expected ip route show"
)
if diff: ok, result = topotest.run_and_expect(check_routes_installed, "", count=5, wait=1)
logger.info("Actual:") assert ok, result
logger.info(actual)
logger.info("Expected:")
logger.info(expected)
srun = r1.vtysh_cmd("show run")
srun = ("\n".join(srun.splitlines()) + "\n").rstrip()
logger.info("Show run:")
logger.info(srun)
assert 0, "r1 ip route show is not correct:"
def test_memory_leak(): def test_memory_leak():