commit 418815231ec9713829606e56e3cf6ea022b3dccf
author stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu May 12 16:36:40 2016 +0200
committer stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu May 12 16:36:40 2016 +0200
tree c2e2eba7a3df737582df8256901400fb855cd873
parent 1ef77027e420874e945cc7d49b0856e742da8444
parent 7bd27f656950074f6fd06ffce754a0f14004b5a6

Merge remote-tracking branch 'upstream/master'

misc/sonata-demo-docker.son

diff --git a/misc/sonata-demo-docker.son b/misc/sonata-demo-docker.son
old mode 100755
new mode 100644
index 98ce676..8cf77c0
--- a/misc/sonata-demo-docker.son
+++ b/misc/sonata-demo-docker.son
Binary files differ

src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py

diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index 250bae7..cbf9c8b 100755
--- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@ -1,6 +1,6 @@
 import time
 import requests
-import subprocess
+import json
 import os
 import unittest
 from emuvim.test.base import SimpleTestTopology
@@ -8,10 +8,9 @@
 
 PACKAGE_PATH = "misc/sonata-demo-docker.son"
 
+
 class testSonataDummyGatekeeper(SimpleTestTopology):
 
-    @unittest.skipIf(os.environ.get("SON_EMU_IN_DOCKER") is None or True,
-                     "skipping dummy GK test in local environment")
     def testAPI(self):
         # create network
         self.createNet(nswitches=0, ndatacenter=2, nhosts=2, ndockers=0)
@@ -34,11 +33,11 @@
         files = {"package": open(PACKAGE_PATH, "rb")}
         r = requests.post("http://127.0.0.1:5000/packages", files=files)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(r.json().get("service_uuid") is not None)
+        self.assertTrue(json.loads(r.text).get("service_uuid") is not None)
 
         # instantiate service
-        service_uuid = r.json().get("service_uuid")
-        r2 = requests.post("http://127.0.0.1:5000/instantiations", json={"service_uuid": service_uuid})
+        service_uuid = json.loads(r.text).get("service_uuid")
+        r2 = requests.post("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": service_uuid}))
         self.assertEqual(r2.status_code, 200)
 
         # give the emulator some time to instantiate everything
@@ -46,9 +45,9 @@
 
         # check get request APIs
         r3 = requests.get("http://127.0.0.1:5000/packages")
-        self.assertEqual(len(r3.json().get("service_uuid_list")), 1)
+        self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
         r4 = requests.get("http://127.0.0.1:5000/instantiations")
-        self.assertEqual(len(r4.json().get("service_instance_list")), 1)
+        self.assertEqual(len(json.loads(r4.text).get("service_instance_list")), 1)
 
         # check number of running nodes
         self.assertTrue(len(self.getContainernetContainers()) == 3)

utils/docker/Dockerfile

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index 18e8bfe..27157d8 100755
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -11,6 +11,8 @@
     && cd /son-emu \
     # we need to reset the __pycache__ for correct test discovery
     && rm -rf src/emuvim/test/__pycache__ \
+    && rm -rf src/emuvim/test/unittests/__pycache__ \
+    && rm -rf src/emuvim/test/integrationtests/__pycache__ \
     && python setup.py install \
     && echo 'Done'