proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13543 from donaldsharp/clear_up_clear_command

Browse Source 
Clear up clear command
This commit is contained in:
Christian Hopps 2023-05-17 13:41:43 -04:00 committed by GitHub
commit b4cf9c4847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/lib/topojson.py
View File

@ -316,6 +316,7 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
func_dict = OrderedDict( func_dict = OrderedDict(
[ [
("vrfs", create_vrf_cfg), ("vrfs", create_vrf_cfg),
("ospf", create_router_ospf),
("links", create_interfaces_cfg), ("links", create_interfaces_cfg),
("static_routes", create_static_routes), ("static_routes", create_static_routes),
("prefix_lists", create_prefix_lists), ("prefix_lists", create_prefix_lists),
@ -325,7 +326,6 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
("igmp", create_igmp_config), ("igmp", create_igmp_config),
("mld", create_mld_config), ("mld", create_mld_config),
("bgp", create_router_bgp), ("bgp", create_router_bgp),
("ospf", create_router_ospf),
] ]
) )

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

@ -1579,10 +1579,6 @@ 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

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

@ -1428,10 +1428,6 @@ 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