X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fterminate_vnf_view.py;h=c1903b7626cba5e97e6cfefe8467388b8ab8812d;hb=bf14861a883a10b8e889c420fa662941842a81b1;hp=261c55e164e995af05ffdf1ec2d2e33883f47944;hpb=906066a651385fac2eb5d57c93ef428cfef1f01e;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/views/terminate_vnf_view.py b/lcm/lcm/nf/views/terminate_vnf_view.py
index 261c55e1..c1903b76 100644
--- 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
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.utils.timeutil import now_time
-from lcm.pub.database.models import NfInstModel
+
 
 logger = logging.getLogger(__name__)
 
@@ -56,14 +55,9 @@ class TerminateVnfView(APIView):
 
             return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)
         except NFLCMException as e:
-            self.vnf_term_failed_handle(e.message)
+            logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         except Exception as e:
             logger.error(e.message)
-            self.vnf_term_failed_handle(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
-    def vnf_term_failed_handle(self, error_msg):
-        logger.error('VNF termination failed, detail message: %s' % error_msg)
-        NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='failed', lastuptime=now_time())
-        JobUtil.add_job_status(self.job_id, 255, error_msg)