matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

tests: do not use exclude grep

Browse source 
Filter out keys in JSON output with "grep -v" does not work when JSON
does not use the pretty format.

Use native python code to filter out keys.

Fixes: 6c13bd5744 ("topotests: fix bgp_vpnv4_noretain")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2023-02-08 12:05:15 +01:00
parent e7765b81ce
commit a8d6faa986
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):
# filter out tableVersion, version and nhVrfID
output = router.cmd('vtysh -c "{}" | grep -v ersion | grep -v nhVrfId'.format(cmd))
output = router.vtysh_cmd(cmd)
logger.info("{}: {}\n{}".format(router.name, cmd, 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)