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

tests: simplify nhrp_redundancy convergence

Browse Source 
Simplify nhrp_redundancy convergence code. Cosmetic change.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2024-08-30 14:14:17 +02:00
parent 551c3290ed
commit dbd888cce6
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
View File

@ -10,7 +10,6 @@
import os
import sys
import json
from time import sleep
from functools import partial
import pytest
@ -196,17 +195,15 @@ def test_protocols_convergence():
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
logger.info("Checking NHRP cache and IPv4 routes for convergence")
logger.info("Checking NHRP cache for convergence")
router_list = tgen.routers()
# Check NHRP cache on servers and clients
for rname, router in router_list.items():
json_file = "{}/{}/nhrp_cache.json".format(CWD, router.name)
if not os.path.isfile(json_file):
logger.info("skipping file {}".format(json_file))
if 'nh' not in rname:
continue
json_file = "{}/{}/nhrp_cache.json".format(CWD, router.name)
expected = json.loads(open(json_file).read())
test_func = partial(
topotest.router_json_cmp, router, "show ip nhrp cache json", expected
@ -220,13 +217,12 @@ def test_protocols_convergence():
assert result is None, assertmsg
# Check NHRP IPV4 routes on servers and clients
logger.info("Checking IPv4 routes for convergence")
for rname, router in router_list.items():
json_file = "{}/{}/nhrp_route.json".format(CWD, router.name)
if not os.path.isfile(json_file):
logger.info("skipping file {}".format(json_file))
if 'nh' not in rname:
continue
json_file = "{}/{}/nhrp_route.json".format(CWD, router.name)
expected = json.loads(open(json_file).read())
test_func = partial(
topotest.router_json_cmp, router, "show ip route nhrp json", expected