refactor codes for operate vnf

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / views / operate_vnf_view.py

diff --git a/lcm/lcm/nf/views/operate_vnf_view.py b/lcm/lcm/nf/views/operate_vnf_view.py
index 947e983..5327340 100644 (file)
--- a/lcm/lcm/nf/views/operate_vnf_view.py
+++ b/lcm/lcm/nf/views/operate_vnf_view.py
@@ -13,20 +13,18 @@
 # limitations under the License.\r
 \r
 import logging\r
-import traceback\r
 \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.operate_vnf import OperateVnf\r
 from lcm.nf.serializers.operate_vnf_req import OperateVnfRequestSerializer\r
 from lcm.nf.serializers.response import ProblemDetailsSerializer\r
-from lcm.pub.exceptions import NFLCMException, NFLCMExceptionNotFound, 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
@@ -41,48 +39,14 @@ class OperateVnfView(APIView):
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
         }\r
     )\r
+    @view_safe_call_with_log(logger=logger)\r
     def post(self, request, instanceid):\r
-        logger.debug("OperateVnf--post::> %s" % request.data)\r
-        try:\r
-            operate_vnf_request_serializer = OperateVnfRequestSerializer(data=request.data)\r
-            if not operate_vnf_request_serializer.is_valid():\r
-                raise NFLCMException(operate_vnf_request_serializer.errors)\r
-\r
-            job_id = JobUtil.create_job('NF', 'OPERATE', instanceid)\r
-            JobUtil.add_job_status(job_id, 0, "OPERATE_VNF_READY")\r
-            self.operate_pre_check(instanceid, job_id)\r
-            OperateVnf(operate_vnf_request_serializer.data, instanceid, job_id).start()\r
-            response = Response(data=None, status=status.HTTP_202_ACCEPTED)\r
-            response["Location"] = "/vnf_lc_ops/%s" % job_id\r
-            return response\r
-        except NFLCMExceptionNotFound as e:\r
-            probDetail = ProblemDetailsSerializer(data={"status": 404, "detail": "VNF Instance not found"})\r
-            resp_isvalid = probDetail.is_valid()\r
-            if not resp_isvalid:\r
-                raise NFLCMException(probDetail.errors)\r
-            return Response(data=probDetail.data, status=status.HTTP_404_NOT_FOUND)\r
-        except NFLCMExceptionConflict as e:\r
-            probDetail = ProblemDetailsSerializer(data={"status": 409, "detail": "VNF Instance not in Instantiated State"})\r
-            resp_isvalid = probDetail.is_valid()\r
-            if not resp_isvalid:\r
-                raise NFLCMException(probDetail.errors)\r
-            return Response(data=probDetail.data, status=status.HTTP_409_CONFLICT)\r
-        except NFLCMException as e:\r
-            logger.error(e.message)\r
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
-        except Exception as e:\r
-            logger.error(e.message)\r
-            logger.error(traceback.format_exc())\r
-            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
-\r
-    def operate_pre_check(self, nfInstId, jobId):\r
-        vnf_insts = NfInstModel.objects.filter(nfinstid=nfInstId)\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
-        NfInstModel.objects.filter(nfinstid=nfInstId).update(status=VNF_STATUS.OPERATING)\r
-\r
-        JobUtil.add_job_status(jobId, 15, 'Nf operating pre-check finish')\r
-        logger.info("Nf operating pre-check finish")\r
+        return deal_vnf_action(\r
+            logger=logger,\r
+            opt_type=OPERATION_TYPE.OPERATE,\r
+            opt_status=VNF_STATUS.OPERATING,\r
+            instid=instanceid,\r
+            req=request,\r
+            req_serializer=OperateVnfRequestSerializer,\r
+            act_task=OperateVnf\r
+        )\r