Add precheck logic to terminate vnf

Change-Id: If391dad2eebd1980701c8bd52456b9bcb7511c89
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py
index b5f75f3..59b7ead 100644 (file)
--- a/lcm/lcm/nf/tests/test_terminate_vnf.py
+++ b/lcm/lcm/nf/tests/test_terminate_vnf.py
@@ -98,10 +98,19 @@ class TestNFTerminate(TestCase):
             "terminationType": "GRACEFUL",\r
             "gracefulTerminationTimeout": 120\r
         }\r
-        NfInstModel(nfinstid='12', nf_name='VNF1').save()\r
+        NfInstModel(nfinstid='12',\r
+                    nf_name='VNF1',\r
+                    nf_desc="VNF DESC",\r
+                    vnfdid="1",\r
+                    netype="XGW",\r
+                    vendor="ZTE",\r
+                    vnfSoftwareVersion="V1",\r
+                    version="V1",\r
+                    package_id="2",\r
+                    status='INSTANTIATED').save()\r
         mock_run.re.return_value = None\r
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/terminate", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
+        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)\r
 \r
     def test_terminate_vnf_when_inst_id_not_exist(self):\r
         data = {\r

diff --git a/lcm/lcm/nf/views/terminate_vnf_view.py b/lcm/lcm/nf/views/terminate_vnf_view.py
index 0530437..de3122e 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -22,8 +22,12 @@ from rest_framework.views import APIView
 from lcm.nf.biz.terminate_vnf import TerminateVnf\r
 from lcm.nf.serializers.terminate_vnf_req import TerminateVnfRequestSerializer\r
 from lcm.nf.serializers.job_identifier import JobIdentifierSerializer\r
+from lcm.pub.database.models import NfInstModel\r
 from lcm.pub.exceptions import NFLCMException\r
+from lcm.pub.exceptions import NFLCMExceptionConflict\r
+from lcm.pub.exceptions import NFLCMExceptionNotFound\r
 from lcm.pub.utils.jobutil import JobUtil\r
+from lcm.nf.const import VNF_STATUS\r
 from .common import view_safe_call_with_log\r
 \r
 logger = logging.getLogger(__name__)\r
@@ -47,6 +51,8 @@ class TerminateVnfView(APIView):
 \r
         job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid)\r
         JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY")\r
+\r
+        self.terminate_pre_check(instanceid, job_id)\r
         TerminateVnf(terminate_vnf_request_serializer.data, instanceid, job_id).start()\r
 \r
         terminate_vnf_response_serializer = JobIdentifierSerializer(data={"jobId": job_id})\r
@@ -54,3 +60,15 @@ class TerminateVnfView(APIView):
             raise NFLCMException(terminate_vnf_response_serializer.errors)\r
 \r
         return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)\r
+\r
+    def terminate_pre_check(self, nf_inst_id, job_id):\r
+        vnf_insts = NfInstModel.objects.filter(nfinstid=nf_inst_id)\r
+        if not vnf_insts.exists():\r
+            raise NFLCMExceptionNotFound("VNF nf_inst_id does not exist.")\r
+\r
+        if vnf_insts[0].status != 'INSTANTIATED':\r
+            raise NFLCMExceptionConflict("VNF instantiationState is not INSTANTIATED.")\r
+\r
+        vnf_insts.update(status=VNF_STATUS.TERMINATING)\r
+        JobUtil.add_job_status(job_id, 15, 'Nf terminating pre-check finish')\r
+        logger.info("Nf terminating pre-check finish")\r