Modify swagger

[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 16d082c..9b141b3 100644 (file)
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@ -23,8 +23,9 @@ 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.serializers.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \
-    VnfInfoSerializer
+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.pub.exceptions import NFLCMException
 
 logger = logging.getLogger(__name__)
@@ -33,7 +34,7 @@ logger = logging.getLogger(__name__)
 class CreateVnfAndQueryVnfs(APIView):
     @swagger_auto_schema(
         responses={
-            status.HTTP_200_OK: VnfsInfoSerializer(),
+            status.HTTP_200_OK: VnfInstancesSerializer(),
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
@@ -42,11 +43,11 @@ class CreateVnfAndQueryVnfs(APIView):
         try:
             resp_data = QueryVnf(request.data).query_multi_vnf()
 
-            vnfs_info_serializer = VnfsInfoSerializer(data=resp_data)
-            if not vnfs_info_serializer.is_valid():
-                raise NFLCMException(vnfs_info_serializer.errors)
+            vnf_instances_serializer = VnfInstancesSerializer(data=resp_data)
+            if not vnf_instances_serializer.is_valid():
+                raise NFLCMException(vnf_instances_serializer.errors)
 
-            return Response(data=vnfs_info_serializer.data, status=status.HTTP_200_OK)
+            return Response(data=vnf_instances_serializer.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)
@@ -58,7 +59,7 @@ class CreateVnfAndQueryVnfs(APIView):
     @swagger_auto_schema(
         request_body=CreateVnfReqSerializer(),
         responses={
-            status.HTTP_201_CREATED: CreateVnfRespSerializer(),
+            status.HTTP_201_CREATED: VnfInstanceSerializer(),
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
@@ -69,10 +70,12 @@ class CreateVnfAndQueryVnfs(APIView):
             if not req_serializer.is_valid():
                 raise NFLCMException(req_serializer.errors)
 
-            resp = CreateVnf(req_serializer.data).do_biz()
-            nf_inst_id = resp.get('id', 'undefined')
-
-            create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
+            nf_inst = CreateVnf(req_serializer.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})
             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)
@@ -88,7 +91,7 @@ class CreateVnfAndQueryVnfs(APIView):
 class DeleteVnfAndQueryVnf(APIView):
     @swagger_auto_schema(
         responses={
-            status.HTTP_200_OK: VnfInfoSerializer(),
+            status.HTTP_200_OK: VnfInstanceSerializer(),
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
@@ -97,11 +100,11 @@ class DeleteVnfAndQueryVnf(APIView):
         try:
             resp_data = QueryVnf(request.data, instanceid).query_single_vnf()
 
-            vnf_info_serializer = VnfInfoSerializer(data=resp_data)
-            if not vnf_info_serializer.is_valid():
-                raise NFLCMException(vnf_info_serializer.errors)
+            vnfs_instance_serializer = VnfInstanceSerializer(data=resp_data)
+            if not vnfs_instance_serializer.is_valid():
+                raise NFLCMException(vnfs_instance_serializer.errors)
 
-            return Response(data=vnf_info_serializer.data, status=status.HTTP_200_OK)
+            return Response(data=vnfs_instance_serializer.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)
@@ -125,8 +128,10 @@ class DeleteVnfAndQueryVnf(APIView):
             return Response(data=None, status=status.HTTP_204_NO_CONTENT)
         except NFLCMException as e:
             logger.error(e.message)
+            logger.debug('Delete VNF instance[%s] failed' % instanceid)
             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())
+            logger.debug('Delete VNF instance[%s] failed' % instanceid)
             return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)