proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-04 15:53:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9761 from mjstapp/fix_topo_debug_cli

Browse Source 
tests: remove deprecated debug cli references
This commit is contained in:
Igor Ryzhov 2021-10-14 01:48:41 +03:00 committed by GitHub
commit 1aa12de695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/topotests/all_protocol_startup/test_all_protocol_startup.py
View File

@ -115,7 +115,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start() tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line # For debugging after starting FRR daemons, uncomment the next line
# CLI(net) # tgen.mininet_cli()
def teardown_module(module): def teardown_module(module):
@ -127,7 +127,8 @@ def teardown_module(module):
def test_router_running(): def test_router_running():
global fatal_error global fatal_error
net = get_topogen().net tgen = get_topogen()
net = tgen.net
# Skip if previous fatal error condition is raised # Skip if previous fatal error condition is raised
if fatal_error != "": if fatal_error != "":
@ -143,7 +144,7 @@ def test_router_running():
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line # For debugging after starting FRR daemons, uncomment the next line
# CLI(net) # tgen.mininet_cli()
def test_error_messages_vtysh(): def test_error_messages_vtysh():
@ -198,9 +199,6 @@ def test_error_messages_vtysh():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_error_messages_daemons(): def test_error_messages_daemons():
global fatal_error global fatal_error
@ -289,9 +287,6 @@ def test_error_messages_daemons():
assert error_logs == "", "Daemons report errors to StdErr" assert error_logs == "", "Daemons report errors to StdErr"
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_converge_protocols(): def test_converge_protocols():
global fatal_error global fatal_error
@ -325,7 +320,7 @@ def test_converge_protocols():
actual = ( actual = (
net["r%s" % i] net["r%s" % i]
.cmd( .cmd(
"vtysh -c \"show ip route\" | sed -e '/^Codes: /,/^\s*$/d' | sort 2> /dev/null" "vtysh -c \"show ip route\" | sed -e '/^Codes: /,/^\\s*$/d' | sort 2> /dev/null"
) )
.rstrip() .rstrip()
) )
@ -358,7 +353,7 @@ def test_converge_protocols():
actual = ( actual = (
net["r%s" % i] net["r%s" % i]
.cmd( .cmd(
"vtysh -c \"show ipv6 route\" | sed -e '/^Codes: /,/^\s*$/d' | sort 2> /dev/null" "vtysh -c \"show ipv6 route\" | sed -e '/^Codes: /,/^\\s*$/d' | sort 2> /dev/null"
) )
.rstrip() .rstrip()
) )
@ -379,9 +374,6 @@ def test_converge_protocols():
assert failures == 0, "IPv6 Routing table failed for r%s\n%s" % (i, diff) assert failures == 0, "IPv6 Routing table failed for r%s\n%s" % (i, diff)
# For debugging after starting FRR daemons, uncomment the next line
## CLI(net)
def route_get_nhg_id(route_str): def route_get_nhg_id(route_str):
net = get_topogen().net net = get_topogen().net
@ -567,8 +559,6 @@ def test_nexthop_groups():
% nhg_id % nhg_id
) )
##CLI(net)
## Remove all NHG routes ## Remove all NHG routes
net["r1"].cmd('vtysh -c "sharp remove routes 2.2.2.1 1"') net["r1"].cmd('vtysh -c "sharp remove routes 2.2.2.1 1"')
@ -638,9 +628,6 @@ def test_rip_status():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ripng_status(): def test_ripng_status():
global fatal_error global fatal_error
@ -705,9 +692,6 @@ def test_ripng_status():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ospfv2_interfaces(): def test_ospfv2_interfaces():
global fatal_error global fatal_error
@ -790,9 +774,6 @@ def test_ospfv2_interfaces():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_isis_interfaces(): def test_isis_interfaces():
global fatal_error global fatal_error
@ -856,9 +837,6 @@ def test_isis_interfaces():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_bgp_summary(): def test_bgp_summary():
global fatal_error global fatal_error
@ -1037,9 +1015,6 @@ def test_bgp_summary():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_bgp_ipv6_summary(): def test_bgp_ipv6_summary():
global fatal_error global fatal_error
@ -1138,12 +1113,15 @@ def test_bgp_ipv6_summary():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_nht(): def test_nht():
global fatal_error
net = get_topogen().net net = get_topogen().net
# Skip if previous fatal error condition is raised
if fatal_error != "":
pytest.skip(fatal_error)
print("\n\n**** Test that nexthop tracking is at least nominally working ****\n") print("\n\n**** Test that nexthop tracking is at least nominally working ****\n")
thisDir = os.path.dirname(os.path.realpath(__file__)) thisDir = os.path.dirname(os.path.realpath(__file__))
@ -1256,9 +1234,6 @@ def test_bgp_ipv4():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_bgp_ipv6(): def test_bgp_ipv6():
global fatal_error global fatal_error
@ -1325,9 +1300,6 @@ def test_bgp_ipv6():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_route_map(): def test_route_map():
global fatal_error global fatal_error
@ -1567,9 +1539,6 @@ def test_mpls_interfaces():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr(): def test_shutdown_check_stderr():
global fatal_error global fatal_error

