Make port1, port2 truly optional and don't pass them to Link()

This commit is contained in:
Bob Lantz
2014-11-07 13:42:50 -08:00
parent 2a2d605074
commit 39203484a6
+4
View File
@@ -342,6 +342,10 @@ class Mininet( object ):
options = dict( params ) options = dict( params )
options.setdefault( 'addr1', self.randMac() ) options.setdefault( 'addr1', self.randMac() )
options.setdefault( 'addr2', self.randMac() ) options.setdefault( 'addr2', self.randMac() )
if port1 is not None:
options.setdefault( 'port1', port1 )
if port2 is not None:
options.setdefault( 'port2', port2 )
cls = self.link if cls is None else cls cls = self.link if cls is None else cls
link = cls( node1, node2, **options ) link = cls( node1, node2, **options )
self.links.append( link ) self.links.append( link )