Improvement: Dummy GK tests are a bit messy

diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index ca8c57e..04424e9 100755 (executable)
--- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@ -51,7 +51,7 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         self.net.addLink(self.dc[0], self.dc[1])
         self.net.addLink(self.h[1], self.dc[1])
         # connect dummy GK to data centers
-        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)
+        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 55000)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
@@ -64,22 +64,22 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         print "starting tests"
         # board package
         files = {"package": open(PACKAGE_PATH, "rb")}
-        r = requests.post("http://127.0.0.1:5000/packages", files=files)
+        r = requests.post("http://127.0.0.1:55000/packages", files=files)
         self.assertEqual(r.status_code, 201)
         self.assertTrue(json.loads(r.text).get("service_uuid") is not None)
 
         # instantiate service
         self.service_uuid = json.loads(r.text).get("service_uuid")
-        r2 = requests.post("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
+        r2 = requests.post("http://127.0.0.1:55000/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
         self.assertEqual(r2.status_code, 201)
 
         # give the emulator some time to instantiate everything
         time.sleep(2)
 
         # check get request APIs
-        r3 = requests.get("http://127.0.0.1:5000/packages")
+        r3 = requests.get("http://127.0.0.1:55000/packages")
         self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
-        r4 = requests.get("http://127.0.0.1:5000/instantiations")
+        r4 = requests.get("http://127.0.0.1:55000/instantiations")
         self.assertEqual(len(json.loads(r4.text).get("service_instantiations_list")), 1)
 
         # check number of running nodes
@@ -157,7 +157,7 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         self.net.addLink(self.dc[0], self.dc[1])
         self.net.addLink(self.h[1], self.dc[1])
         # connect dummy GK to data centers
-        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)
+        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 55001)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
@@ -170,22 +170,22 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         print "starting tests"
         # board package
         files = {"package": open(PACKAGE_PATH, "rb")}
-        r = requests.post("http://127.0.0.1:5000/packages", files=files)
+        r = requests.post("http://127.0.0.1:55001/packages", files=files)
         self.assertEqual(r.status_code, 201)
         self.assertTrue(json.loads(r.text).get("service_uuid") is not None)
 
         # instantiate service
         self.service_uuid = json.loads(r.text).get("service_uuid")
-        r2 = requests.post("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
+        r2 = requests.post("http://127.0.0.1:55001/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
         self.assertEqual(r2.status_code, 201)
 
         # give the emulator some time to instantiate everything
         time.sleep(2)
 
         # check get request APIs
-        r3 = requests.get("http://127.0.0.1:5000/packages")
+        r3 = requests.get("http://127.0.0.1:55001/packages")
         self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
-        r4 = requests.get("http://127.0.0.1:5000/instantiations")
+        r4 = requests.get("http://127.0.0.1:55001/instantiations")
         self.assertEqual(len(json.loads(r4.text).get("service_instantiations_list")), 1)
 
         # check number of running nodes
@@ -198,9 +198,9 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         # stop the service
         service_instance_uuid = json.loads(r2.text).get("service_instance_uuid")
         self.assertTrue(service_instance_uuid is not None)
-        requests.delete("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": self.service_uuid, "service_instance_uuid":service_instance_uuid}))
+        requests.delete("http://127.0.0.1:55001/instantiations", data=json.dumps({"service_uuid": self.service_uuid, "service_instance_uuid":service_instance_uuid}))
 
-        r5 = requests.get("http://127.0.0.1:5000/instantiations")
+        r5 = requests.get("http://127.0.0.1:55001/instantiations")
         self.assertTrue(len(json.loads(r5.text).get("service_instantiations_list")), 0)     # note that there was 1 instance before
 
         # stop Mininet network
@@ -213,7 +213,7 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         # create network
         self.createNet(ndatacenter=2, nhosts=2)
         # connect dummy GK to data centers
-        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)
+        sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 55002)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
@@ -226,30 +226,30 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         print "starting tests"
         # board package
         files = {"package": open("misc/sonata-stress-service.son", "rb")}
-        r = requests.post("http://127.0.0.1:5000/packages", files=files)
+        r = requests.post("http://127.0.0.1:55002/packages", files=files)
         self.assertEqual(r.status_code, 201)
         self.assertTrue(json.loads(r.text).get("service_uuid") is not None)
 
         # instantiate service
         self.service_uuid = json.loads(r.text).get("service_uuid")
-        r2 = requests.post("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
+        r2 = requests.post("http://127.0.0.1:55002/instantiations", data=json.dumps({"service_uuid": self.service_uuid}))
         self.assertEqual(r2.status_code, 201)
 
         # give the emulator some time to instantiate everything
         time.sleep(2)
 
         # check get request APIs
-        r3 = requests.get("http://127.0.0.1:5000/packages")
+        r3 = requests.get("http://127.0.0.1:55002/packages")
         self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
-        r4 = requests.get("http://127.0.0.1:5000/instantiations")
+        r4 = requests.get("http://127.0.0.1:55002/instantiations")
         self.assertEqual(len(json.loads(r4.text).get("service_instantiations_list")), 1)
 
         # stop the service
         service_instance_uuid = json.loads(r2.text).get("service_instance_uuid")
         self.assertTrue(service_instance_uuid is not None)
-        requests.delete("http://127.0.0.1:5000/instantiations", data=json.dumps({"service_uuid": self.service_uuid, "service_instance_uuid":service_instance_uuid}))
+        requests.delete("http://127.0.0.1:55002/instantiations", data=json.dumps({"service_uuid": self.service_uuid, "service_instance_uuid":service_instance_uuid}))
 
-        r5 = requests.get("http://127.0.0.1:5000/instantiations")
+        r5 = requests.get("http://127.0.0.1:55002/instantiations")
         self.assertTrue(len(json.loads(r5.text).get("service_instantiations_list")), 0)     # note that there was 1 instance before
 
         # stop Mininet network