X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_cancel.py;h=4cde4436c0235f8e84e8ca70aaa696fc4b3c2901;hb=refs%2Ftags%2Fv2.0.0;hp=1e458e18784e217648dd7227d5091d45064ff35a;hpb=5e83503bd6ac74691f712ee5ce8e3ccf7a3009ed;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py index 1e458e18..4cde4436 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py @@ -20,10 +20,11 @@ from rest_framework import status from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \ - PortInstModel, NfvoRegInfoModel, FlavourInstModel, StorageInstModel + PortInstModel, FlavourInstModel, StorageInstModel, NfvoRegInfoModel from lcm.pub.utils import restcall from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time +from lcm.pub.vimapi import api class TestNFTerminate(TestCase): @@ -40,6 +41,7 @@ class TestNFTerminate(TestCase): 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): VmInstModel.objects.all().delete() @@ -54,54 +56,60 @@ class TestNFTerminate(TestCase): descp=job_detail) self.assertEqual(1, len(jobs)) - # def test_delete_vnf_identifier(self): - # 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()) - # response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") - # self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) - # self.assertEqual(None, response.data) - # - # def test_delete_vnf_identifier_when_vnf_not_exist(self): - # response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") - # self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code) - # self.assertEqual("VnfInst(1111) does not exist", response.data["error"]) - # - # def test_delete_vnf_identifier_when_status_check_failed(self): - # 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()) - # response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") - # self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code) - # self.assertEqual("Don't allow to delete vnf(status:[NOT_INSTANTIATED])", response.data["error"]) - # - # @mock.patch.object(TermVnf, 'run') - # def test_terminate_vnf(self, mock_run): - # mock_run.re.return_value = None - # response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/terminate", data={}, format='json') - # self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) - # - # def test_terminate_vnf_when_inst_id_not_exist(self): - # 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") - # TermVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - # self.assert_job_result(self.job_id, 255, "VnfInst(%s) does not exist" % self.nf_inst_id) + def test_delete_vnf_identifier(self): + 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()) + response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") + self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) + self.assertEqual(None, response.data) + + """ + def test_delete_vnf_identifier_when_vnf_not_exist(self): + response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") + self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code) + self.assertEqual("VnfInst(1111) does not exist", response.data["error"]) + def test_delete_vnf_identifier_when_status_check_failed(self): + 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()) + response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111") + self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code) + self.assertEqual("Don't allow to delete vnf(status:[VNF_INSTANTIATED])", response.data["error"]) + """ + + @mock.patch.object(TermVnf, 'run') + def test_terminate_vnf(self, mock_run): + mock_run.re.return_value = None + response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/terminate", data={}, format='json') + self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) + + """ + def test_terminate_vnf_when_inst_id_not_exist(self): + 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") + TermVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() + self.assert_job_result(self.job_id, 255, "VnfInst(%s) does not exist" % self.nf_inst_id) + """ @mock.patch.object(restcall, 'call_req') - def test_terminate_vnf_success(self, mock_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()) t1_apply_grant_result = [0, json.JSONEncoder().encode( {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200'] - mock_call_req.side_effect = [t1_apply_grant_result] + 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} self.nf_inst_id = '1111' @@ -109,3 +117,4 @@ class TestNFTerminate(TestCase): JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY") TermVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() self.assert_job_result(self.job_id, 100, "Terminate Vnf success.") +