X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fns%2Fviews%2Fsol%2Fterminate_ns_view.py;h=438ca619ba41f4ba1d07c02be61bd62c8fb22905;hb=0876c326a9f9809fbb35d512a4a95f9fad00e445;hp=c6213820625bdead8147596bcb3c779a1df1f713;hpb=18f111c9442c54fdfcc1ea666c8ba28dab267390;p=vfc%2Fnfvo%2Flcm.git

diff --git a/lcm/ns/views/sol/terminate_ns_view.py b/lcm/ns/views/sol/terminate_ns_view.py
index c6213820..438ca619 100644
--- a/lcm/ns/views/sol/terminate_ns_view.py
+++ b/lcm/ns/views/sol/terminate_ns_view.py
@@ -25,6 +25,7 @@ from lcm.pub.utils.values import ignore_case_get
 from lcm.ns.serializers.sol.terminate_ns_serializers import TerminateNsReqSerializer
 from lcm.pub.exceptions import BadRequestException
 from lcm.ns.const import NS_OCC_BASE_URI
+from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
 
 logger = logging.getLogger(__name__)
 
@@ -34,11 +35,12 @@ class TerminateNsView(APIView):
     @swagger_auto_schema(
         request_body=TerminateNsReqSerializer(),
         responses={
-            status.HTTP_202_ACCEPTED: None,
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+            status.HTTP_202_ACCEPTED: "HTTP_202_ACCEPTED",
+            status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer()
         }
     )
     def post(self, request, ns_instance_id):
+        job_id = JobUtil.create_job("NS", JOB_TYPE.TERMINATE_NS, ns_instance_id)
         try:
             logger.debug("Enter TerminateNSView::post %s", request.data)
             req_serializer = TerminateNsReqSerializer(data=request.data)
@@ -48,18 +50,20 @@ class TerminateNsView(APIView):
             terminationTime = ignore_case_get(request.data, 'terminationTime')
             logger.debug("terminationTime is %s" % terminationTime)
             # todo terminationTime
-            job_id = JobUtil.create_job("NS", JOB_TYPE.TERMINATE_NS, ns_instance_id)
             terminateNsService = TerminateNsService(ns_instance_id, job_id, request.data)
             terminateNsService.start()
             logger.debug("Location: %s" % terminateNsService.occ_id)
             response = Response(data={}, status=status.HTTP_202_ACCEPTED)
             response["Location"] = NS_OCC_BASE_URI % terminateNsService.occ_id
+            logger.debug("Leave TerminateNSView")
             return response
         except BadRequestException as e:
-            logger.error("Exception in CreateNS: %s", e.message)
+            logger.error("Exception in TerminateNsView: %s", e.message)
+            JobUtil.add_job_status(job_id, 255, 'NS termination failed: %s' % e.message)
             data = {'status': status.HTTP_400_BAD_REQUEST, 'detail': e.message}
             return Response(data=data, status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
-            logger.error("Exception in CreateNS: %s", e.message)
+            logger.error("Exception in TerminateNsView: %s", e.message)
+            JobUtil.add_job_status(job_id, 255, 'NS termination failed: %s' % e.message)
             data = {'status': status.HTTP_400_BAD_REQUEST, 'detail': e.message}
             return Response(data=data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)