Change in terminate

[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..261c55e 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -21,10 +21,12 @@ 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 lcm.pub.utils.timeutil import now_time\r
+from lcm.pub.database.models import NfInstModel\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -33,7 +35,7 @@ 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
@@ -48,15 +50,20 @@ class TerminateVnfView(APIView):
             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
+            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
-            logger.error(e.message)\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
-            logger.error(traceback.format_exc())\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