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

tests: fix ospf cosmetic output

Browse Source 
Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
This commit is contained in:
ckishimo 2021-01-07 23:30:32 +01:00
parent 65980a0224
commit 9458be1aec
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/topotests/lib/common_config.py
View File

@ -1659,7 +1659,7 @@ def create_interfaces_cfg(tgen, topo, build=False):
interface_data.append("no ip ospf " " hello-interval") interface_data.append("no ip ospf " " hello-interval")
else: else:
interface_data.append( interface_data.append(
"ip ospf " " hello-interval {}".format(intf_ospf_hello) "ip ospf" " hello-interval {}".format(intf_ospf_hello)
) )
if "dead_interval" in ospf_data: if "dead_interval" in ospf_data:
@ -1670,7 +1670,7 @@ def create_interfaces_cfg(tgen, topo, build=False):
interface_data.append("no ip ospf" " dead-interval") interface_data.append("no ip ospf" " dead-interval")
else: else:
interface_data.append( interface_data.append(
"ip ospf " " dead-interval {}".format(intf_ospf_dead) "ip ospf" " dead-interval {}".format(intf_ospf_dead)
) )
if "network" in ospf_data: if "network" in ospf_data:
@ -3065,7 +3065,11 @@ def verify_rib(
errormsg = ( errormsg = (
"[DUT: {}]: tag value {}" "[DUT: {}]: tag value {}"
" is not matched for" " is not matched for"
" route {} in RIB \n".format(dut, _tag, st_rt,) " route {} in RIB \n".format(
dut,
_tag,
st_rt,
)
) )
return errormsg return errormsg
@ -3082,7 +3086,11 @@ def verify_rib(
errormsg = ( errormsg = (
"[DUT: {}]: metric value " "[DUT: {}]: metric value "
"{} is not matched for " "{} is not matched for "
"route {} in RIB \n".format(dut, metric, st_rt,) "route {} in RIB \n".format(
dut,
metric,
st_rt,
)
) )
return errormsg return errormsg

19
tests/topotests/lib/ospf.py
View File

@ -62,7 +62,7 @@ def create_router_ospf(tgen, topo, input_dict=None, build=False, load_config=Tru
"r1": { "r1": {
"ospf": { "ospf": {
"router_id": "22.22.22.22", "router_id": "22.22.22.22",
"area": [{ "id":0.0.0.0, "type": "nssa"}] "area": [{ "id": "0.0.0.0", "type": "nssa"}]
} }
} }
@ -327,7 +327,7 @@ def config_ospf_interface(tgen, topo, input_dict=None, build=False, load_config=
"links": { "links": {
"r2": { "r2": {
"ospf": { "ospf": {
"authentication": 'message-digest', "authentication": "message-digest",
"authentication-key": "ospf", "authentication-key": "ospf",
"message-digest-key": "10" "message-digest-key": "10"
} }
@ -376,6 +376,7 @@ def config_ospf_interface(tgen, topo, input_dict=None, build=False, load_config=
if data_ospf_area: if data_ospf_area:
cmd = "ip ospf area {}".format(data_ospf_area) cmd = "ip ospf area {}".format(data_ospf_area)
config_data.append(cmd) config_data.append(cmd)
# interface ospf auth # interface ospf auth
if data_ospf_auth: if data_ospf_auth:
if data_ospf_auth == "null": if data_ospf_auth == "null":
@ -522,7 +523,7 @@ def verify_ospf_neighbor(tgen, topo, dut=None, input_dict=None, lan=False):
logger.info("Verifying OSPF neighborship on router %s:", router) logger.info("Verifying OSPF neighborship on router %s:", router)
show_ospf_json = run_frr_cmd( show_ospf_json = run_frr_cmd(
rnode, "show ip ospf neighbor all json", isjson=True rnode, "show ip ospf neighbor all json", isjson=True
) )
# Verifying output dictionary show_ospf_json is empty or not # Verifying output dictionary show_ospf_json is empty or not
@ -844,19 +845,23 @@ def verify_ospf_rib(
if "routeType" not in ospf_rib_json[st_rt]: if "routeType" not in ospf_rib_json[st_rt]:
errormsg = ( errormsg = (
"[DUT: {}]: routeType missing" "[DUT: {}]: routeType missing"
"for route {} in OSPF RIB \n".format(dut, st_rt) " for route {} in OSPF RIB \n".format(
dut, st_rt
)
) )
return errormsg return errormsg
elif _rtype != ospf_rib_json[st_rt]["routeType"]: elif _rtype != ospf_rib_json[st_rt]["routeType"]:
errormsg = ( errormsg = (
"[DUT: {}]: routeType mismatch" "[DUT: {}]: routeType mismatch"
"for route {} in OSPF RIB \n".format(dut, st_rt) " for route {} in OSPF RIB \n".format(
dut, st_rt
)
) )
return errormsg return errormsg
else: else:
logger.info( logger.info(
"DUT: {}]: Found routeType {}" "[DUT: {}]: Found routeType {}"
"for route {}".format(dut, _rtype, st_rt) " for route {}".format(dut, _rtype, st_rt)
) )
if tag: if tag:
if "tag" not in ospf_rib_json[st_rt]: if "tag" not in ospf_rib_json[st_rt]: