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

Add stp param to OVS and connected() to OVSBridge

Browse Source 
This allows --switch ovsbr,stp=True to work correctly
This commit is contained in:
Bob Lantz
2015-01-18 22:59:21 -08:00
parent e65dc4c6d6
commit a8cc243aa7
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+15 -3
View File
@@ -1055,20 +1055,22 @@ class OVSSwitch( Switch ):
def __init__( self, name, failMode='secure', datapath='kernel', def __init__( self, name, failMode='secure', datapath='kernel',
inband=False, protocols=None, inband=False, protocols=None,
reconnectms=1000, **params ): reconnectms=1000, stp=False, **params ):
"""name: name for switch """name: name for switch
failMode: controller loss behavior (secure|open) failMode: controller loss behavior (secure|open)
datapath: userspace or kernel mode (kernel|user) datapath: userspace or kernel mode (kernel|user)
inband: use in-band control (False) inband: use in-band control (False)
protocols: use specific OpenFlow version(s) (e.g. OpenFlow13) protocols: use specific OpenFlow version(s) (e.g. OpenFlow13)
Unspecified (or old OVS version) uses OVS default Unspecified (or old OVS version) uses OVS default
reconnectms: max reconnect timeout in ms (0/None for default)""" reconnectms: max reconnect timeout in ms (0/None for default)
stp: enable STP (False, requires failMode=standalone)"""
Switch.__init__( self, name, **params ) Switch.__init__( self, name, **params )
self.failMode = failMode self.failMode = failMode
self.datapath = datapath self.datapath = datapath
self.inband = inband self.inband = inband
self.protocols = protocols self.protocols = protocols
self.reconnectms = reconnectms self.reconnectms = reconnectms
self.stp = stp
self._uuids = [] # controller UUIDs self._uuids = [] # controller UUIDs
@classmethod @classmethod
@@ -1206,7 +1208,9 @@ class OVSSwitch( Switch ):
if self.datapath == 'user': if self.datapath == 'user':
cmd += '-- set bridge %s datapath_type=netdev ' % self cmd += '-- set bridge %s datapath_type=netdev ' % self
if self.protocols and not self.isOldOVS(): if self.protocols and not self.isOldOVS():
cmd += '-- set bridge %s protocols=%s' % ( self, self.protocols ) cmd += '-- set bridge %s protocols=%s ' % ( self, self.protocols )
if self.stp and self.failMode == 'standalone':
cmd += '-- set bridge %s stp_enable=true ' % self
# Do it!! # Do it!!
self.cmd( cmd ) self.cmd( cmd )
# Reconnect quickly to controllers (1s vs. 15s max_backoff) # Reconnect quickly to controllers (1s vs. 15s max_backoff)
@@ -1242,6 +1246,14 @@ class OVSBridge( OVSSwitch ):
def start( self, controllers ): def start( self, controllers ):
OVSSwitch.start( self, controllers=[] ) OVSSwitch.start( self, controllers=[] )
def connected( self ):
"Are we forwarding yet?"
if self.stp:
status = self.dpctl( 'show' )
return 'STP_FORWARD' in status and not 'STP_LEARN' in status
else:
return True
class IVSSwitch( Switch ): class IVSSwitch( Switch ):
"Indigo Virtual Switch" "Indigo Virtual Switch"