Cleanup. Test update.

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

diff --git a/src/emuvim/test/api_base.py b/src/emuvim/test/api_base.py
index 614ecd2..0d994ca 100755 (executable)
--- a/src/emuvim/test/api_base.py
+++ b/src/emuvim/test/api_base.py
@@ -68,7 +68,7 @@ class SimpleTestTopology(unittest.TestCase):
         specific controller functionality.
         """
         self.net = DCNetwork(controller=controller, **kwargs)
-        self.api = RestApiEndpoint("127.0.0.1", 5001)
+        self.api = RestApiEndpoint("127.0.0.1", 5001, self.net)
         # add some switches
         # 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
@@ -97,6 +97,9 @@ class SimpleTestTopology(unittest.TestCase):
     def startApi(self):
         self.api.start()
 
+    def stopApi(self):
+        self.api.stop()
+        
     def startNet(self):
         self.net.start()
 
@@ -108,7 +111,7 @@ class SimpleTestTopology(unittest.TestCase):
         Helper to interact with local docker instance.
         """
         if self.docker_cli is None:
-            self.docker_cli = docker.Client(
+            self.docker_cli = docker.APIClient(
                 base_url='unix://var/run/docker.sock')
         return self.docker_cli
 
@@ -131,4 +134,4 @@ class SimpleTestTopology(unittest.TestCase):
                 "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
+                shell=True)