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

tests: all_protocol_startup needs some tweaks to allow for processing

Browse Source 
The nexthop group code is installing routes and nexthop groups
and immediately expecting zebra to have processed the results
as a result there is a situation when the CI system is under
intense load that the nexthop group might not have been processed.

Add a bit of code to allow the test to give FRR some time
to finish work before declaring it not working.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-10-21 10:21:40 -04:00
parent 6d2edff594
commit 9482d96e3f
1 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
tests/topotests/all_protocol_startup/test_all_protocol_startup.py
View File

@ -34,7 +34,6 @@ import pytest
import glob
from time import sleep
pytestmark = [
pytest.mark.babeld,
pytest.mark.bgpd,
@ -389,34 +388,71 @@ def route_get_nhg_id(route_str):
def verify_nexthop_group(nhg_id, recursive=False, ecmp=0):
net = get_topogen().net
# Verify NHG is valid/installed
output = net["r1"].cmd('vtysh -c "show nexthop-group rib %d"' % nhg_id)
count = 0
valid = None
ecmpcount = None
depends = None
resolved_id = None
installed = None
found = False
match = re.search(r"Valid", output)
assert match is not None, "Nexthop Group ID=%d not marked Valid" % nhg_id
while not found and count < 10:
count += 1
# Verify NHG is valid/installed
output = net["r1"].cmd('vtysh -c "show nexthop-group rib %d"' % nhg_id)
valid = re.search(r"Valid", output)
if valid is None:
found = False
sleep(1)
continue
if ecmp or recursive:
ecmpcount = re.search(r"Depends:.*\n", output)
if ecmpcount is None:
found = False
sleep(1)
continue
# list of IDs in group
depends = re.findall(r"\((\d+)\)", ecmpcount.group(0))
if ecmp:
if len(depends) != ecmp:
found = False
sleep(1)
continue
else:
# If recursive, we need to look at its resolved group
if len(depends) != 1:
found = False
sleep(1)
continue
resolved_id = int(depends[0])
verify_nexthop_group(resolved_id, False)
else:
installed = re.search(r"Installed", output)
if installed is None:
found = False
sleep(1)
continue
found = True
assert valid is not None, "Nexthop Group ID=%d not marked Valid" % nhg_id
if ecmp or recursive:
match = re.search(r"Depends:.*\n", output)
assert match is not None, "Nexthop Group ID=%d has no depends" % nhg_id
# list of IDs in group
depends = re.findall(r"\((\d+)\)", match.group(0))
assert ecmpcount is not None, "Nexthop Group ID=%d has no depends" % nhg_id
if ecmp:
assert len(depends) == ecmp, (
"Nexthop Group ID=%d doesn't match ecmp size" % nhg_id
)
else:
# If recursive, we need to look at its resolved group
assert len(depends) == 1, (
"Nexthop Group ID=%d should only have one recursive depend" % nhg_id
)
resolved_id = int(depends[0])
verify_nexthop_group(resolved_id, False)
else:
match = re.search(r"Installed", output)
assert match is not None, "Nexthop Group ID=%d not marked Installed" % nhg_id
assert installed is not None, (
"Nexthop Group ID=%d not marked Installed" % nhg_id
)
def verify_route_nexthop_group(route_str, recursive=False, ecmp=0):
@ -447,7 +483,6 @@ def test_nexthop_groups():
# Create with sharpd using nexthop-group
net["r1"].cmd('vtysh -c "sharp install routes 2.2.2.1 nexthop-group basic 1"')
verify_route_nexthop_group("2.2.2.1/32")
## Connected
@ -457,7 +492,6 @@ def test_nexthop_groups():
)
net["r1"].cmd('vtysh -c "sharp install routes 2.2.2.2 nexthop-group connected 1"')
verify_route_nexthop_group("2.2.2.2/32")
## Recursive
@ -548,10 +582,16 @@ def test_nexthop_groups():
)
# Get routes and test if has too many (duplicate) nexthops
count = 0
dups = []
nhg_id = route_get_nhg_id("6.6.6.1/32")
output = net["r1"].cmd('vtysh -c "show nexthop-group rib %d"' % nhg_id)
while (len(dups) != 3) and count < 10:
output = net["r1"].cmd('vtysh -c "show nexthop-group rib %d"' % nhg_id)
dups = re.findall(r"(via 1\.1\.1\.1)", output)
dups = re.findall(r"(via 1\.1\.1\.1)", output)
if len(dups) != 3:
count += 1
sleep(1)
# Should find 3, itself is inactive
assert len(dups) == 3, (