X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=3d3e9ad136a1e3e724a329c96e733a22686c4ead;hb=f18464b1f38ff751a7c12447fb8cf8d8c7b0c473;hp=7804e109260c275742a52f3a0129548a54325bf3;hpb=42ea82f3195cd3da69693b56b04c486d086a0484;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index 7804e109..3d3e9ad1 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -19,7 +19,7 @@ import mock
 from django.test import TestCase, Client
 from rest_framework import status
 
-from lcm.nf.vnfs.const import vnfd_rawdata, c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
+from lcm.nf.vnfs.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
     c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \
     c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info
 from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
@@ -33,6 +33,14 @@ from lcm.pub.vimapi import api
 class TestNFInstantiate(TestCase):
     def setUp(self):
         self.client = Client()
+        self.grant_result = {
+            "vim": {
+                "vimid": 'vimid_1',
+                "accessinfo": {
+                    "tenant": 'tenantname_1'
+                }
+            }
+        }
 
     def tearDown(self):
         pass
@@ -45,19 +53,8 @@ class TestNFInstantiate(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     def test_create_vnf_identifier(self, mock_call_req):
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
-            {
-                'csars': [
-                    {
-                        'package_id': '222',
-                        'csarId': '2222',
-                        'vnfdId': '111'
-                    }
-                ]
-            }), '200']
-        r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
-        r3_create_vnf_to_aai = [0, json.JSONEncoder().encode({}), '200']
-        mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_create_vnf_to_aai]
+        r2_get_vnfpackage_from_catalog = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
+        mock_call_req.side_effect = [r2_get_vnfpackage_from_catalog]
         data = {
             "vnfdId": "111",
             "vnfInstanceName": "vFW_01",
@@ -122,16 +119,8 @@ class TestNFInstantiate(TestCase):
                                    vnfdid='111',
                                    create_time=now_time())
         r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
-        r3_apply_grant_result = [1, json.JSONEncoder().encode(
-            {
-                "vim": {
-                    "vimid": 'vimid_1',
-                    "accessinfo": {
-                        "tenant": 'tenantname_1'
-                    }
-                }
-            }), '200']
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r3_apply_grant_result]
+        r2_apply_grant_result = [1, json.JSONEncoder().encode(self.grant_result), '200']
+        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]
         self.nf_inst_id = '1111'
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
         JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
@@ -154,16 +143,8 @@ class TestNFInstantiate(TestCase):
                                    vnfdid='111',
                                    create_time=now_time())
         r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
-        r3_apply_grant_result = [0, json.JSONEncoder().encode(
-            {
-                "vim": {
-                    "vimid": 'vimid_1',
-                    "accessinfo": {
-                        "tenant": 'tenantname_1'
-                    }
-                }
-            }), '200']
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r3_apply_grant_result]
+        r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']
+        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]
         mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume]
         self.nf_inst_id = '1111'
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@@ -187,17 +168,9 @@ class TestNFInstantiate(TestCase):
                                    vnfdid='111',
                                    create_time=now_time())
         r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
-        r3_apply_grant_result = [0, json.JSONEncoder().encode(
-            {
-                "vim": {
-                    "vimid": 'vimid_1',
-                    "accessinfo": {
-                        "tenant": 'tenantname_1'
-                    }
-                }
-            }), '200']
-        r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r3_apply_grant_result, r4_lcm_notify_result]
+        r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']
+        r3_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
+        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_lcm_notify_result]
         mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume,
                                  c4_data_create_network, c5_data_create_subnet, c6_data_create_port,
                                  c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, c10_data_get_vm]