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

Add a few clarifying comments

Browse Source
This commit is contained in:
Bob Lantz
2014-11-07 13:47:03 -08:00
parent 39203484a6
commit c92c4efb66
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/net.py
+5 -2
View File
@@ -337,15 +337,18 @@ class Mininet( object ):
cls: link class (optional) cls: link class (optional)
params: additional link params (optional) params: additional link params (optional)
returns: link object""" returns: link object"""
# Accept node objects or names
node1 = node1 if type( node1 ) != str else self[ node1 ] node1 = node1 if type( node1 ) != str else self[ node1 ]
node2 = node2 if type( node2 ) != str else self[ node2 ] node2 = node2 if type( node2 ) != str else self[ node2 ]
options = dict( params ) options = dict( params )
options.setdefault( 'addr1', self.randMac() ) # Port is optional
options.setdefault( 'addr2', self.randMac() )
if port1 is not None: if port1 is not None:
options.setdefault( 'port1', port1 ) options.setdefault( 'port1', port1 )
if port2 is not None: if port2 is not None:
options.setdefault( 'port2', port2 ) options.setdefault( 'port2', port2 )
# Set default MAC - this should probably be in Link
options.setdefault( 'addr1', self.randMac() )
options.setdefault( 'addr2', self.randMac() )
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 )