Add code and testcase of query single 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 01db9db..b88a3e1 100644 (file)
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -24,8 +24,10 @@ 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
+from lcm.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
 
@@ -62,7 +64,21 @@ class InstantiateVnf(APIView):
         return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
-class DeleteVnfIdentifier(APIView):
+class DetailVnf(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())
+            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)
+
     def delete(self, request, instanceid):
         logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data)
         try:
@@ -91,11 +107,19 @@ 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):
-        logger.debug("QuerySingleVnf--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):