Dealing with test related stuffs.

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / tests / test_instantiate_vnf.py

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index 7ec2240..a599aed 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -35,8 +35,8 @@ class TestNFInstantiate(TestCase):
     def setUp(self):\r
         self.client = APIClient()\r
         self.grant_result = {\r
-            "vimid": 'vimid_1',\r
-            "tenant": 'tenantname_1',\r
+            "vimid": 'vim_1',\r
+            "tenant": 'chinamobile',\r
         }\r
 \r
     def tearDown(self):\r
@@ -178,9 +178,13 @@ class TestNFInstantiate(TestCase):
         r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']\r
         r3_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
         mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_lcm_notify_result]\r
-        mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume,\r
-                                 c4_data_create_network, c5_data_create_subnet, c6_data_create_port,\r
-                                 c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\r
+        mock_call.side_effect = [c1_data_get_tenant_id,\r
+                                 c2_data_create_volume, c3_data_get_volume,\r
+                                 c4_data_create_network,\r
+                                 c5_data_create_subnet,\r
+                                 c6_data_create_port,\r
+                                 c7_data_create_flavor,\r
+                                 c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r