Change gvnfm-vnflcm aai config

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

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index c715ced..6669faf 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -39,10 +39,9 @@ class TestNFInstantiate(TestCase):
         pass
 
     def assert_job_result(self, job_id, job_progress, job_detail):
-        jobs = JobStatusModel.objects.filter(
-            jobid=job_id,
-            progress=job_progress,
-            descp=job_detail)
+        jobs = JobStatusModel.objects.filter(jobid=job_id,
+                                             progress=job_progress,
+                                             descp=job_detail)
         self.assertEqual(1, len(jobs))
 
     def test_swagger_ok(self):
@@ -51,16 +50,24 @@ 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']
+        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]
         data = {
             "vnfdId": "111",
             "vnfInstanceName": "vFW_01",
-            "vnfInstanceDescription": "vFW in Nanjing TIC Edge"}
+            "vnfInstanceDescription": "vFW in Nanjing TIC Edge"
+        }
         response = self.client.post("/api/vnflcm/v1/vnf_instances", data=data, format='json')
         self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
         context = json.loads(response.content)
@@ -76,10 +83,9 @@ class TestNFInstantiate(TestCase):
         self.nf_inst_id = str(uuid.uuid4())
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
         JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
-        jobs = JobStatusModel.objects.filter(
-            jobid=self.job_id,
-            progress=0,
-            descp="INST_VNF_READY")
+        jobs = JobStatusModel.objects.filter(jobid=self.job_id,
+                                             progress=0,
+                                             descp="INST_VNF_READY")
         self.assertEqual(1, len(jobs))
         data = inst_req_data
         InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
@@ -87,12 +93,27 @@ class TestNFInstantiate(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     def test_instantiate_vnf_when_get_package_info_by_vnfdid_failed(self, 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 = [1, json.JSONEncoder().encode({'csars':[{'package_id': '222',
-                                                                  'csarId': '2222',
-                                                                  'vnfdId': '111'}]}), '200']
+        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(
+            {
+                '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,12 +124,27 @@ class TestNFInstantiate(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     def test_instantiate_vnf_when_get_rawdata_by_csarid_failed(self, 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({'csars':[{'package_id': '222',
-                                                                  'csarId': '2222',
-                                                                  'vnfdId': '111'}]}), '200']
+        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(
+            {
+                '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,15 +156,37 @@ class TestNFInstantiate(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     def test_instantiate_vnf_when_applay_grant_failed(self, 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({'csars':[{'package_id': '222',
-                                                                  'csarId': '2222',
-                                                                  'vnfdId': '111'}]}), '200']
+        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(
+            {
+                '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']
+            {
+                "vim": {
+                    "vimid": 'vimid_1',
+                    "accessinfo": {
+                        "tenant": 'tenantname_1'
+                    }
+                }
+            }), '200']
         mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_apply_grant_result]
         self.nf_inst_id = '1111'
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@@ -140,15 +198,37 @@ class TestNFInstantiate(TestCase):
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
     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({'csars':[{'package_id': '222',
-                                                                  'csarId': '2222',
-                                                                  'vnfdId': '111'}]}), '200']
+        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(
+            {
+                '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']
+            {
+                "vim": {
+                    "vimid": 'vimid_1',
+                    "accessinfo": {
+                        "tenant": 'tenantname_1'
+                    }
+                }
+            }), '200']
         mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_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'
@@ -161,15 +241,37 @@ class TestNFInstantiate(TestCase):
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
     def test_instantiate_vnf_success(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({'csars':[{'package_id': '222',
-                                                                  'csarId': '2222',
-                                                                  'vnfdId': '111'}]}), '200']
+        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(
+            {
+                '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']
+            {
+                "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_csarid_by_vnfdid, r2_get_rawdata_from_catalog,
                                      r3_apply_grant_result, r4_lcm_notify_result]