Skip to content
Snippets Groups Projects
Commit cd02954c authored by Bob Lantz's avatar Bob Lantz
Browse files

pass code check

parent 93be1d04
No related branches found
No related tags found
No related merge requests found
......@@ -48,8 +48,8 @@ def cleanup( cls):
"""Clean up junk which might be left over from old runs;
do fast stuff before slow dp and link removal!"""
info("*** Removing excess controllers/ofprotocols/ofdatapaths/pings/noxes"
"\n")
info( "*** Removing excess controllers/ofprotocols/ofdatapaths/"
"pings/noxes\n" )
zombies = 'controller ofprotocol ofdatapath ping nox_core lt-nox_core '
zombies += 'ovs-openflowd ovs-controller udpbwtest mnexec ivs'
# Note: real zombie processes can't actually be killed, since they
......@@ -87,7 +87,8 @@ def cleanup( cls):
info( "*** Removing all links of the pattern foo-ethX\n" )
links = sh( "ip link show | "
"egrep -o '([-_.[:alnum:]]+-eth[[:digit:]]+)'" ).splitlines()
"egrep -o '([-_.[:alnum:]]+-eth[[:digit:]]+)'"
).splitlines()
for link in links:
if link:
sh( "ip link del " + link )
......@@ -95,7 +96,7 @@ def cleanup( cls):
if 'tap9' in sh( 'ip link show' ):
info( "*** Removing tap9 - assuming it's from cluster edition\n" )
sh( 'ip link del tap9' )
info( "*** Killing stale mininet node processes\n" )
killprocs( 'mininet:' )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment