From c92c4efb6637a4f6585c507b358e95af63ded83d Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Fri, 7 Nov 2014 13:47:03 -0800
Subject: [PATCH] Add a few clarifying comments
---
mininet/net.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mininet/net.py b/mininet/net.py
index fea14d4d..8f89babb 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -337,15 +337,18 @@ def addLink( self, node1, node2, port1=None, port2=None,
cls: link class (optional)
params: additional link params (optional)
returns: link object"""
+ # Accept node objects or names
node1 = node1 if type( node1 ) != str else self[ node1 ]
node2 = node2 if type( node2 ) != str else self[ node2 ]
options = dict( params )
- options.setdefault( 'addr1', self.randMac() )
- options.setdefault( 'addr2', self.randMac() )
+ # Port is optional
if port1 is not None:
options.setdefault( 'port1', port1 )
if port2 is not None:
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
link = cls( node1, node2, **options )
self.links.append( link )
--
GitLab