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

tests: reset neighbor state machine to avoid bad/stale state

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

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

@ -302,7 +302,6 @@ def __create_ospf_global(tgen, input_dict, router, build, load_config, ospf):
# ospf gr information # ospf gr information
gr_data = ospf_data.setdefault("graceful-restart", {}) gr_data = ospf_data.setdefault("graceful-restart", {})
if gr_data: if gr_data:
if "opaque" in gr_data and gr_data["opaque"]: if "opaque" in gr_data and gr_data["opaque"]:
cmd = "capability opaque" cmd = "capability opaque"
if gr_data.setdefault("delete", False): if gr_data.setdefault("delete", False):
@ -729,8 +728,10 @@ 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: {}] missing OSPF neighbor {} with router-id {}".format( errormsg = (
router, ospf_nbr, nbr_rid "[DUT: {}] missing OSPF neighbor {} with router-id {}".format(
router, ospf_nbr, nbr_rid
)
) )
return errormsg return errormsg
@ -844,7 +845,6 @@ def verify_ospf6_neighbor(tgen, topo=None, dut=None, input_dict=None, lan=False)
return errormsg return errormsg
for ospf_nbr, nbr_data in ospf_nbr_list.items(): for ospf_nbr, nbr_data in ospf_nbr_list.items():
try: try:
data_ip = data_rid = topo["routers"][ospf_nbr]["ospf6"]["router_id"] data_ip = data_rid = topo["routers"][ospf_nbr]["ospf6"]["router_id"]
except KeyError: except KeyError:
@ -915,7 +915,6 @@ def verify_ospf6_neighbor(tgen, topo=None, dut=None, input_dict=None, lan=False)
return errormsg return errormsg
continue continue
else: else:
for router, rnode in tgen.routers().items(): for router, rnode in tgen.routers().items():
if "ospf6" not in topo["routers"][router]: if "ospf6" not in topo["routers"][router]:
continue continue
@ -969,8 +968,10 @@ 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: {}] missing OSPF neighbor {} with router-id {}".format( errormsg = (
router, ospf_nbr, nbr_rid "[DUT: {}] missing OSPF neighbor {} with router-id {}".format(
router, ospf_nbr, nbr_rid
)
) )
return errormsg return errormsg
@ -1762,7 +1763,6 @@ def verify_ospf6_rib(
continue continue
if st_rt in ospf_rib_json: if st_rt in ospf_rib_json:
st_found = True st_found = True
found_routes.append(st_rt) found_routes.append(st_rt)

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

@ -977,7 +977,7 @@ def test_ospf_type5_summary_tc42_p0(request):
ip = topo["routers"]["r0"]["links"]["r3"]["ipv4"] ip = topo["routers"]["r0"]["links"]["r3"]["ipv4"]
ip_net = str(ipaddress.ip_interface(u"{}".format(ip)).network) ip_net = str(ipaddress.ip_interface("{}".format(ip)).network)
ospf_summ_r1 = { ospf_summ_r1 = {
"r0": { "r0": {
"ospf": {"summary-address": [{"prefix": ip_net.split("/")[0], "mask": "8"}]} "ospf": {"summary-address": [{"prefix": ip_net.split("/")[0], "mask": "8"}]}
@ -1579,6 +1579,10 @@ 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)
# clear neighbor state on both routers to avoid stale state
tgen.net["r0"].cmd("clear ip ospf neighbor")
tgen.net["r1"].cmd("clear ip ospf neighbor")
ospf_covergence = verify_ospf_neighbor(tgen, topo) ospf_covergence = verify_ospf_neighbor(tgen, topo)
assert ospf_covergence is True, "setup_module :Failed \n Error {}".format( assert ospf_covergence is True, "setup_module :Failed \n Error {}".format(
ospf_covergence ospf_covergence

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
View File

@ -565,7 +565,7 @@ def test_ospfv3_type5_summary_tc42_p0(request):
ip = topo["routers"]["r0"]["links"]["r3"]["ipv6"] ip = topo["routers"]["r0"]["links"]["r3"]["ipv6"]
ip_net = str(ipaddress.ip_interface(u"{}".format(ip)).network) ip_net = str(ipaddress.ip_interface("{}".format(ip)).network)
ospf_summ_r1 = { ospf_summ_r1 = {
"r0": { "r0": {
"ospf6": { "ospf6": {
@ -1428,6 +1428,10 @@ def ospfv3_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)
# restart interface state machine on both routers to avoid stale state
tgen.net["r0"].cmd("clear ipv6 ospf6 interface")
tgen.net["r1"].cmd("clear ipv6 ospf6 interface")
ospf_covergence = verify_ospf6_neighbor(tgen, topo) ospf_covergence = verify_ospf6_neighbor(tgen, topo)
assert ospf_covergence is True, "Testcase {} :Failed \n Error: {}".format( assert ospf_covergence is True, "Testcase {} :Failed \n Error: {}".format(
tc_name, ospf_covergence tc_name, ospf_covergence