X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_cancel.py;h=4cde4436c0235f8e84e8ca70aaa696fc4b3c2901;hb=refs%2Ftags%2Fv2.0.0;hp=f7732181ae99448cdc43fd64e90dbe5333666382;hpb=56317b07f492c7e7a47ef3f39866291b0d2df6c2;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 f7732181..4cde4436 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
@@ -20,7 +20,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, 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
@@ -41,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,7 +55,7 @@ class TestNFTerminate(TestCase):
             progress=job_progress,
             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='NOT_INSTANTIATED', nf_desc='', vnfdid='',
@@ -64,6 +65,7 @@ class TestNFTerminate(TestCase):
         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)
@@ -77,6 +79,7 @@ class TestNFTerminate(TestCase):
         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):
@@ -84,6 +87,7 @@ class TestNFTerminate(TestCase):
         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}
@@ -92,6 +96,7 @@ 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)
+    """
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
@@ -112,4 +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.")
-    """
+