Fix bug for status code when subscription post request body invalid what client inputs.

[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 261c55e..b6d25e6 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -13,20 +13,18 @@
 # 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
-from rest_framework.response import Response\r
 from rest_framework.views import APIView\r
 \r
 from lcm.nf.biz.terminate_vnf import TerminateVnf\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
-from lcm.pub.utils.timeutil import now_time\r
-from lcm.pub.database.models import NfInstModel\r
+from lcm.nf.const import VNF_STATUS\r
+from lcm.nf.const import OPERATION_TYPE\r
+from .common import view_safe_call_with_log\r
+from .common import deal_vnf_action\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -39,31 +37,14 @@ class TerminateVnfView(APIView):
             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 = 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
-        except NFLCMException as e:\r
-            self.vnf_term_failed_handle(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
-            self.vnf_term_failed_handle(traceback.format_exc())\r
-            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
-\r
-    def vnf_term_failed_handle(self, error_msg):\r
-        logger.error('VNF termination failed, detail message: %s' % error_msg)\r
-        NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='failed', lastuptime=now_time())\r
-        JobUtil.add_job_status(self.job_id, 255, error_msg)\r
+        return deal_vnf_action(\r
+            logger=logger,\r
+            opt_type=OPERATION_TYPE.TERMINATE,\r
+            opt_status=VNF_STATUS.TERMINATING,\r
+            instid=instanceid,\r
+            req=request,\r
+            req_serializer=TerminateVnfRequestSerializer,\r
+            act_task=TerminateVnf\r
+        )\r