Change gvnfm-vnflcm aai config

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

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
index dee8462..c3e4b38 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
@@ -32,18 +32,55 @@ from lcm.pub.vimapi import api
 class TestNFTerminate(TestCase):
     def setUp(self):
         self.client = Client()
-        StorageInstModel.objects.create(storageid="1", vimid="1", resouceid="11", insttype=0, instid="1111",
+        StorageInstModel.objects.create(storageid="1",
+                                        vimid="1",
+                                        resouceid="11",
+                                        insttype=0,
+                                        instid="1111",
                                         is_predefined=1)
-        NetworkInstModel.objects.create(networkid='1', vimid='1', resouceid='1', name='pnet_network',
-                                        is_predefined=1, tenant='admin', insttype=0, instid='1111')
-        SubNetworkInstModel.objects.create(subnetworkid='1', vimid='1', resouceid='1', networkid='1',
-                                           is_predefined=1, name='sub_pnet', tenant='admin', insttype=0, instid='1111')
-        PortInstModel.objects.create(portid='1', networkid='1', subnetworkid='1', vimid='1', resouceid='1',
-                                     is_predefined=1, name='aaa_pnet_cp', tenant='admin', insttype=0, instid='1111')
-        FlavourInstModel.objects.create(flavourid="1", vimid="1", resouceid="11", instid="1111", is_predefined=1)
-        VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1111", vmname="test_01",
-                                   is_predefined=1, operationalstate=1)
-        NfvoRegInfoModel.objects.create(nfvoid='1111', vnfminstid='11111', apiurl='1')
+        NetworkInstModel.objects.create(networkid='1',
+                                        vimid='1',
+                                        resouceid='1',
+                                        name='pnet_network',
+                                        is_predefined=1,
+                                        tenant='admin',
+                                        insttype=0,
+                                        instid='1111')
+        SubNetworkInstModel.objects.create(subnetworkid='1',
+                                           vimid='1',
+                                           resouceid='1',
+                                           networkid='1',
+                                           is_predefined=1,
+                                           name='sub_pnet',
+                                           tenant='admin',
+                                           insttype=0,
+                                           instid='1111')
+        PortInstModel.objects.create(portid='1',
+                                     networkid='1',
+                                     subnetworkid='1',
+                                     vimid='1',
+                                     resouceid='1',
+                                     is_predefined=1,
+                                     name='aaa_pnet_cp',
+                                     tenant='admin',
+                                     insttype=0,
+                                     instid='1111')
+        FlavourInstModel.objects.create(flavourid="1",
+                                        vimid="1",
+                                        resouceid="11",
+                                        instid="1111",
+                                        is_predefined=1)
+        VmInstModel.objects.create(vmid="1",
+                                   vimid="1",
+                                   resouceid="11",
+                                   insttype=0,
+                                   instid="1111",
+                                   vmname="test_01",
+                                   is_predefined=1,
+                                   operationalstate=1)
+        NfvoRegInfoModel.objects.create(nfvoid='1111',
+                                        vnfminstid='11111',
+                                        apiurl='1')
 
 
     def tearDown(self):
@@ -54,19 +91,28 @@ class TestNFTerminate(TestCase):
 
 
     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))
 
 
     @mock.patch.object(restcall, 'call_req')
     def test_delete_vnf_identifier(self, mock_call_req):
-        NfInstModel.objects.create(nfinstid='1111', nf_name='2222', package_id='todo', version='', vendor='',
-                                   netype='', vnfd_model='', status='NOT_INSTANTIATED', nf_desc='', vnfdid='',
-                                   vnfSoftwareVersion='', vnfConfigurableProperties='todo',
-                                   localizationLanguage='EN_US', create_time=now_time())
+        NfInstModel.objects.create(nfinstid='1111',
+                                   nf_name='2222',
+                                   package_id='todo',
+                                   version='',
+                                   vendor='',
+                                   netype='',
+                                   vnfd_model='',
+                                   status='NOT_INSTANTIATED',
+                                   nf_desc='',
+                                   vnfdid='',
+                                   vnfSoftwareVersion='',
+                                   vnfConfigurableProperties='todo',
+                                   localizationLanguage='EN_US',
+                                   create_time=now_time())
         r1_create_vnf_to_aai = [0, json.JSONEncoder().encode({}), '200']
         mock_call_req.side_effect = [r1_create_vnf_to_aai]
         response = self.client.delete("/api/vnflcm/v1/vnf_instances/1111")
@@ -87,8 +133,10 @@ class TestNFTerminate(TestCase):
 
 
     def test_terminate_vnf_when_inst_id_not_exist(self):
-        data = {"terminationType": "GRACEFUL",
-                "gracefulTerminationTimeout": 120}
+        data = {
+            "terminationType": "GRACEFUL",
+            "gracefulTerminationTimeout": 120
+        }
         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")
@@ -99,17 +147,36 @@ class TestNFTerminate(TestCase):
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
     def test_terminate_vnf_success(self, mock_call, mock_call_req):
-        NfInstModel.objects.create(nfinstid='1111', nf_name='2222', package_id='todo', version='', vendor='',
-                                   netype='', vnfd_model='', status='VNF_INSTANTIATED', nf_desc='', vnfdid='',
-                                   vnfSoftwareVersion='', vnfConfigurableProperties='todo',
-                                   localizationLanguage='EN_US', create_time=now_time())
+        NfInstModel.objects.create(nfinstid='1111',
+                                   nf_name='2222',
+                                   package_id='todo',
+                                   version='',
+                                   vendor='',
+                                   netype='',
+                                   vnfd_model='',
+                                   status='VNF_INSTANTIATED',
+                                   nf_desc='',
+                                   vnfdid='',
+                                   vnfSoftwareVersion='',
+                                   vnfConfigurableProperties='todo',
+                                   localizationLanguage='EN_US',
+                                   create_time=now_time())
         t1_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']
         t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
         mock_call_req.side_effect = [t1_apply_grant_result, t2_lcm_notify_result]
         mock_call.return_value = None
-        data = {"terminationType": "FORCEFUL",
-                "gracefulTerminationTimeout": 120}
+        data = {
+            "terminationType": "FORCEFUL",
+            "gracefulTerminationTimeout": 120
+        }
         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")