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

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index b93ce67c..01db9db5 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -20,6 +20,8 @@ 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.pub.exceptions import NFLCMException
@@ -38,31 +40,50 @@ class CreateVnfIdentifier(APIView):
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         except Exception:
             logger.error(traceback.format_exc())
-            return Response(data='unexpected exception', status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         rsp = {"vnfInstanceId": nf_inst_id}
         return Response(data=rsp, status=status.HTTP_201_CREATED)
 
 
 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):
+    def delete(self, request, instanceid):
         logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data)
-        return Response(data='', status=status.HTTP_202_ACCEPTED)
+        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):
@@ -77,10 +98,10 @@ class QuerySingleVnf(APIView):
         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 GetOperationStatus(APIView):
+#     def get(self, request):
+#         logger.debug("GetOperationStatus--get::> %s" % request.data)
+#         return Response(data='', status=status.HTTP_202_ACCEPTED)
 
 
 class SwaggerJsonView(APIView):