X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=ef997f056ed2b298103863983d04a127d7e7e82b;hb=4571e2dd027035cca42d27dc0f8f0c2c94a3e019;hp=01db9db50371535a7d65a4d0c1bee5f1f6fd00ca;hpb=6c8fec9120a9532f76f03eeb60fbe4cf5ec36f69;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index 01db9db5..ef997f05 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -24,13 +24,27 @@ 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
 from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
+from lcm.nf.vnfs.vnf_query.query_vnf import QueryVnf
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.utils.jobutil import JobUtil
 
 logger = logging.getLogger(__name__)
 
 
-class CreateVnfIdentifier(APIView):
+class CreateVnfAndQueryVnfs(APIView):
+    def get(self, request):
+        logger.debug("QuerySingleVnf--get::> %s" % request.data)
+        try:
+            resp_data = QueryVnf(request.data).query_multi_vnf()
+        except NFLCMException as e:
+            logger.error(e.message)
+            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except:
+            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)
+
     def post(self, request):
         logger.debug("CreateVnfIdentifier--post::> %s" % request.data)
         try:
@@ -62,7 +76,20 @@ class InstantiateVnf(APIView):
         return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
-class DeleteVnfIdentifier(APIView):
+class DeleteVnfAndQueryVnf(APIView):
+    def get(self, request, instanceid):
+        logger.debug("QuerySingleVnf--get::> %s" % request.data)
+        try:
+            resp_data = QueryVnf(request.data, instanceid).query_single_vnf()
+        except NFLCMException as e:
+            logger.error(e.message)
+            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except:
+            logger.error(traceback.format_exc())
+            return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        return Response(data=resp_data, status=status.HTTP_200_OK)
+
     def delete(self, request, instanceid):
         logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data)
         try:
@@ -92,18 +119,6 @@ class QueryMultipleVnf(APIView):
         return Response(data='', status=status.HTTP_202_ACCEPTED)
 
 
-class QuerySingleVnf(APIView):
-    def get(self, request):
-        logger.debug("QuerySingleVnf--get::> %s" % request.data)
-        return Response(data='', status=status.HTTP_202_ACCEPTED)
-
-
-# class GetOperationStatus(APIView):
-#     def get(self, request):
-#         logger.debug("GetOperationStatus--get::> %s" % request.data)
-#         return Response(data='', status=status.HTTP_202_ACCEPTED)
-
-
 class SwaggerJsonView(APIView):
     def get(self, request):
         json_file = os.path.join(os.path.dirname(__file__), 'swagger.json')