merge master and fix SDN chaining unit 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 d5329a9..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:


@@ -57,7 +59,7 @@ class SimpleTestTopology(unittest.TestCase):
             self.h.append(self.net.addHost('h%d' % i))
         # add some dockers
         for i in range(0, ndockers):
             self.h.append(self.net.addHost('h%d' % i))
         # add some dockers
         for i in range(0, ndockers):

-            self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu"))
+            self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu:trusty"))

 
     def startNet(self):
         self.net.start()
 
     def startNet(self):
         self.net.start()


@@ -74,11 +76,11 @@ class SimpleTestTopology(unittest.TestCase):
                 base_url='unix://var/run/docker.sock')
         return self.docker_cli
 
                 base_url='unix://var/run/docker.sock')
         return self.docker_cli
 

-    def getDockernetContainers(self):
+    def getContainernetContainers(self):

         """
         """

-        List the containers managed by dockernet
+        List the containers managed by containernet

         """
         """

-        return self.getDockerCli().containers(filters={"label": "com.dockernet"})
+        return self.getDockerCli().containers(filters={"label": "com.containernet"})

 
     @staticmethod
     def setUp():
 
     @staticmethod
     def setUp():


@@ -90,7 +92,7 @@ class SimpleTestTopology(unittest.TestCase):
         # make sure that all pending docker containers are killed
         with open(os.devnull, 'w') as devnull:
             subprocess.call(
         # make sure that all pending docker containers are killed
         with open(os.devnull, 'w') as devnull:
             subprocess.call(

-                "sudo docker rm -f $(sudo docker ps --filter 'label=com.dockernet' -a -q)",
+                "sudo docker rm -f $(sudo docker ps --filter 'label=com.containernet' -a -q)",

                 stdout=devnull,
                 stderr=devnull,
                 shell=True)
\ No newline at end of file
                 stdout=devnull,
                 stderr=devnull,
                 shell=True)
\ No newline at end of file