Skip to content
Snippets Groups Projects
Commit c92c4efb authored by Bob Lantz's avatar Bob Lantz
Browse files

Add a few clarifying comments

parent 39203484
No related branches found
No related tags found
No related merge requests found
...@@ -337,15 +337,18 @@ def addLink( self, node1, node2, port1=None, port2=None, ...@@ -337,15 +337,18 @@ def addLink( self, node1, node2, port1=None, port2=None,
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 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment