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

Merge pull request #8540 from donaldsharp/kill_them_all

Browse Source 
tests: Remove kill_mininet_router_process
This commit is contained in:
Rafael Zalamena 2021-04-26 11:52:38 +00:00 committed by GitHub
commit ae08637827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1.py
View File

@ -134,7 +134,6 @@ from lib.common_config import (
check_router_status, check_router_status,
shutdown_bringup_interface, shutdown_bringup_interface,
step, step,
kill_mininet_routers_process,
get_frr_ipv6_linklocal, get_frr_ipv6_linklocal,
create_route_maps, create_route_maps,
required_linux_kernel_version, required_linux_kernel_version,
@ -204,9 +203,6 @@ def setup_module(mod):
tgen = Topogen(GenerateTopo, mod.__name__) tgen = Topogen(GenerateTopo, mod.__name__)
# ... and here it calls Mininet initialization functions. # ... and here it calls Mininet initialization functions.
# Kill stale mininet routers and process
kill_mininet_routers_process(tgen)
# Starting topology, create tmp files which are loaded to routers # Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers # to start deamons and then start routers
start_topology(tgen) start_topology(tgen)

1
tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2.py
View File

@ -133,7 +133,6 @@ from lib.common_config import (
check_router_status, check_router_status,
shutdown_bringup_interface, shutdown_bringup_interface,
step, step,
kill_mininet_routers_process,
get_frr_ipv6_linklocal, get_frr_ipv6_linklocal,
create_route_maps, create_route_maps,
required_linux_kernel_version, required_linux_kernel_version,

4
tests/topotests/bgp_multi_vrf_topo1/test_bgp_multi_vrf_topo1.py
View File

@ -128,7 +128,6 @@ from lib.common_config import (
create_static_routes, create_static_routes,
create_prefix_lists, create_prefix_lists,
create_interface_in_kernel, create_interface_in_kernel,
kill_mininet_routers_process,
create_bgp_community_lists, create_bgp_community_lists,
check_router_status, check_router_status,
apply_raw_config, apply_raw_config,
@ -229,9 +228,6 @@ def setup_module(mod):
tgen = Topogen(CreateTopo, mod.__name__) tgen = Topogen(CreateTopo, mod.__name__)
# ... and here it calls Mininet initialization functions. # ... and here it calls Mininet initialization functions.
# Kill stale mininet routers and process
kill_mininet_routers_process(tgen)
# Starting topology, create tmp files which are loaded to routers # Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers # to start deamons and then start routers
start_topology(tgen) start_topology(tgen)

4
tests/topotests/bgp_multi_vrf_topo2/test_bgp_multi_vrf_topo2.py
View File

@ -87,7 +87,6 @@ from lib.common_config import (
create_vrf_cfg, create_vrf_cfg,
create_interfaces_cfg, create_interfaces_cfg,
create_interface_in_kernel, create_interface_in_kernel,
kill_mininet_routers_process,
get_frr_ipv6_linklocal, get_frr_ipv6_linklocal,
check_router_status, check_router_status,
apply_raw_config, apply_raw_config,
@ -182,9 +181,6 @@ def setup_module(mod):
tgen = Topogen(CreateTopo, mod.__name__) tgen = Topogen(CreateTopo, mod.__name__)
# ... and here it calls Mininet initialization functions. # ... and here it calls Mininet initialization functions.
# Kill stale mininet routers and process
kill_mininet_routers_process(tgen)
# Starting topology, create tmp files which are loaded to routers # Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers # to start deamons and then start routers
start_topology(tgen) start_topology(tgen)

1
tests/topotests/bgp_recursive_route_ebgp_multi_hop/test_bgp_recursive_route_ebgp_multi_hop.py
View File

@ -71,7 +71,6 @@ from lib.common_config import (
shutdown_bringup_interface, shutdown_bringup_interface,
addKernelRoute, addKernelRoute,
delete_route_maps, delete_route_maps,
kill_mininet_routers_process,
) )
from lib.topolog import logger from lib.topolog import logger
from lib.bgp import ( from lib.bgp import (

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

@ -401,30 +401,6 @@ def start_router_daemons(tgen, router, daemons):
return res return res
def kill_mininet_routers_process(tgen):
"""
Kill all mininet stale router' processes
* `tgen` : topogen object
"""
router_list = tgen.routers()
for rname, router in router_list.items():
daemon_list = [
"zebra",
"ospfd",
"ospf6d",
"bgpd",
"ripd",
"ripngd",
"isisd",
"pimd",
"ldpd",
"staticd",
]
for daemon in daemon_list:
router.run("killall -9 {}".format(daemon))
def check_router_status(tgen): def check_router_status(tgen):
""" """
Check if all daemons are running for all routers in topology Check if all daemons are running for all routers in topology