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

Merge pull request #11248 from donaldsharp/fix_pbr_topo1

Browse Source 
tests: pbr_topo1 sometimes fails under really heavy load
This commit is contained in:
Donatas Abraitis 2022-05-24 17:49:24 +03:00 committed by GitHub
commit c0fcf5cd8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/pbr_topo1/test_pbr_topo1.py
View File

@ -234,15 +234,23 @@ def test_rule_linux_installation():
logger.info("Checking for installed PBR rules in OS") logger.info("Checking for installed PBR rules in OS")
def _get_router_rules(router, expected):
actual = topotest.ip_rules(router)
logger.info(actual)
return topotest.json_cmp(actual, expected)
router_list = tgen.routers().values() router_list = tgen.routers().values()
for router in router_list: for router in router_list:
rules_file = "{}/{}/linux-rules.json".format(CWD, router.name) rules_file = "{}/{}/linux-rules.json".format(CWD, router.name)
actual = topotest.ip_rules(router)
expected = json.loads(open(rules_file).read()) expected = json.loads(open(rules_file).read())
test_func = partial(_get_router_rules, router, expected)
_, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
assertmsg = "Router {} OS rules mismatch".format(router.name) assertmsg = "Router {} OS rules mismatch".format(router.name)
assert topotest.json_cmp(actual, expected) is None, assertmsg assert result is None, assertmsg
if __name__ == "__main__": if __name__ == "__main__":