X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=4f248ac7d9ec1cef48acc59dd502ed90609eb096;hb=refs%2Ftags%2Fv2.0.0;hp=96bb2282f5823386a3bffad1f80f14a5bf14b77b;hpb=56317b07f492c7e7a47ef3f39866291b0d2df6c2;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 96bb2282..4f248ac7 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -46,12 +46,12 @@ class TestNFInstantiate(TestCase):
     def test_swagger_ok(self):
         response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-'''
+
     @mock.patch.object(restcall, 'call_req')
     def test_create_vnf_identifier(self, mock_call_req):
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode([{'package_id': '222',
+        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222',
                                                                   'csarId': '2222',
-                                                                  'vnfdId': '111'}]), '200']
+                                                                  'vnfdId': '111'}]}), '200']
         r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
         mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog]
         data = {
@@ -87,9 +87,9 @@ class TestNFInstantiate(TestCase):
         NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
                                    version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
                                    nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
-        r1_get_csarid_by_vnfdid = [1, json.JSONEncoder().encode([{'package_id': '222',
-                                                                  'csar_id': '2222',
-                                                                  'vnfd_id': '111'}]), '200']
+        r1_get_csarid_by_vnfdid = [1, json.JSONEncoder().encode({'csars':[{'package_id': '222',
+                                                                  'csarId': '2222',
+                                                                  'vnfdId': '111'}]}), '200']
         mock_call_req.side_effect = [r1_get_csarid_by_vnfdid]
         self.nf_inst_id = '1111'
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@@ -103,9 +103,9 @@ class TestNFInstantiate(TestCase):
         NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
                                    version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
                                    nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode([{'package_id': '222',
-                                                                  'csar_id': '2222',
-                                                                  'vnfd_id': '111'}]), '200']
+        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222',
+                                                                  'csarId': '2222',
+                                                                  'vnfdId': '111'}]}), '200']
         r2_get_rawdata_from_catalog = [1, json.JSONEncoder().encode(vnfd_rawdata), '200']
         mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog]
         self.nf_inst_id = '1111'
@@ -120,9 +120,9 @@ class TestNFInstantiate(TestCase):
         NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
                                    version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
                                    nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode([{'package_id': '222',
-                                                                  'csar_id': '2222',
-                                                                  'vnfd_id': '111'}]), '200']
+        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_apply_grant_result = [1, json.JSONEncoder().encode(
             {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
@@ -136,13 +136,13 @@ class TestNFInstantiate(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
-    def test_instantiate_vnf_when_(self, mock_call, mock_call_req):
+    def test_instantiate_vnf_when_unexpected_exception(self, mock_call, mock_call_req):
         NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
                                    version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
                                    nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode([{'package_id': '222',
-                                                                  'csar_id': '2222',
-                                                                  'vnfd_id': '111'}]), '200']
+        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_apply_grant_result = [0, json.JSONEncoder().encode(
             {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
@@ -161,9 +161,9 @@ class TestNFInstantiate(TestCase):
         NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
                                    version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
                                    nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
-        r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode([{'package_id': '222',
-                                                                  'csar_id': '2222',
-                                                                  'vnfd_id': '111'}]), '200']
+        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_apply_grant_result = [0, json.JSONEncoder().encode(
             {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
@@ -179,4 +179,3 @@ class TestNFInstantiate(TestCase):
         data = inst_req_data
         InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
         self.assert_job_result(self.job_id, 100, "Instantiate Vnf success.")
-'''
\ No newline at end of file