mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-04-29 06:10:37 +00:00
tests: Run formatting script on test_isis_advertise_high_metrics.py
Apparently this is needed. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
8356f48119
commit
e503294060
@ -121,14 +121,14 @@ def _check_interface_metrics(router, expected_metrics):
|
|||||||
tgen = get_topogen()
|
tgen = get_topogen()
|
||||||
router = tgen.gears[router]
|
router = tgen.gears[router]
|
||||||
logger.info(f"check_interface_metrics {router}")
|
logger.info(f"check_interface_metrics {router}")
|
||||||
isis_interface_output = router.vtysh_cmd(
|
isis_interface_output = router.vtysh_cmd("show isis interface detail json")
|
||||||
"show isis interface detail json"
|
|
||||||
)
|
|
||||||
|
|
||||||
intf_json = json.loads(isis_interface_output)
|
intf_json = json.loads(isis_interface_output)
|
||||||
for i in range(len(expected_metrics)):
|
for i in range(len(expected_metrics)):
|
||||||
metric = intf_json["areas"][0]["circuits"][i]["interface"]["levels"][0]["metric"]
|
metric = intf_json["areas"][0]["circuits"][i]["interface"]["levels"][0][
|
||||||
if (metric != expected_metrics[i]):
|
"metric"
|
||||||
|
]
|
||||||
|
if metric != expected_metrics[i]:
|
||||||
intf_name = intf_json["areas"][0]["circuits"][i]["interface"]["name"]
|
intf_name = intf_json["areas"][0]["circuits"][i]["interface"]["name"]
|
||||||
return "{} with expected metric {} on {} got {}".format(
|
return "{} with expected metric {} on {} got {}".format(
|
||||||
router.name, expected_metrics[i], intf_name, metric
|
router.name, expected_metrics[i], intf_name, metric
|
||||||
@ -139,9 +139,7 @@ def _check_interface_metrics(router, expected_metrics):
|
|||||||
def check_interface_metrics(router, expected_metrics):
|
def check_interface_metrics(router, expected_metrics):
|
||||||
"Verfiy metrics on router's isis interfaces"
|
"Verfiy metrics on router's isis interfaces"
|
||||||
|
|
||||||
assertmsg = _check_interface_metrics(
|
assertmsg = _check_interface_metrics(router, expected_metrics)
|
||||||
router, expected_metrics
|
|
||||||
)
|
|
||||||
assert assertmsg is True, assertmsg
|
assert assertmsg is True, assertmsg
|
||||||
|
|
||||||
|
|
||||||
@ -151,9 +149,7 @@ def _check_lsp_metrics(router, lsp, expected_metrics):
|
|||||||
tgen = get_topogen()
|
tgen = get_topogen()
|
||||||
router = tgen.gears[router]
|
router = tgen.gears[router]
|
||||||
logger.info(f"check_lsp_metrics {router}")
|
logger.info(f"check_lsp_metrics {router}")
|
||||||
isis_lsp_output = router.vtysh_cmd(
|
isis_lsp_output = router.vtysh_cmd("show isis database detail {}".format(lsp))
|
||||||
"show isis database detail {}".format(lsp)
|
|
||||||
)
|
|
||||||
|
|
||||||
metrics_list = [int(i) for i in re.findall(r"Metric: (\d+)", isis_lsp_output)]
|
metrics_list = [int(i) for i in re.findall(r"Metric: (\d+)", isis_lsp_output)]
|
||||||
if len(metrics_list) == 0:
|
if len(metrics_list) == 0:
|
||||||
@ -170,9 +166,7 @@ def _check_lsp_metrics(router, lsp, expected_metrics):
|
|||||||
def check_lsp_metrics(router, lsp, expected_metrics):
|
def check_lsp_metrics(router, lsp, expected_metrics):
|
||||||
"Verfiy metrics on router's lsp"
|
"Verfiy metrics on router's lsp"
|
||||||
|
|
||||||
assertmsg = _check_lsp_metrics(
|
assertmsg = _check_lsp_metrics(router, lsp, expected_metrics)
|
||||||
router, lsp, expected_metrics
|
|
||||||
)
|
|
||||||
assert assertmsg is True, assertmsg
|
assert assertmsg is True, assertmsg
|
||||||
|
|
||||||
|
|
||||||
@ -183,14 +177,12 @@ def _check_ip_route(router, destination, expected_interface):
|
|||||||
tgen = get_topogen()
|
tgen = get_topogen()
|
||||||
router = tgen.gears[router]
|
router = tgen.gears[router]
|
||||||
logger.info(f"check_ip_route {router}")
|
logger.info(f"check_ip_route {router}")
|
||||||
route_output = router.vtysh_cmd(
|
route_output = router.vtysh_cmd("show ip route {} json".format(destination))
|
||||||
"show ip route {} json".format(destination)
|
|
||||||
)
|
|
||||||
route_json = json.loads(route_output)
|
route_json = json.loads(route_output)
|
||||||
|
|
||||||
interface = route_json[destination][0]["nexthops"][0]["interfaceName"]
|
interface = route_json[destination][0]["nexthops"][0]["interfaceName"]
|
||||||
|
|
||||||
if (interface != expected_interface):
|
if interface != expected_interface:
|
||||||
return "{} with expected route to {} got {} expected {}".format(
|
return "{} with expected route to {} got {} expected {}".format(
|
||||||
router.name, destination, interface, expected_interface
|
router.name, destination, interface, expected_interface
|
||||||
)
|
)
|
||||||
@ -201,9 +193,7 @@ def _check_ip_route(router, destination, expected_interface):
|
|||||||
def check_ip_route(router, destination, expected_interface):
|
def check_ip_route(router, destination, expected_interface):
|
||||||
"Verfiy IS-IS route"
|
"Verfiy IS-IS route"
|
||||||
|
|
||||||
assertmsg = _check_ip_route(
|
assertmsg = _check_ip_route(router, destination, expected_interface)
|
||||||
router, destination, expected_interface
|
|
||||||
)
|
|
||||||
assert assertmsg is True, assertmsg
|
assert assertmsg is True, assertmsg
|
||||||
|
|
||||||
|
|
||||||
@ -216,9 +206,7 @@ def test_isis_daemon_up():
|
|||||||
|
|
||||||
for router in ["r1", "r2", "r3", "r4"]:
|
for router in ["r1", "r2", "r3", "r4"]:
|
||||||
r = tgen.gears[router]
|
r = tgen.gears[router]
|
||||||
daemons = r.vtysh_cmd(
|
daemons = r.vtysh_cmd("show daemons")
|
||||||
"show daemons"
|
|
||||||
)
|
|
||||||
assert "isisd" in daemons
|
assert "isisd" in daemons
|
||||||
|
|
||||||
# Verify initial metric values.
|
# Verify initial metric values.
|
||||||
|
Loading…
Reference in New Issue
Block a user