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

Revert to old "Adding controller" message

parent b7898bef
No related branches found
No related tags found
No related merge requests found
...@@ -265,7 +265,7 @@ def addController( self, name='c0', controller=None, **params ): ...@@ -265,7 +265,7 @@ def addController( self, name='c0', controller=None, **params ):
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 @@ def randMac(): ...@@ -326,7 +326,7 @@ def randMac():
"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 @@ def buildFromTopo( self, topo=None ): ...@@ -386,7 +386,7 @@ def buildFromTopo( self, topo=None ):
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 ]
......
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