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

Revert to old "Adding controller" message

Browse Source
This commit is contained in:
Bob Lantz
2014-11-19 08:58:17 -08:00
parent b7898befef
commit aabbf29542
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/net.py
+3 -3
View File
@@ -265,7 +265,7 @@ class Mininet( object ):
return controller_new return controller_new
def addNAT( self, name='nat0', connect=True, inNamespace=False, **params ): 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 ) subnet=self.ipBase, **params )
# find first switch and create link # find first switch and create link
if connect: if connect:
@@ -326,7 +326,7 @@ class Mininet( object ):
"Return a random, non-multicast MAC address" "Return a random, non-multicast MAC address"
return macColonHex( random.randint(1, 2**48 - 1) & 0xfeffffffffff | return macColonHex( random.randint(1, 2**48 - 1) & 0xfeffffffffff |
0x020000000000 ) 0x020000000000 )
def addLink( self, node1, node2, port1=None, port2=None, def addLink( self, node1, node2, port1=None, port2=None,
cls=None, **params ): cls=None, **params ):
""""Add a link from node1 to node2 """"Add a link from node1 to node2
@@ -386,7 +386,7 @@ class Mininet( object ):
if not self.controllers and self.controller: if not self.controllers and self.controller:
# Add a default controller # Add a default controller
info( '** No controller defined, adding default controller\n' ) info( '*** Adding controller\n' )
classes = self.controller classes = self.controller
if type( classes ) is not list: if type( classes ) is not list:
classes = [ classes ] classes = [ classes ]