X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fv2%2Fviews.py;h=4b56958490e188d50f42e02f426fa57e88a3e1cc;hb=adbda5b9c0365eae74b1c37d37c0e960eb1828ad;hp=1c66c1c034e88a65b92ed02386c8bacbb9021bd9;hpb=29441850a745a9561c33c481f3752318a783f8da;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/v2/views.py b/lcm/lcm/v2/views.py
index 1c66c1c0..4b569584 100644
--- a/lcm/lcm/v2/views.py
+++ b/lcm/lcm/v2/views.py
@@ -20,15 +20,45 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from lcm.nf.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer
+from lcm.nf.serializers import CreateVnfReqSerializer
 from lcm.nf.vnf_create.create_vnf_identifier import CreateVnf
 from lcm.pub.exceptions import NFLCMException
 from lcm.v2.serializers import VnfInstanceSerializer
+from lcm.v2.vnf_query.query_vnf import QueryVnf
 
 logger = logging.getLogger(__name__)
 
 
 class CreateVnfAndQueryVnfs(APIView):
+    @swagger_auto_schema(
+        responses={
+            status.HTTP_200_OK: VnfInstanceSerializer(),
+            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()
+
+            # vnfs_info_serializer = VnfsInfoSerializer(data=resp_data)
+            # if not vnfs_info_serializer.is_valid():
+            #     raise NFLCMException(vnfs_info_serializer.errors)
+            #
+            # return Response(data=vnfs_info_serializer.data, status=status.HTTP_200_OK)
+
+            vnfInstanceSerializer = VnfInstanceSerializer(data=resp_data)
+            if not vnfInstanceSerializer.is_valid():
+                raise NFLCMException(vnfInstanceSerializer.errors)
+            return Response(data=vnfInstanceSerializer.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)
+
     @swagger_auto_schema(
         request_body=CreateVnfReqSerializer(),
         responses={
@@ -43,12 +73,12 @@ class CreateVnfAndQueryVnfs(APIView):
             if not req_serializer.is_valid():
                 raise NFLCMException(req_serializer.errors)
 
-            nf_inst_id = CreateVnf(req_serializer.data).do_biz()
+            resp = CreateVnf(req_serializer.data).do_biz()
 
-            create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
-            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)
+            vnfInstanceSerializer = VnfInstanceSerializer(data=resp)
+            if not vnfInstanceSerializer.is_valid():
+                raise NFLCMException(vnfInstanceSerializer.errors)
+            return Response(data=vnfInstanceSerializer.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)