refactor codes for heal vnf

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

diff --git a/lcm/lcm/nf/views/heal_vnf_view.py b/lcm/lcm/nf/views/heal_vnf_view.py
index 24b33e3..006062d 100644 (file)
--- a/lcm/lcm/nf/views/heal_vnf_view.py
+++ b/lcm/lcm/nf/views/heal_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.heal_vnf import HealVnf\r
 from lcm.nf.serializers.heal_vnf_req import HealVnfRequestSerializer\r
 from lcm.nf.serializers.response import ProblemDetailsSerializer\r
-from lcm.pub.exceptions import NFLCMException\r
-from lcm.pub.exceptions import NFLCMExceptionNotFound\r
-from lcm.pub.exceptions import NFLCMExceptionConflict\r
-from lcm.pub.utils.jobutil import JobUtil\r
-from lcm.pub.database.models import NfInstModel\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
@@ -45,29 +41,12 @@ class HealVnfView(APIView):
     )\r
     @view_safe_call_with_log(logger=logger)\r
     def post(self, request, instanceid):\r
-        logger.debug("HealVnf--post::> %s" % request.data)\r
-\r
-        heal_vnf_request_serializer = HealVnfRequestSerializer(data=request.data)\r
-        if not heal_vnf_request_serializer.is_valid():\r
-            raise NFLCMException(heal_vnf_request_serializer.errors)\r
-\r
-        job_id = JobUtil.create_job('NF', 'HEAL', instanceid)\r
-        JobUtil.add_job_status(job_id, 0, "HEAL_VNF_READY")\r
-        self.heal_pre_check(instanceid, job_id)\r
-        HealVnf(heal_vnf_request_serializer.data, instanceid, job_id).start()\r
-        response = Response(data={"jobId": job_id}, status=status.HTTP_202_ACCEPTED)\r
-        # todo, heal_vnf codes uses job as the status storage, not in VNFLcmOpOccModel.\r
-        # response["Location"] = "/api/vnflcm/v1/vnf_lc_ops/%s" % lcmopoccid\r
-        return response\r
-\r
-    def heal_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
-        NfInstModel.objects.filter(nfinstid=nf_inst_id).update(status=VNF_STATUS.HEALING)\r
-        JobUtil.add_job_status(job_id, 15, 'Nf healing pre-check finish')\r
-        logger.info("Nf healing pre-check finish")\r
+        return deal_vnf_action(\r
+            logger=logger,\r
+            opt_type=OPERATION_TYPE.HEAL,\r
+            opt_status=VNF_STATUS.HEALING,\r
+            instid=instanceid,\r
+            req=request,\r
+            req_serializer=HealVnfRequestSerializer,\r
+            act_task=HealVnf\r
+        )\r