X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Foperate_vnf_view.py;h=5327340244df8c857cc2c39640d16e74870a3f0c;hb=a383ef1f00fda7318cdc1a26e16bf398fddc3b84;hp=947e983ebd1f20fe743078ae240f38cd174b3545;hpb=3e42b3c95ade30a5083b993514b6b0d0734e0075;p=vfc%2Fgvnfm%2Fvnflcm.git

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