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=252d87902acabf355680cc15678d248157bca63d;hpb=e01678f8fed4b6d9e843abadad0b36bf03057455;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 252d8790..3da4a41e 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
@@ -18,7 +18,8 @@ from django.test import TestCase, Client
 from rest_framework import status
 
 from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
-from lcm.pub.database.models import NfInstModel, JobStatusModel
+from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \
+    PortInstModel, NfvoRegInfoModel
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
 
@@ -26,9 +27,22 @@ from lcm.pub.utils.timeutil import now_time
 class TestNFTerminate(TestCase):
     def setUp(self):
         self.client = Client()
+        VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1111", vmname="test_01",
+                                   is_predefined=1, operationalstate=1)
+        VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="1111",
+                                   is_predefined=1, vmname="test_02", operationalstate=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')
 
     def tearDown(self):
-        pass
+        VmInstModel.objects.all().delete()
+        NetworkInstModel.objects.all().delete()
+        SubNetworkInstModel.objects.all().delete()
+        PortInstModel.objects.all().delete()
 
     def assert_job_result(self, job_id, job_progress, job_detail):
         jobs = JobStatusModel.objects.filter(
@@ -78,3 +92,35 @@ 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, 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='',
+                                   producttype='', netype='', vnfd_model='',
+                                   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'
+        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, 100, "Terminate Vnf success.")