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=6c646f1fe4d13593a0ffb18045ddd73119688d75;hpb=4d52387b3556f146bea3533106955c8f7a27571f;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 6c646f1f..2992814b 100644
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@ -32,6 +32,8 @@ 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__)
 
@@ -53,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(),
@@ -67,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):
@@ -91,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={
@@ -107,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()