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

Correctly group switches for batch operations

Browse Source
This commit is contained in:
Bob Lantz
2015-02-04 04:26:58 -08:00
parent ec9b23ba9c
commit c1dc80571a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/cluster.py
+5 -3
View File
@@ -79,7 +79,7 @@ from mininet.link import Link, Intf
from mininet.net import Mininet from mininet.net import Mininet
from mininet.topo import LinearTopo from mininet.topo import LinearTopo
from mininet.topolib import TreeTopo from mininet.topolib import TreeTopo
from mininet.util import quietRun, errRun, retry from mininet.util import quietRun, errRun
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 mininet.clean import addCleanupCallback from mininet.clean import addCleanupCallback
@@ -326,7 +326,8 @@ class RemoteOVSSwitch( RemoteMixin, OVSSwitch ):
@classmethod @classmethod
def batchStartup( cls, switches, **_kwargs ): def batchStartup( cls, switches, **_kwargs ):
"Start up switches in per-server batches" "Start up switches in per-server batches"
for server, switchGroup in groupby( switches, attrgetter( 'server' ) ): key = attrgetter( 'server' )
for server, switchGroup in groupby( sorted( switches, key=key ), key ):
info( '(%s)' % server ) info( '(%s)' % server )
group = tuple( switchGroup ) group = tuple( switchGroup )
switch = group[ 0 ] switch = group[ 0 ]
@@ -336,7 +337,8 @@ class RemoteOVSSwitch( RemoteMixin, OVSSwitch ):
@classmethod @classmethod
def batchShutdown( cls, switches, **_kwargs ): def batchShutdown( cls, switches, **_kwargs ):
"Stop switches in per-server batches" "Stop switches in per-server batches"
for server, switchGroup in groupby( switches, attrgetter( 'server' ) ): key = attrgetter( 'server' )
for server, switchGroup in groupby( sorted( switches, key=key ), key ):
info( '(%s)' % server ) info( '(%s)' % server )
group = tuple( switchGroup ) group = tuple( switchGroup )
switch = group[ 0 ] switch = group[ 0 ]