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

Merge pull request #12768 from louis-6wind/fix-grep-vpnv4-noretain

Browse Source 
tests: do not use exclude grep
This commit is contained in:
Donatas Abraitis 2023-02-08 21:53:19 +02:00 committed by GitHub
commit b9f352f0ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/topotests/bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py
View File

@ -134,12 +134,21 @@ def teardown_module(_mod):
def router_json_cmp_exact_filter(router, cmd, expected): def router_json_cmp_exact_filter(router, cmd, expected):
# filter out tableVersion, version and nhVrfID output = router.vtysh_cmd(cmd)
output = router.cmd('vtysh -c "{}" | grep -v ersion | grep -v nhVrfId'.format(cmd))
logger.info("{}: {}\n{}".format(router.name, cmd, output)) logger.info("{}: {}\n{}".format(router.name, cmd, output))
json_output = json.loads(output) json_output = json.loads(output)
# filter out tableVersion, version and nhVrfID
json_output.pop("tableVersion")
for rd, data in json_output["routes"]["routeDistinguishers"].items():
for prefix, attrs in data.items():
for attr in attrs:
if "nhVrfId" in attr:
attr.pop("nhVrfId")
if "version" in attr:
attr.pop("version")
return topotest.json_cmp(json_output, expected, exact=True) return topotest.json_cmp(json_output, expected, exact=True)