Code optimization

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

diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py
index 29ca82b..fa57f2e 100644 (file)
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@ -33,6 +33,7 @@ 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,12 +55,13 @@ 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(),
         responses={
             status.HTTP_201_CREATED: VnfInstanceSerializer(),
+            status.HTTP_400_BAD_REQUEST: "Bad Request",
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
@@ -68,18 +70,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):
@@ -106,7 +109,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()