Skip to content

Refactor the do_switch command to accept multiple switches #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheriimoya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor the do_switch command to accept multiple switches #1112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions mininet/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,24 +390,31 @@ def do_links( self, _line ):
def do_switch( self, line ):
"Starts or stops a switch"
args = line.split()
if len(args) != 2:
error( 'invalid number of args: switch <switch name>'
'{start, stop}\n' )
if len(args) < 2:
error( 'invalid number of args: switch {start, stop} '
'<switch name> [<switch name>] [...]\n' )
return
sw = args[ 0 ]
command = args[ 1 ]
if sw not in self.mn or self.mn.get( sw ) not in self.mn.switches:
error( 'invalid switch: %s\n' % args[ 1 ] )
else:
sw = args[ 0 ]
command = args[ 1 ]
# Get start/stop command
command = args[ 0 ]
if command not in [ 'start', 'stop' ]:
error( 'first argument for the switch command must '
'be "start" or "stop"\n' )
return

switches = args[ 1: ]

# Iterate over args twice, so we either execute <command> for all
# switches or none (avoid inconsistencies
for sw in switches:
if sw not in self.mn or self.mn.get( sw ) not in self.mn.switches:
error( 'invalid switch: %s\n' % sw )
return

for sw in switches:
if command == 'start':
self.mn.get( sw ).start( self.mn.controllers )
elif command == 'stop':
self.mn.get( sw ).stop( deleteIntfs=False )
else:
error( 'invalid command: '
'switch <switch name> {start, stop}\n' )

def do_wait( self, _line ):
"Wait until all switches have connected to a controller"
Expand Down