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

conforming to mininet python style

Browse Source
This commit is contained in:
Cody
2014-05-28 13:46:55 -07:00
parent 32d3c2bc79
commit 4579b303e6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+6 -4
View File
@@ -1055,7 +1055,9 @@ class OVSSwitch( Switch ):
self.cmd( 'ovs-vsctl del-br', self ) self.cmd( 'ovs-vsctl del-br', self )
int( self.dpid, 16 ) # DPID must be a hex string int( self.dpid, 16 ) # DPID must be a hex string
# Interfaces and controllers # Interfaces and controllers
intfs = ' '.join( '-- add-port %s %s -- set Interface %s ofport_request=%s ' % ( self, intf, intf, self.ports[intf] ) intfs = ' '.join( '-- add-port %s %s ' % ( self, intf ) +
'-- set Interface %s ' % intf +
'ofport_request=%s ' % self.ports[ intf ]
for intf in self.intfList() if not intf.IP() ) for intf in self.intfList() if not intf.IP() )
clist = ' '.join( '%s:%s:%d' % ( c.protocol, c.IP(), c.port ) clist = ' '.join( '%s:%s:%d' % ( c.protocol, c.IP(), c.port )
for c in controllers ) for c in controllers )
@@ -1068,17 +1070,17 @@ class OVSSwitch( Switch ):
'other_config:datapath-id=%s ' % self.dpid + 'other_config:datapath-id=%s ' % self.dpid +
'-- set-fail-mode %s %s ' % ( self, self.failMode ) + '-- set-fail-mode %s %s ' % ( self, self.failMode ) +
intfs + intfs +
'-- set-controller %s %s ' % (self, clist ) ) '-- set-controller %s %s ' % ( self, clist ) )
# Construct ovs-vsctl commands for old versions of OVS # Construct ovs-vsctl commands for old versions of OVS
else: else:
self.cmd( 'ovs-vsctl add-br', self ) self.cmd( 'ovs-vsctl add-br', self )
for intf in self.intfList(): for intf in self.intfList():
if not intf.IP(): if not intf.IP():
self.cmd('ovs-vsctl add-port', self, intf) self.cmd('ovs-vsctl add-port', self, intf )
cmd = ('ovs-vsctl set Bridge %s ' % self + cmd = ('ovs-vsctl set Bridge %s ' % self +
'other_config:datapath-id=%s ' % self.dpid + 'other_config:datapath-id=%s ' % self.dpid +
'-- set-fail-mode %s %s ' % ( self, self.failMode ) + '-- set-fail-mode %s %s ' % ( self, self.failMode ) +
'-- set-controller %s %s ' % (self, clist )) '-- set-controller %s %s ' % ( self, clist ) )
if not self.inband: if not self.inband:
cmd += ( '-- set bridge %s ' cmd += ( '-- set bridge %s '
'other-config:disable-in-band=true ' % self ) 'other-config:disable-in-band=true ' % self )