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

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index f03e4bcf..ef997f05 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -20,15 +20,31 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+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:
@@ -44,25 +60,57 @@ class CreateVnfIdentifier(APIView):
 
 
 class InstantiateVnf(APIView):
-    def post(self, request, instanceId):
-        logger.debug("InstantiateVnf--post::> %s" % request.data)
-        job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceId)
-        JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
-        InstVnf(request.data, instanceId, job_id).start()
+    def post(self, request, instanceid):
+        try:
+            logger.debug("InstantiateVnf--post::> %s" % request.data)
+            job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)
+            JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
+            InstVnf(request.data, instanceid, job_id).start()
+        except NFLCMException as e:
+            logger.error(e.message)
+            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception:
+            logger.error(traceback.format_exc())
+            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         rsp = {"jobId": job_id}
         return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
-class DeleteVnfIdentifier(APIView):
-    def delete(self, request):
+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)
-        return Response(data='', status=status.HTTP_204_NO_CONTENT)
+        try:
+            DeleteVnf(request.data, instanceid).do_biz()
+        except NFLCMException as e:
+            logger.error(e.message)
+            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception:
+            logger.error(traceback.format_exc())
+            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        return Response(data=None, status=status.HTTP_204_NO_CONTENT)
 
 
 class TerminateVnf(APIView):
-    def post(self, request):
+    def post(self, request, instanceid):
         logger.debug("TerminateVnf--post::> %s" % request.data)
-        return Response(data='', status=status.HTTP_202_ACCEPTED)
+        job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid)
+        JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY")
+        TermVnf(request.data, instanceid, job_id).start()
+        rsp = {"jobId": job_id}
+        return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
 
 
 class QueryMultipleVnf(APIView):
@@ -71,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')