diff --git a/examples/cpu.py b/examples/cpu.py index 34426bc..2eebf20 100755 --- a/examples/cpu.py +++ b/examples/cpu.py @@ -46,7 +46,7 @@ def bwtest( cpuLimits, period_us=100000, seconds=5 ): server.cmd( 'iperf -s -p 5001 &' ) waitListening( client, server, 5001 ) result = client.cmd( 'iperf -yc -t %s -c %s' % ( - seconds, server.IP() ) ).split( ',' ) + seconds, server.IP() ) ).split( ',' ) bps = float( result[ -1 ] ) server.cmdPrint( 'kill %iperf' ) net.stop() diff --git a/mininet/node.py b/mininet/node.py index eea195a..bf5320c 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -515,7 +515,7 @@ class Node( object ): intfs = ( ','.join( [ '%s:%s' % ( i.name, i.IP() ) for i in self.intfList() ] ) ) return '<%s %s: %s pid=%s> ' % ( - self.__class__.__name__, self.name, intfs, self.pid ) + self.__class__.__name__, self.name, intfs, self.pid ) def __str__( self ): "Abbreviated string representation" @@ -683,7 +683,7 @@ class CPULimitedHost( Host ): # We have to do this here after we've specified # cpus and mems errFail( 'cgclassify -g cpuset:/%s %s' % ( - self.name, self.pid ) ) + self.name, self.pid ) ) def config( self, cpu=None, cores=None, **params ): """cpu: desired overall system CPU fraction @@ -777,7 +777,7 @@ class Switch( Node ): intfs = ( ','.join( [ '%s:%s' % ( i.name, i.IP() ) for i in self.intfList() ] ) ) return '<%s %s: %s pid=%s> ' % ( - self.__class__.__name__, self.name, intfs, self.pid ) + self.__class__.__name__, self.name, intfs, self.pid ) class UserSwitch( Switch ): "User-space switch." @@ -1021,8 +1021,8 @@ class Controller( Node ): def __repr__( self ): "More informative string representation" return '<%s %s: %s:%s pid=%s> ' % ( - self.__class__.__name__, self.name, - self.IP(), self.port, self.pid ) + self.__class__.__name__, self.name, + self.IP(), self.port, self.pid ) class OVSController( Controller ):