26
tests/topotests/ldp_topo1/test_ldp_topo1.py
View File

@ -126,7 +126,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start() tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line # For debugging after starting FRR daemons, uncomment the next line
# CLI(net) # tgen.mininet_cli()
def teardown_module(module): def teardown_module(module):
@ -153,9 +153,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_interfaces(): def test_mpls_interfaces():
global fatal_error global fatal_error
@ -219,9 +216,6 @@ def test_mpls_interfaces():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_neighbor_establish(): def test_mpls_ldp_neighbor_establish():
global fatal_error global fatal_error
@ -356,9 +350,6 @@ def test_mpls_ldp_discovery():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_neighbor(): def test_mpls_ldp_neighbor():
global fatal_error global fatal_error
@ -426,9 +417,6 @@ def test_mpls_ldp_neighbor():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_binding(): def test_mpls_ldp_binding():
global fatal_error global fatal_error
@ -518,9 +506,6 @@ def test_mpls_ldp_binding():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv4_routingTable(): def test_zebra_ipv4_routingTable():
global fatal_error global fatal_error
@ -595,9 +580,6 @@ def test_zebra_ipv4_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_table(): def test_mpls_table():
global fatal_error global fatal_error
@ -674,9 +656,6 @@ def test_mpls_table():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_linux_mpls_routes(): def test_linux_mpls_routes():
global fatal_error global fatal_error
@ -758,9 +737,6 @@ def test_linux_mpls_routes():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr(): def test_shutdown_check_stderr():
global fatal_error global fatal_error

17
tests/topotests/rip_topo1/test_rip_topo1.py
View File

@ -108,7 +108,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start() tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line # For debugging after starting FRR daemons, uncomment the next line
# CLI(net) # tgen.mininet_cli()
def teardown_module(module): def teardown_module(module):
@ -134,9 +134,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_converge_protocols(): def test_converge_protocols():
global fatal_error global fatal_error
@ -159,9 +156,6 @@ def test_converge_protocols():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_rip_status(): def test_rip_status():
global fatal_error global fatal_error
@ -220,9 +214,6 @@ def test_rip_status():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_rip_routes(): def test_rip_routes():
global fatal_error global fatal_error
@ -275,9 +266,6 @@ def test_rip_routes():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv4_routingTable(): def test_zebra_ipv4_routingTable():
global fatal_error global fatal_error
@ -341,9 +329,6 @@ def test_zebra_ipv4_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr(): def test_shutdown_check_stderr():
global fatal_error global fatal_error

17
tests/topotests/ripng_topo1/test_ripng_topo1.py
View File

@ -104,7 +104,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start() tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line # For debugging after starting FRR daemons, uncomment the next line
# CLI(net) # tgen.mininet_cli()
def teardown_module(module): def teardown_module(module):
@ -130,9 +130,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_converge_protocols(): def test_converge_protocols():
global fatal_error global fatal_error
@ -155,9 +152,6 @@ def test_converge_protocols():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ripng_status(): def test_ripng_status():
global fatal_error global fatal_error
@ -223,9 +217,6 @@ def test_ripng_status():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ripng_routes(): def test_ripng_routes():
global fatal_error global fatal_error
@ -290,9 +281,6 @@ def test_ripng_routes():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv6_routingTable(): def test_zebra_ipv6_routingTable():
global fatal_error global fatal_error
@ -358,9 +346,6 @@ def test_zebra_ipv6_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning() fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr(): def test_shutdown_check_stderr():
global fatal_error global fatal_error