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

Merge pull request #305 from ggee/ovsssl

Browse Source 
OVS switch connect to controllers using protocols other than TCP like SSL.
This commit is contained in:
lantz
2014-05-07 13:29:39 -07:00
parent c3bf407adf 5cb4a5424d
commit 15d2d76972
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+3 -2
View File
@@ -1048,7 +1048,7 @@ class OVSSwitch( Switch ):
# Interfaces and controllers # Interfaces and controllers
intfs = ' '.join( '-- add-port %s %s ' % ( self, intf ) intfs = ' '.join( '-- add-port %s %s ' % ( self, intf )
for intf in self.intfList() if not intf.IP() ) for intf in self.intfList() if not intf.IP() )
clist = ' '.join( 'tcp:%s:%d' % ( c.IP(), c.port ) clist = ' '.join( '%s:%s:%d' % ( c.protocol, c.IP(), c.port )
for c in controllers ) for c in controllers )
if self.listenPort: if self.listenPort:
clist += ' ptcp:%s' % self.listenPort clist += ' ptcp:%s' % self.listenPort
@@ -1154,12 +1154,13 @@ class Controller( Node ):
def __init__( self, name, inNamespace=False, command='controller', def __init__( self, name, inNamespace=False, command='controller',
cargs='-v ptcp:%d', cdir=None, ip="127.0.0.1", cargs='-v ptcp:%d', cdir=None, ip="127.0.0.1",
port=6633, **params ): port=6633, protocol='tcp', **params ):
self.command = command self.command = command
self.cargs = cargs self.cargs = cargs
self.cdir = cdir self.cdir = cdir
self.ip = ip self.ip = ip
self.port = port self.port = port
self.protocol = protocol
Node.__init__( self, name, inNamespace=inNamespace, Node.__init__( self, name, inNamespace=inNamespace,
ip=ip, **params ) ip=ip, **params )
self.cmd( 'ifconfig lo up' ) # Shouldn't be necessary self.cmd( 'ifconfig lo up' ) # Shouldn't be necessary