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

Change port base from 0 to 1

Browse Source 
OpenFlow versions > v0.9 require this.

Only tested w/FatTree topo - it's almost a guarantee that this breaks
every other topology.
This commit is contained in:
Brandon Heller
2010-08-09 23:22:40 -07:00
parent e9d4482e42
commit 956546acc7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+7 -3
View File
@@ -52,6 +52,9 @@ from mininet.log import info, error, debug
from mininet.util import quietRun, makeIntfPair, moveIntf, isShellBuiltin from mininet.util import quietRun, makeIntfPair, moveIntf, isShellBuiltin
from mininet.moduledeps import moduleDeps, OVS_KMOD, OF_KMOD, TUN from mininet.moduledeps import moduleDeps, OVS_KMOD, OF_KMOD, TUN
PORT_BASE = 1 # Port numbering to start from. OF > v0.9 is 1-indexed.
class Node( object ): class Node( object ):
"""A virtual network node is simply a shell in a network namespace. """A virtual network node is simply a shell in a network namespace.
We communicate with it using pipes.""" We communicate with it using pipes."""
@@ -258,7 +261,7 @@ class Node( object ):
"Return the next port number to allocate." "Return the next port number to allocate."
if len( self.ports ) > 0: if len( self.ports ) > 0:
return max( self.ports.values() ) + 1 return max( self.ports.values() ) + 1
return 0 return PORT_BASE
def addIntf( self, intf, port=None ): def addIntf( self, intf, port=None ):
"""Add an interface. """Add an interface.
@@ -544,8 +547,9 @@ class OVSKernelSwitch( Switch ):
mac_str = ' --datapath-id=0000' + \ mac_str = ' --datapath-id=0000' + \
''.join( self.defaultMAC.split( ':' ) ) + ' ' ''.join( self.defaultMAC.split( ':' ) ) + ' '
ports = sorted( self.ports.values() ) ports = sorted( self.ports.values() )
if len( ports ) != ports[ -1 ] + 1: print ports
raise Exception( 'only contiguous, zero-indexed port ranges' if len( ports ) != ports[ -1 ]:
raise Exception( 'only contiguous, one-indexed port ranges '
'supported: %s' % self.intfs ) 'supported: %s' % self.intfs )
intfs = [ self.intfs[ port ] for port in ports ] intfs = [ self.intfs[ port ] for port in ports ]
self.cmd( 'ovs-dpctl', 'add-if', self.dp, ' '.join( intfs ) ) self.cmd( 'ovs-dpctl', 'add-if', self.dp, ' '.join( intfs ) )