X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_cancel.py;h=3da4a41e1330ccc9d034ac2ef56100533c85ceec;hb=64e3ae6de960c1ec7a7c6af87d01439b775b2f09;hp=e39dfe75e15b1390bd046115d1f418710317c14a;hpb=9a8f9cd744b44514cf94e15c84f315751f493c3c;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 e39dfe75..3da4a41e 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py @@ -19,7 +19,7 @@ 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 + PortInstModel, NfvoRegInfoModel from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time @@ -93,6 +93,21 @@ class TestNFTerminate(TestCase): 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_instantiate_vnf_when_get_nfvo_config_failed(self): + NfInstModel.objects.create(nfinstid='1111', mnfinstid='1111', nf_name='2222', + package_id='todo', vnfm_inst_id='todo', version='', vendor='', + producttype='', netype='', vnfd_model='', + instantiationState='VNF_INSTANTIATED', nf_desc='', vnfdid='', + vnfSoftwareVersion='', vnfConfigurableProperties='todo', + localizationLanguage='EN_US', create_time=now_time()) + 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") + TermVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() + self.assert_job_result(self.job_id, 255, "Nfvo was not registered") + def test_terminate_vnf_success(self): NfInstModel.objects.create(nfinstid='1111', mnfinstid='1111', nf_name='2222', package_id='todo', vnfm_inst_id='todo', version='', vendor='', @@ -100,6 +115,8 @@ class TestNFTerminate(TestCase): instantiationState='VNF_INSTANTIATED', nf_desc='', vnfdid='', vnfSoftwareVersion='', vnfConfigurableProperties='todo', localizationLanguage='EN_US', create_time=now_time()) + NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11', + nfvouser='root', nfvopassword='root123') data = {"terminationType": "FORCEFUL", "gracefulTerminationTimeout": 120} self.nf_inst_id = '1111'