Add option to set OVS vendor

Author: shudongz

bin/mn

@@ -234,6 +234,8 @@ class MininetRunner( object ):
         opts.add_option( '--prefixlen', type='int', default=8,
                         help='[prefix length (e.g. /8) for automatic '
                         'network configuration]' )
+        opts.add_option( '--defVendor', action='store_true',
+                        default=False, help="Use default vendor (Nicira)")
 
         self.options, self.args = opts.parse_args()
 
@@ -289,13 +291,15 @@ class MininetRunner( object ):
         xterms = self.options.xterms
         mac = self.options.mac
         arp = self.options.arp
+        defVendor = self.options.defVendor
         listenPort = None
         if not self.options.nolistenport:
             listenPort = self.options.listenport
         mn = Mininet( topo, switch, host, controller, controllerParams,
                      inNamespace=inNamespace,
                      xterms=xterms, autoSetMacs=mac,
-                     autoStaticArp=arp, listenPort=listenPort )
+                     autoStaticArp=arp, listenPort=listenPort,
+                     defVendor=defVendor )
 
         if self.options.pre:
             CLI( mn, script=self.options.pre )

mininet/net.py

@@ -108,7 +108,8 @@ def __init__( self, topo=None, switch=OVSKernelSwitch, host=Host,
                  cparams=ControllerParams( '10.0.0.0', 8 ),
                  build=True, xterms=False, cleanup=False,
                  inNamespace=False,
-                 autoSetMacs=False, autoStaticArp=False, listenPort=None ):
+                 autoSetMacs=False, autoStaticArp=False, listenPort=None,
+                 defVendor=False ):
         """Create Mininet object.
            topo: Topo (topology) object or None
            switch: Switch class
@@ -134,6 +135,7 @@ def __init__( self, topo=None, switch=OVSKernelSwitch, host=Host,
         self.autoSetMacs = autoSetMacs
         self.autoStaticArp = autoStaticArp
         self.listenPort = listenPort
+        self.defVendor = defVendor
 
         self.hosts = []
         self.switches = []
@@ -179,11 +181,13 @@ def addSwitch( self, name, mac=None, ip=None, prefix='s', switchClass=None ):
         if swCl == UserSwitch:
             sw = swCl( name, listenPort=self.listenPort,
                        defaultMAC=mac, defaultIP=ip, 
-                       inNamespace=self.inNamespace, prefix=prefix )
+                       inNamespace=self.inNamespace, prefix=prefix,
+                       defVendor=self.defVendor )
         else:
             sw = swCl( name, listenPort=self.listenPort,
                        defaultMAC=mac, defaultIP=ip, dp=self.dps,
-                       inNamespace=self.inNamespace , prefix=prefix )
+                       inNamespace=self.inNamespace , prefix=prefix,
+                       defVendor=self.defVendor )
         if not self.inNamespace and self.listenPort:
             self.listenPort += 1
         self.dps += 1

mininet/node.py

@@ -548,7 +548,7 @@ class Switch( Node ):
 
     portBase = SWITCH_PORT_BASE  # 0 for OF < 1.0, 1 for OF >= 1.0
 
-    def __init__( self, name, prefix = 's', opts='', listenPort=None, dpid=None, **kwargs):
+    def __init__( self, name, prefix = 's', opts='', listenPort=None, dpid=None, defVendor=False, **kwargs):
         Node.__init__( self, name, prefix=prefix, **kwargs )
         self.opts = opts
         self.listenPort = listenPort
@@ -560,6 +560,7 @@ def __init__( self, name, prefix = 's', opts='', listenPort=None, dpid=None, **k
             self.dpid = "00:00:" + self.defaultMAC
         else:
             self.dpid = None
+        self.defVendor = defVendor
 
     def defaultIntf( self ):
         "Return interface for HIGHEST port"
@@ -775,8 +776,6 @@ def __init__( self, name, dp=None, **kwargs ):
         self.dp = 'mn-dp%i' % dp
         self.intf = self.dp
         OVSKernelSwitchNew.numSwitch += 1
-        # Mark the switch so controller will send LLDP/BDDP on all ports
-        self.opts += ' --mfr-desc="big switch networks" --dp-desc="bigtest datapath" '
         if self.inNamespace:
             error( "OVSKernelSwitch currently only works"
                 " in the root namespace.\n" )
@@ -921,8 +920,6 @@ def __init__( self, name, dp=None, **kwargs ):
         Switch.__init__( self, name, **kwargs )
         self.dp = 'dp%i' % dp
         self.intf = self.dp
-        # Mark the switch so controller will send LLDP/BDDP on all ports
-        self.opts += ' --mfr-desc="big switch networks" --dp-desc="bigtest datapath" '
         if self.inNamespace:
             error( "OVSKernelSwitch currently only works"
                 " in the root namespace.\n" )
@@ -956,6 +953,9 @@ def start( self, controllers ):
         intfs = [ self.intfs[ port ] for port in ports ]
         self.cmd( 'ovs-dpctl', 'add-if', self.dp, ' '.join( intfs ) )
         # Run protocol daemon
+        if not self.defVendor:
+            # Mark the switch so controller will send LLDP/BDDP on all ports
+            self.opts += ' --mfr-desc="big switch networks" --dp-desc="bigtest datapath" '
         self.cmd( 'ovs-openflowd ' + self.dp +
             ' '.join( [ ' tcp:%s:%d' % ( c.IP(), c.port ) \
                         for c in controllers ] ) +