From aabbf295425cd8ded096077fa21432529586f447 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Wed, 19 Nov 2014 08:56:23 -0800
Subject: [PATCH] Revert to old "Adding controller" message
---
mininet/net.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mininet/net.py b/mininet/net.py
index 355bfe79..cff2bd5f 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -265,7 +265,7 @@ def addController( self, name='c0', controller=None, **params ):
return controller_new
def addNAT( self, name='nat0', connect=True, inNamespace=False, **params ):
- nat = self.addHost( name, cls=NAT, inNamespace=inNamespace,
+ nat = self.addHost( name, cls=NAT, inNamespace=inNamespace,
subnet=self.ipBase, **params )
# find first switch and create link
if connect:
@@ -326,7 +326,7 @@ def randMac():
"Return a random, non-multicast MAC address"
return macColonHex( random.randint(1, 2**48 - 1) & 0xfeffffffffff |
0x020000000000 )
-
+
def addLink( self, node1, node2, port1=None, port2=None,
cls=None, **params ):
""""Add a link from node1 to node2
@@ -386,7 +386,7 @@ def buildFromTopo( self, topo=None ):
if not self.controllers and self.controller:
# Add a default controller
- info( '** No controller defined, adding default controller\n' )
+ info( '*** Adding controller\n' )
classes = self.controller
if type( classes ) is not list:
classes = [ classes ]
--
GitLab