X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fterminate_vnf.py;h=e23d5ef743cc79eb98813cf126f9f946c70711a0;hb=906066a651385fac2eb5d57c93ef428cfef1f01e;hp=5d51512f1f6f16e9d2bac4756535db8130a124c2;hpb=148f5bd1f58b2b2f65d4e5783189b965b43925a2;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py
index 5d51512f..e23d5ef7 100644
--- a/lcm/lcm/nf/biz/terminate_vnf.py
+++ b/lcm/lcm/nf/biz/terminate_vnf.py
@@ -14,7 +14,6 @@
 
 import json
 import logging
-import traceback
 from threading import Thread
 
 from lcm.nf.const import VNF_STATUS, RESOURCE_MAP
@@ -41,7 +40,6 @@ class TerminateVnf(Thread):
         self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
 
     def run(self):
-        try:
             if self.term_pre():
                 self.grant_resource()
                 self.query_inst_resource()
@@ -49,11 +47,6 @@ class TerminateVnf(Thread):
                 self.delete_resource()
                 self.lcm_notify()
             JobUtil.add_job_status(self.job_id, 100, "Terminate Vnf success.")
-        except NFLCMException as e:
-            self.vnf_term_failed_handle(e.message)
-        except Exception as e:
-            logger.error(e.message)
-            self.vnf_term_failed_handle(traceback.format_exc())
 
     def term_pre(self):
         vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
@@ -201,8 +194,3 @@ class TerminateVnf(Thread):
         logger.info('Send notify request to nfvo')
         resp = notify_lcm_to_nfvo(json.dumps(self.notify_data))
         logger.info('Lcm notify end, response: %s' % resp)
-
-    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)