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

tests: log the router id in ospf tests, improve log in a couple of places

Browse Source 
Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
Jafar Al-Gharaibeh 2023-05-10 15:40:00 -05:00
parent bc05bccbdc
commit ba607fdfcb
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -710,6 +710,7 @@ def verify_ospf_neighbor(
else: else:
data_ip = topo["routers"][ospf_nbr]["links"] data_ip = topo["routers"][ospf_nbr]["links"]
data_rid = topo["routers"][ospf_nbr]["ospf"]["router_id"] data_rid = topo["routers"][ospf_nbr]["ospf"]["router_id"]
logger.info("ospf neighbor %s: router-id: %s", router, data_rid)
if ospf_nbr in data_ip: if ospf_nbr in data_ip:
nbr_details = nbr_data[ospf_nbr] nbr_details = nbr_data[ospf_nbr]
elif lan: elif lan:
@ -728,8 +729,8 @@ def verify_ospf_neighbor(
try: try:
nh_state = show_ospf_json[nbr_rid][0]["nbrState"].split("/")[0] nh_state = show_ospf_json[nbr_rid][0]["nbrState"].split("/")[0]
except KeyError: except KeyError:
errormsg = "[DUT: {}] OSPF peer {} missing,from " "{} ".format( errormsg = "[DUT: {}] missing OSPF neighbor {} with router-id {}".format(
router, nbr_rid, ospf_nbr router, ospf_nbr, nbr_rid
) )
return errormsg return errormsg
@ -945,7 +946,7 @@ def verify_ospf6_neighbor(tgen, topo=None, dut=None, input_dict=None, lan=False)
data_ip = data_rid = topo["routers"][nbr_data["nbr"]]["ospf6"][ data_ip = data_rid = topo["routers"][nbr_data["nbr"]]["ospf6"][
"router_id" "router_id"
] ]
logger.info("ospf neighbor %s: router-id: %s", ospf_nbr, data_rid)
if ospf_nbr in data_ip: if ospf_nbr in data_ip:
nbr_details = nbr_data[ospf_nbr] nbr_details = nbr_data[ospf_nbr]
elif lan: elif lan:
@ -968,8 +969,8 @@ def verify_ospf6_neighbor(tgen, topo=None, dut=None, input_dict=None, lan=False)
nh_state = get_index_val.get(neighbor_ip)["state"] nh_state = get_index_val.get(neighbor_ip)["state"]
intf_state = get_index_val.get(neighbor_ip)["ifState"] intf_state = get_index_val.get(neighbor_ip)["ifState"]
except TypeError: except TypeError:
errormsg = "[DUT: {}] OSPF peer {} missing,from " "{} ".format( errormsg = "[DUT: {}] missing OSPF neighbor {} with router-id {}".format(
router, nbr_rid, ospf_nbr router, ospf_nbr, nbr_rid
) )
return errormsg return errormsg

12
tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py
View File

@ -84,8 +84,8 @@ SUMMARY = {"ipv4": ["11.0.0.0/8", "12.0.0.0/8", "11.0.0.0/24"]}
""" """
TOPOOLOGY = TOPOOLOGY =
Please view in a fixed-width font such as Courier. Please view in a fixed-width font such as Courier.
+---+ A0 +---+ +---+ A0 +---+
+R1 +------------+R2 | |R1 +------------+R2 |
+-+-+- +--++ +-+-+- +--++
| -- -- | | -- -- |
| -- A0 -- | | -- A0 -- |
@ -94,8 +94,8 @@ TOPOOLOGY =
| -- -- | | -- -- |
| -- -- | | -- -- |
+-+-+- +-+-+ +-+-+- +-+-+
+R0 +-------------+R3 | |R0 +-------------+R3 |
+---+ A0 +---+ +---+ A0 +---+
TESTCASES = TESTCASES =
1. OSPF summarisation functionality. 1. OSPF summarisation functionality.
@ -1519,7 +1519,7 @@ def test_ospf_type5_summary_tc45_p0(request):
step("Repeat steps 1 to 10 of summarisation in non Back bone area.") step("Repeat steps 1 to 10 of summarisation in non Back bone area.")
reset_config_on_routers(tgen) reset_config_on_routers(tgen)
step("Change the area id on the interface on R0") step("Change the area id on the interface on R0 to R1 from 0.0.0.0 to 0.0.0.1")
input_dict = { input_dict = {
"r0": { "r0": {
"links": { "links": {
@ -1549,7 +1549,7 @@ def test_ospf_type5_summary_tc45_p0(request):
result = create_interfaces_cfg(tgen, input_dict) result = create_interfaces_cfg(tgen, input_dict)
assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result)
step("Change the area id on the interface ") step("Change the area id on the interface on R1 to R0 from 0.0.0.0 to 0.0.0.1")
input_dict = { input_dict = {
"r1": { "r1": {
"links": { "links": {