modify rest api test

[osm/vim-emu.git] / src / emuvim / test / base.py

diff --git a/src/emuvim/test/base.py b/src/emuvim/test/base.py
old mode 100644 (file)
new mode 100755 (executable)
index 5a83547..0adc917
--- a/src/emuvim/test/base.py
+++ b/src/emuvim/test/base.py
@@ -28,7 +28,7 @@ class SimpleTestTopology(unittest.TestCase):
     def createNet(
             self,
             nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,
     def createNet(
             self,
             nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,

-            autolinkswitches=False, controller=Controller):
+            autolinkswitches=False, controller=Controller, **kwargs):

         """
         Creates a Mininet instance and automatically adds some
         nodes to it.
         """
         Creates a Mininet instance and automatically adds some
         nodes to it.


@@ -37,10 +37,12 @@ class SimpleTestTopology(unittest.TestCase):
         for our tests. Only use other controllers if you want to test
         specific controller functionality.
         """
         for our tests. Only use other controllers if you want to test
         specific controller functionality.
         """

-        self.net = DCNetwork(controller=controller)
+        self.net = DCNetwork(controller=controller, **kwargs)

 
         # add some switches
 
         # add some switches

-        for i in range(0, nswitches):
+        # start from s1 because ovs does not like to have dpid = 0
+        # and switch name-number is being used by mininet to set the dpid
+        for i in range(1, nswitches+1):

             self.s.append(self.net.addSwitch('s%d' % i))
         # if specified, chain all switches
         if autolinkswitches:
             self.s.append(self.net.addSwitch('s%d' % i))
         # if specified, chain all switches
         if autolinkswitches: