lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source
This commit is contained in:
Bob Lantz
2014-11-10 16:50:24 -08:00
parent 222e87daeb
commit 1955e90493
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/cluster.py
+3 -3
View File
@@ -83,7 +83,7 @@ from mininet.util import quietRun, makeIntfPair, errRun, retry
from mininet.examples.clustercli import CLI from mininet.examples.clustercli import CLI
from mininet.log import setLogLevel, debug, info, error from mininet.log import setLogLevel, debug, info, error
from signal import signal, SIGINT, SIGHUP, SIG_IGN from signal import signal, SIGINT, SIG_IGN
from subprocess import Popen, PIPE, STDOUT from subprocess import Popen, PIPE, STDOUT
import os import os
from random import randrange from random import randrange
@@ -174,7 +174,7 @@ class RemoteMixin( object ):
# Command support via shell process in namespace # Command support via shell process in namespace
def startShell( self, *args, **kwargs ): def startShell( self, *args, **kwargs ):
"Start a shell process for running commands" "Start a shell process for running commands"
if hasattr( self, 'server' ) and self.isRemote: if self.isRemote:
kwargs.update( mnopts='-c' ) kwargs.update( mnopts='-c' )
super( RemoteMixin, self ).startShell( *args, **kwargs ) super( RemoteMixin, self ).startShell( *args, **kwargs )
if self.splitInit: if self.splitInit:
@@ -224,7 +224,7 @@ class RemoteMixin( object ):
returns: Popen() object""" returns: Popen() object"""
if type( cmd ) is str: if type( cmd ) is str:
cmd = cmd.split() cmd = cmd.split()
if hasattr( self, 'server' ) and self.isRemote: if self.isRemote:
if sudo: if sudo:
cmd = [ 'sudo', '-E' ] + cmd cmd = [ 'sudo', '-E' ] + cmd
if tt: if tt: