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

Apparently Python 3 types aren't ordered

Browse Source
This commit is contained in:
Bob Lantz
2018-07-25 19:44:44 -07:00
parent 56fc6c3955
commit 1ef12e450a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/net.py
+4 -2
View File
@@ -549,7 +549,8 @@ class Mininet( object ):
switch.start( self.controllers ) switch.start( self.controllers )
started = {} started = {}
for swclass, switches in groupby( for swclass, switches in groupby(
sorted( self.switches, key=type ), type ): sorted( self.switches,
key=lambda s: str( type( s ) ) ), type ):
switches = tuple( switches ) switches = tuple( switches )
if hasattr( swclass, 'batchStartup' ): if hasattr( swclass, 'batchStartup' ):
success = swclass.batchStartup( switches ) success = swclass.batchStartup( switches )
@@ -576,7 +577,8 @@ class Mininet( object ):
info( '*** Stopping %i switches\n' % len( self.switches ) ) info( '*** Stopping %i switches\n' % len( self.switches ) )
stopped = {} stopped = {}
for swclass, switches in groupby( for swclass, switches in groupby(
sorted( self.switches, key=type ), type ): sorted( self.switches,
key=lambda s: str( type( s ) ) ), type ):
switches = tuple( switches ) switches = tuple( switches )
if hasattr( swclass, 'batchShutdown' ): if hasattr( swclass, 'batchShutdown' ):
success = swclass.batchShutdown( switches ) success = swclass.batchShutdown( switches )