X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Ftest%2Funittests%2Ftest_sonata_dummy_gatekeeper.py;h=9cdccac1064dc31efe96a133b284cd482894d805;hp=277e75c07a42bf6ab3b4e07b0dd3f790b8d3847d;hb=f8fcdac855e460eceab9e79466bb77640ea9fba1;hpb=99d1f61305b5031df25ace2f49cf22220bd71e6c

diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index 277e75c..9cdccac 100755
--- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@ -51,34 +51,35 @@ 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("127.0.0.1", 55000)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
+        time.sleep(3)
         # start Mininet network
         self.startNet()
-        time.sleep(1)
+        time.sleep(3)
 
         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
@@ -109,12 +110,12 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
             dst_ip = [intf['ip'] for intf in network_list if intf['intf_name'] == intf_dst][0]
             dst_mask = [intf['netmask'] for intf in network_list if intf['intf_name'] == intf_dst][0]
 
-            print "src = {0}:{1} ip={2}/{3} ".format(vnf_src, intf_src, src_ip, src_mask)
-            print "dst = {0}:{1} ip={2}/{3} ".format(vnf_dst, intf_dst, dst_ip, dst_mask)
+            print "src = {0}:{1} ip={2} ".format(vnf_src, intf_src, src_ip, src_mask)
+            print "dst = {0}:{1} ip={2} ".format(vnf_dst, intf_dst, dst_ip, dst_mask)
 
             # check if the E-Line IP's are in the same subnet
-            ret = ip_network(u'{0}/{1}'.format(src_ip, src_mask), strict=False)\
-                .compare_networks(ip_network(u'{0}/{1}'.format(dst_ip, dst_mask),strict=False))
+            ret = ip_network(u'{0}'.format(src_ip, src_mask), strict=False)\
+                .compare_networks(ip_network(u'{0}'.format(dst_ip, dst_mask),strict=False))
             self.assertTrue(ret == 0)
 
 
@@ -138,7 +139,8 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
             test_ip_list = list(ELAN_list)
             test_ip_list.remove(ip_address)
             for ip in test_ip_list:
-                p = self.net.ping([vnf],manualdestip=ip)
+                # only take ip address, without netmask
+                p = self.net.ping([vnf],manualdestip=ip.split('/')[0])
                 print p
                 self.assertTrue(p <= 0.0)
 
@@ -155,34 +157,35 @@ 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("127.0.0.1", 55001)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
+        time.sleep(3)
         # start Mininet network
         self.startNet()
-        time.sleep(1)
+        time.sleep(3)
 
         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
@@ -195,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
@@ -210,42 +213,43 @@ 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("127.0.0.1", 55002)
         sdkg1.connectDatacenter(self.dc[0])
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
+        time.sleep(3)
         # start Mininet network
         self.startNet()
-        time.sleep(1)
+        time.sleep(3)
 
         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