X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fcurd_vnf_views.py;h=2992814b4a881df218f8ef72bd5b2be3134c57e9;hb=da7fa99b4472a891d9e0ab16e0224acdc4f63e8e;hp=64fe002929989f7e136607816fee5d423bafd2b9;hpb=d78eee5a04a0a544169adaddcad5585accc31260;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py
index 64fe0029..2992814b 100644
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@ -15,7 +15,6 @@
 import logging
 
 from drf_yasg.utils import swagger_auto_schema
-from lcm.nf.biz.delete_vnf import DeleteVnf
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -23,16 +22,18 @@ from rest_framework.views import APIView
 from lcm.nf.biz.create_vnf import CreateVnf
 from lcm.nf.biz.query_vnf import QueryVnf
 from lcm.nf.biz.update_vnf import UpdateVnf
+from lcm.nf.biz.delete_vnf import DeleteVnf
 from lcm.nf.serializers.create_vnf_req import CreateVnfReqSerializer
 from lcm.nf.serializers.vnf_instance import VnfInstanceSerializer
 from lcm.nf.serializers.vnf_instances import VnfInstancesSerializer
 from lcm.nf.serializers.vnf_info_modifications import VnfInfoModificationsSerializer
-from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.exceptions import NFLCMException
-from lcm.pub.exceptions import NFLCMExceptionNotFound
-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
+from .common import deal_indivdual_query
+from lcm.pub.exceptions import NFLCMExceptionBadRequest
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +55,7 @@ class CreateVnfAndQueryVnfs(APIView):
         if not vnf_instances_serializer.is_valid():
             raise NFLCMException(vnf_instances_serializer.errors)
 
-        return Response(data=vnf_instances_serializer.data, status=status.HTTP_200_OK)
+        return Response(data=resp_data, status=status.HTTP_200_OK)
 
     @swagger_auto_schema(
         request_body=CreateVnfReqSerializer(),
@@ -68,18 +69,19 @@ class CreateVnfAndQueryVnfs(APIView):
         logger.debug("CreateVnfIdentifier--post::> %s" % request.data)
         req_serializer = CreateVnfReqSerializer(data=request.data)
         if not req_serializer.is_valid():
-            raise NFLCMException(req_serializer.errors)
+            raise NFLCMExceptionBadRequest(req_serializer.errors)
 
         nf_inst = CreateVnf(request.data).do_biz()
-        create_vnf_resp_serializer = VnfInstanceSerializer(
-            data={"id": nf_inst.nfinstid,
-                  "vnfProvider": nf_inst.vendor,
-                  "vnfdVersion": nf_inst.version,
-                  "vnfPkgId": nf_inst.package_id,
-                  "instantiationState": nf_inst.status})
+        rsp_data = {"id": nf_inst.nfinstid,
+                    "vnfProvider": nf_inst.vendor,
+                    "vnfdVersion": nf_inst.version,
+                    "vnfPkgId": nf_inst.package_id,
+                    "instantiationState": nf_inst.status}
+        create_vnf_resp_serializer = VnfInstanceSerializer(data=rsp_data)
         if not create_vnf_resp_serializer.is_valid():
             raise NFLCMException(create_vnf_resp_serializer.errors)
-        return Response(data=create_vnf_resp_serializer.data, status=status.HTTP_201_CREATED)
+
+        return Response(data=rsp_data, status=status.HTTP_201_CREATED)
 
 
 class DeleteVnfAndQueryVnf(APIView):
@@ -92,13 +94,11 @@ class DeleteVnfAndQueryVnf(APIView):
     @view_safe_call_with_log(logger=logger)
     def get(self, request, instanceid):
         logger.debug("QuerySingleVnf--get::> %s" % request.data)
-        resp_data = QueryVnf(request.data, instanceid).query_single_vnf()
 
-        vnfs_instance_serializer = VnfInstanceSerializer(data=resp_data)
-        if not vnfs_instance_serializer.is_valid():
-            raise NFLCMException(vnfs_instance_serializer.errors)
-
-        return Response(data=vnfs_instance_serializer.data, status=status.HTTP_200_OK)
+        return deal_indivdual_query(res_serializer=VnfInstanceSerializer,
+                                    query_fun=QueryVnf(
+                                        request.data,
+                                        instanceid).query_single_vnf)
 
     @swagger_auto_schema(
         responses={
@@ -108,7 +108,7 @@ class DeleteVnfAndQueryVnf(APIView):
     )
     @view_safe_call_with_log(logger=logger)
     def delete(self, request, instanceid):
-        logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data)
+        logger.debug("DeleteVnfIdentifier--delete::> %s" % instanceid)
 
         DeleteVnf(request.data, instanceid).do_biz()
 
@@ -123,21 +123,12 @@ class DeleteVnfAndQueryVnf(APIView):
     )
     @view_safe_call_with_log(logger=logger)
     def patch(self, request, instanceid):
-        logger.debug("UpdateSingleVnf--patch::> %s, %s", instanceid, request.data)
-
-        upd_vnf_serializer = VnfInfoModificationsSerializer(data=request.data)
-        if not upd_vnf_serializer.is_valid():
-            raise NFLCMException(upd_vnf_serializer.errors)
-
-        job_id = JobUtil.create_job('NF', 'UPDATE', instanceid)
-        JobUtil.add_job_status(job_id, 0, "UPDATE_VNF_READY")
-
-        vnf_insts = NfInstModel.objects.filter(nfinstid=instanceid)
-        if not vnf_insts.exists():
-            raise NFLCMExceptionNotFound("VNF(%s) does not exist." % instanceid)
-        vnf_insts.update(status=VNF_STATUS.UPDATING)
-
-        JobUtil.add_job_status(job_id, 15, 'Nf updating pre-check finish')
-        UpdateVnf(request.data, instanceid, job_id).start()
-
-        return Response(data=None, status=status.HTTP_202_ACCEPTED)
+        return deal_vnf_action(
+            logger=logger,
+            opt_type=OPERATION_TYPE.MODIFY_INFO,
+            opt_status=VNF_STATUS.UPDATING,
+            instid=instanceid,
+            req=request,
+            req_serializer=VnfInfoModificationsSerializer,
+            act_task=UpdateVnf
+        )