X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Ftest%2Funittests%2Ftest_tango_llcm.py;h=fc426f54a1c870eec13720a5aaf7111b4e2194ed;hb=36d4033918dd7b076fe4db5eba6e3eb8698b27dc;hp=af8dbf47f89f42544a6ce3fb5aa112ebf52445a6;hpb=37e8d1a18031a54405ff778a153c364ceca8b4ba;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/test/unittests/test_tango_llcm.py b/src/emuvim/test/unittests/test_tango_llcm.py
index af8dbf4..fc426f5 100644
--- a/src/emuvim/test/unittests/test_tango_llcm.py
+++ b/src/emuvim/test/unittests/test_tango_llcm.py
@@ -44,6 +44,7 @@ class testTangoLLCM(SimpleTestTopology):
 
     #    @unittest.skip("disabled")
     def test_tango_llcm_start_service(self):
+        initialize_GK()
         # create network
         self.createNet(nswitches=0, ndatacenter=2, nhosts=2,
                        ndockers=0, enable_learning=True)
@@ -62,7 +63,6 @@ class testTangoLLCM(SimpleTestTopology):
         self.startNet()
         time.sleep(3)
 
-        print "starting tests"
         # board package
         files = {"package": open(PACKAGE_PATH, "rb")}
         r = requests.post("http://127.0.0.1:56000/packages", files=files)
@@ -80,15 +80,14 @@ class testTangoLLCM(SimpleTestTopology):
 
         # check get request APIs
         r3 = requests.get("http://127.0.0.1:56000/packages")
-        self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
+        self.assertEqual(len(json.loads(r3.text)), 1)
         r4 = requests.get("http://127.0.0.1:56000/instantiations")
-        self.assertEqual(len(json.loads(r4.text).get(
-            "service_instantiations_list")), 1)
+        self.assertEqual(len(json.loads(r4.text)), 1)
 
         # check number of running nodes
-        self.assertTrue(len(self.getContainernetContainers()) == 2)
-        self.assertTrue(len(self.net.hosts) == 4)
-        self.assertTrue(len(self.net.switches) == 2)
+        self.assertEqual(len(self.getContainernetContainers()), 2)
+        self.assertEqual(len(self.net.hosts), 4)
+        self.assertEqual(len(self.net.switches), 2)
         # check compute list result (considering placement)
         self.assertEqual(len(self.dc[0].listCompute()), 1)
         self.assertEqual(len(self.dc[1].listCompute()), 1)
@@ -97,7 +96,7 @@ class testTangoLLCM(SimpleTestTopology):
 
         # check E-Line connection, by checking the IP addresses
         for link in self.net.deployed_elines:
-            vnf_src, intf_src, vnf_sap_docker_name = parse_interface(
+            vnf_src, intf_src = parse_interface(
                 link['connection_points_reference'][0])
             print vnf_src, intf_src
             src = self.net.getNodeByName(vnf_src)
@@ -109,7 +108,7 @@ class testTangoLLCM(SimpleTestTopology):
             src_mask = [intf['netmask']
                         for intf in network_list if intf['intf_name'] == intf_src][0]
 
-            vnf_dst, intf_dst, vnf_sap_docker_name = parse_interface(
+            vnf_dst, intf_dst = parse_interface(
                 link['connection_points_reference'][1])
             dst = self.net.getNodeByName(vnf_dst)
             if not dst:
@@ -164,6 +163,7 @@ class testTangoLLCM(SimpleTestTopology):
 
     # @unittest.skip("disabled")
     def test_tango_llcm_stop_service(self):
+        initialize_GK()
         # create network
         self.createNet(ndatacenter=2, nhosts=2)
         # setup links
@@ -199,15 +199,14 @@ class testTangoLLCM(SimpleTestTopology):
 
         # check get request APIs
         r3 = requests.get("http://127.0.0.1:56001/packages")
-        self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1)
+        self.assertEqual(len(json.loads(r3.text)), 1)
         r4 = requests.get("http://127.0.0.1:56001/instantiations")
-        self.assertEqual(len(json.loads(r4.text).get(
-            "service_instantiations_list")), 1)
+        self.assertEqual(len(json.loads(r4.text)), 1)
 
         # check number of running nodes
-        self.assertTrue(len(self.getContainernetContainers()) == 2)
-        self.assertTrue(len(self.net.hosts) == 4)
-        self.assertTrue(len(self.net.switches) == 2)
+        self.assertEqual(len(self.getContainernetContainers()), 2)
+        self.assertEqual(len(self.net.hosts), 4)
+        self.assertEqual(len(self.net.switches), 2)
         # check compute list result (considering placement)
         self.assertEqual(len(self.dc[0].listCompute()), 1)
         self.assertEqual(len(self.dc[1].listCompute()), 1)
@@ -221,8 +220,7 @@ class testTangoLLCM(SimpleTestTopology):
 
         r5 = requests.get("http://127.0.0.1:56001/instantiations")
         # note that there was 1 instance before
-        self.assertTrue(len(json.loads(r5.text).get(
-            "service_instantiations_list")), 0)
+        self.assertEqual(len(json.loads(r5.text)), 0)
 
         # stop Mininet network
         self.stopNet()