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 261c55e..c1903b7 100644 (file)
--- a/lcm/lcm/nf/views/terminate_vnf_view.py
+++ b/lcm/lcm/nf/views/terminate_vnf_view.py
@@ -25,8 +25,7 @@ from lcm.nf.serializers.terminate_vnf_req import TerminateVnfRequestSerializer
 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
+\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -56,14 +55,9 @@ class TerminateVnfView(APIView):
 \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
+            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
-            self.vnf_term_failed_handle(traceback.format_exc())\r
+            logger.error(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