Optimized code and testcase of query vnf

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / vnfs / views.py

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index b88a3e1..ef997f0 100644 (file)
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -27,12 +27,24 @@ 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
-from lcm.pub.utils.values import ignore_case_get
 
 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:
@@ -64,7 +76,7 @@ class InstantiateVnf(APIView):
         return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
-class DetailVnf(APIView):
+class DeleteVnfAndQueryVnf(APIView):
     def get(self, request, instanceid):
         logger.debug("QuerySingleVnf--get::> %s" % request.data)
         try:
@@ -74,7 +86,6 @@ class DetailVnf(APIView):
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         except:
             logger.error(traceback.format_exc())
-            tt = 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)
@@ -107,26 +118,6 @@ class QueryMultipleVnf(APIView):
         logger.debug("QueryMultipleVnf--get::> %s" % request.data)
         return Response(data='', status=status.HTTP_202_ACCEPTED)
 
-# class QuerySingleVnf(APIView):
-#     def get(self, request, instanceid):
-#         logger.debug("QuerySingleVnf--get::> %s" % request.data)
-#         try:
-#             resp_data = QueryVnf(request.data, instanceid).query_single_vnf(instanceid)
-#         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_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):