X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=c8f6b1b7e14be431b2dc059d27e14ff360ae6887;hb=f30925c952e7a9e2dc5f81c0dfc3dbfdf2c812f5;hp=cfdf2800c156730b161731d9278ed412604daedb;hpb=358310fd8c7c0863800de3b22a5a9d8ce2fb3b7e;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index cfdf2800..c8f6b1b7 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -15,10 +15,13 @@
 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.vnfs.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \
+    InstantiateVnfResponseSerializer, InstantiateVnfRequestSerializer
 from lcm.nf.vnfs.vnf_cancel.delete_vnf_identifier import DeleteVnf
 from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
 from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf
@@ -31,24 +34,54 @@ logger = logging.getLogger(__name__)
 
 
 class CreateVnfAndQueryVnfs(APIView):
+    @swagger_auto_schema(
+        request_body=None,
+        responses={
+            status.HTTP_200_OK: VnfsInfoSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def get(self, request):
         logger.debug("QueryMultiVnf--get::> %s" % request.data)
         try:
             resp_data = QueryVnf(request.data).query_multi_vnf()
+
+            vnfsInfoSerializer = VnfsInfoSerializer(data=resp_data)
+            resp_isValid = vnfsInfoSerializer.is_valid()
+            if not resp_isValid:
+                raise NFLCMException(vnfsInfoSerializer.errors)
+
+            return Response(data=vnfsInfoSerializer.data, status=status.HTTP_200_OK)
         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': 'Failed to get Vnfs'},
-                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        return Response(data=resp_data, status=status.HTTP_200_OK)
+            return Response(data={'error': 'Failed to get Vnfs'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
+    @swagger_auto_schema(
+        request_body=CreateVnfReqSerializer(),
+        responses={
+            status.HTTP_201_CREATED: CreateVnfRespSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def post(self, request):
         logger.debug("CreateVnfIdentifier--post::> %s" % request.data)
+        req_serializer = CreateVnfReqSerializer(data=request.data)
+        req_isValid = req_serializer.is_valid()
         try:
-            nf_inst_id = CreateVnf(request.data).do_biz()
+            if not req_isValid:
+                raise NFLCMException(req_serializer.errors)
+
+            nf_inst_id = CreateVnf(req_serializer.data).do_biz()
+
+            resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
+            resp_isValid = resp_serializer.is_valid()
+            if not resp_isValid:
+                raise NFLCMException(resp_serializer.errors)
+            return Response(data=resp_serializer.data, status=status.HTTP_201_CREATED)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -56,19 +89,34 @@ class CreateVnfAndQueryVnfs(APIView):
             logger.error(e.message)
             logger.error(traceback.format_exc())
             return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        rsp = {
-            "vnfInstanceId": nf_inst_id
-        }
-        return Response(data=rsp, status=status.HTTP_201_CREATED)
 
 
 class InstantiateVnf(APIView):
+    @swagger_auto_schema(
+        request_body=InstantiateVnfRequestSerializer(),
+        responses={
+            status.HTTP_202_ACCEPTED: InstantiateVnfResponseSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def post(self, request, instanceid):
         logger.debug("InstantiateVnf--post::> %s" % request.data)
+        instantiateVnfRequestSerializer = InstantiateVnfRequestSerializer(data=request.data)
+        req_isValid = instantiateVnfRequestSerializer.is_valid()
         try:
+            if not req_isValid:
+                raise NFLCMException(instantiateVnfRequestSerializer.errors)
+
             job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)
             JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
-            InstVnf(request.data, instanceid, job_id).start()
+            InstVnf(instantiateVnfRequestSerializer.data, instanceid, job_id).start()
+
+            instantiateVnfResponseSerializer = InstantiateVnfResponseSerializer(data={"jobId": job_id})
+            resp_isValid = instantiateVnfResponseSerializer.is_valid()
+            if not resp_isValid:
+                raise NFLCMException(instantiateVnfResponseSerializer.errors)
+
+            return Response(data=instantiateVnfResponseSerializer.data, status=status.HTTP_202_ACCEPTED)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -76,10 +124,6 @@ class InstantiateVnf(APIView):
             logger.error(e.message)
             logger.error(traceback.format_exc())
             return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        rsp = {
-            "jobId": job_id
-        }
-        return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
 class DeleteVnfAndQueryVnf(APIView):