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

Use a single ovs-vsctl command for speed/atomicity

Browse Source
This commit is contained in:
Bob Lantz
2014-02-28 18:45:41 -08:00
parent a0bc100289
commit 2e19ceb0aa
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+22 -17
View File
@@ -1044,33 +1044,38 @@ class OVSSwitch( Switch ):
self.cmd( 'ifconfig lo up' ) self.cmd( 'ifconfig lo up' )
# Annoyingly, --if-exists option seems not to work # Annoyingly, --if-exists option seems not to work
self.cmd( 'ovs-vsctl del-br', self ) self.cmd( 'ovs-vsctl del-br', self )
self.cmd( 'ovs-vsctl add-br', self )
if self.datapath == 'user':
self.cmd( 'ovs-vsctl set bridge', self,'datapath_type=netdev' )
int( self.dpid, 16 ) # DPID must be a hex string int( self.dpid, 16 ) # DPID must be a hex string
self.cmd( 'ovs-vsctl -- set Bridge', self, # Interfaces and controllers
'other_config:datapath-id=' + self.dpid ) intfs = ' '.join( '-- add-port %s %s ' % ( self, intf )
self.cmd( 'ovs-vsctl set-fail-mode', self, self.failMode ) for intf in self.intfList() if not intf.IP() )
for intf in self.intfList(): clist = ' '.join( 'tcp:%s:%d' % ( c.IP(), c.port )
if not intf.IP(): for c in controllers )
self.attach( intf )
# Add controllers
clist = ' '.join( [ 'tcp:%s:%d' % ( c.IP(), c.port )
for c in controllers ] )
if self.listenPort: if self.listenPort:
clist += ' ptcp:%s' % self.listenPort clist += ' ptcp:%s' % self.listenPort
# Construct big ovs-vsctl command
cmd = ( 'ovs-vsctl add-br %s ' % self +
'-- set Bridge %s ' % self +
'other_config:datapath-id=%s ' % self.dpid +
'-- set-fail-mode %s %s ' % ( self, self.failMode ) +
intfs +
'-- set-controller %s %s ' % (self, clist ) )
if not self.inband: if not self.inband:
self.cmd( 'ovs-vsctl set bridge', self, cmd += ( '-- set bridge %s '
'other-config:disable-in-band=true' ) 'other-config:disable-in-band=true ' % self )
self.cmd( 'ovs-vsctl set-controller', self, clist ) if self.datapath == 'user':
cmd += '-- set bridge %s datapath_type=netdev ' % self
# Reconnect quickly to controllers (1s vs. 15s max_backoff) # Reconnect quickly to controllers (1s vs. 15s max_backoff)
for uuid in self.controllerUUIDs(): for uuid in self.controllerUUIDs():
if uuid.count( '-' ) != 4: if uuid.count( '-' ) != 4:
# Doesn't look like a UUID # Doesn't look like a UUID
continue continue
uuid = uuid.strip() uuid = uuid.strip()
self.cmd( 'ovs-vsctl set Controller', uuid, cmd += '-- set Controller %smax_backoff=1000 ' % uuid
'max_backoff=1000' ) # Do it!!
self.cmd( cmd )
for intf in self.intfList():
self.TCReapply( intf )
def stop( self ): def stop( self ):
"Terminate OVS switch." "Terminate OVS switch."