Refactor codes for term vnf

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

diff --git a/lcm/lcm/nf/views/terminate_vnf_view.py b/lcm/lcm/nf/views/terminate_vnf_view.py
index 8cd2646..0530437 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -13,7 +13,6 @@
 # limitations under the License.\r
 \r
 import logging\r
-import traceback\r
 \r
 from drf_yasg.utils import swagger_auto_schema\r
 from rest_framework import status\r
@@ -21,10 +20,11 @@ from rest_framework.response import Response
 from rest_framework.views import APIView\r
 \r
 from lcm.nf.biz.terminate_vnf import TerminateVnf\r
-from lcm.nf.serializers.serializers import InstOrTeriVnfResponseSerializer, TerminateVnfRequestSerializer\r
+from lcm.nf.serializers.terminate_vnf_req import TerminateVnfRequestSerializer\r
+from lcm.nf.serializers.job_identifier import JobIdentifierSerializer\r
 from lcm.pub.exceptions import NFLCMException\r
 from lcm.pub.utils.jobutil import JobUtil\r
-\r
+from .common import view_safe_call_with_log\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -33,30 +33,24 @@ class TerminateVnfView(APIView):
     @swagger_auto_schema(\r
         request_body=TerminateVnfRequestSerializer(),\r
         responses={\r
-            status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(),\r
+            status.HTTP_202_ACCEPTED: JobIdentifierSerializer(),\r
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
         }\r
     )\r
+    @view_safe_call_with_log(logger=logger)\r
     def post(self, request, instanceid):\r
         logger.debug("TerminateVnf--post::> %s" % request.data)\r
-        try:\r
-            terminate_vnf_request_serializer = TerminateVnfRequestSerializer(data=request.data)\r
-            if not terminate_vnf_request_serializer.is_valid():\r
-                raise NFLCMException(terminate_vnf_request_serializer.errors)\r
-\r
-            job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid)\r
-            JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY")\r
-            TerminateVnf(terminate_vnf_request_serializer.data, instanceid, job_id).start()\r
-\r
-            terminate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id})\r
-            if not terminate_vnf_response_serializer.is_valid():\r
-                raise NFLCMException(terminate_vnf_response_serializer.errors)\r
-\r
-            return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)\r
-        except NFLCMException as e:\r
-            logger.error(e.message)\r
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
-        except Exception as e:\r
-            logger.error(e.message)\r
-            logger.error(traceback.format_exc())\r
-            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
+\r
+        terminate_vnf_request_serializer = TerminateVnfRequestSerializer(data=request.data)\r
+        if not terminate_vnf_request_serializer.is_valid():\r
+            raise NFLCMException(terminate_vnf_request_serializer.errors)\r
+\r
+        job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid)\r
+        JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY")\r
+        TerminateVnf(terminate_vnf_request_serializer.data, instanceid, job_id).start()\r
+\r
+        terminate_vnf_response_serializer = JobIdentifierSerializer(data={"jobId": job_id})\r
+        if not terminate_vnf_response_serializer.is_valid():\r
+            raise NFLCMException(terminate_vnf_response_serializer.errors)\r
+\r
+        return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)\r