fix VNF query result none exception

[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 7419e69..25a98af 100644 (file)
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@ -23,7 +23,7 @@ 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
+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
@@ -42,7 +42,8 @@ class CreateVnfAndQueryVnfs(APIView):
         logger.debug("QueryMultiVnf--get::> %s" % request.data)
         try:
             resp_data = QueryVnf(request.data).query_multi_vnf()
-
+            if len(resp_data) == 0:
+                return Response(data=[], status=status.HTTP_200_OK)
             vnf_instances_serializer = VnfInstancesSerializer(data=resp_data)
             if not vnf_instances_serializer.is_valid():
                 raise NFLCMException(vnf_instances_serializer.errors)
@@ -59,7 +60,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"
         }
     )
@@ -70,8 +71,12 @@ class CreateVnfAndQueryVnfs(APIView):
             if not req_serializer.is_valid():
                 raise NFLCMException(req_serializer.errors)
 
-            nf_inst_id = CreateVnf(req_serializer.data).do_biz().nfinstid
-            create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
+            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})
             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)
@@ -105,7 +110,7 @@ class DeleteVnfAndQueryVnf(APIView):
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         except Exception as e:
-            logger.eror(e.message)
+            logger.error(e.message)
             logger.error(traceback.format_exc())
             return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)