refactor codes for terminate vnf

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

diff --git a/lcm/lcm/nf/views/terminate_vnf_view.py b/lcm/lcm/nf/views/terminate_vnf_view.py
index de3122e..b6d25e6 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -16,19 +16,15 @@ import logging
 \r
 from drf_yasg.utils import swagger_auto_schema\r
 from rest_framework import status\r
-from rest_framework.response import Response\r
 from rest_framework.views import APIView\r
 \r
 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 lcm.nf.const import OPERATION_TYPE\r
 from .common import view_safe_call_with_log\r
+from .common import deal_vnf_action\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -43,32 +39,12 @@ class TerminateVnfView(APIView):
     )\r
     @view_safe_call_with_log(logger=logger)\r
     def post(self, request, instanceid):\r
-        logger.debug("TerminateVnf--post::> %s" % request.data)\r
-\r
-        terminate_vnf_request_serializer = TerminateVnfRequestSerializer(data=request.data)\r
-        if not terminate_vnf_request_serializer.is_valid():\r
-            raise NFLCMException(terminate_vnf_request_serializer.errors)\r
-\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
-        if not terminate_vnf_response_serializer.is_valid():\r
-            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
+        return deal_vnf_action(\r
+            logger=logger,\r
+            opt_type=OPERATION_TYPE.TERMINATE,\r
+            opt_status=VNF_STATUS.TERMINATING,\r
+            instid=instanceid,\r
+            req=request,\r
+            req_serializer=TerminateVnfRequestSerializer,\r
+            act_task=TerminateVnf\r
+        )\r