From: fujinhua <fu.jinhua@zte.com.cn>
Date: Sat, 24 Nov 2018 09:08:43 +0000 (+0800)
Subject: Fix ns term logic
X-Git-Tag: 1.2.2~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4dbdc1c04cb58cb578e191f94bf9036d559a537c;p=vfc%2Fnfvo%2Flcm.git

Fix ns term logic

Change-Id: Idc2c908c3b28089ff5d30bc6a23974794993a2c9
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/lcm/ns/biz/ns_terminate.py b/lcm/ns/biz/ns_terminate.py
index e2419821..9baabf97 100644
--- a/lcm/ns/biz/ns_terminate.py
+++ b/lcm/ns/biz/ns_terminate.py
@@ -128,13 +128,18 @@ class TerminateNsService(threading.Thread):
             vnf_jobs.append((vnfinst.nfinstid, vnf_job_id))
 
         for vnfinstid, vnfjobid in vnf_jobs:
-            cur_progress += step_progress
-            if not vnfjobid:
-                continue
-            is_job_ok = self.wait_delete_vnf_job_finish(vnfjobid)
-            msg = "%s to delete VNF(%s)" % ("Succeed" if is_job_ok else "Failed", vnfinstid)
-            logger.debug(msg)
-            JobUtil.add_job_status(self.job_id, cur_progress, msg)
+            try:
+                cur_progress += step_progress
+                if not vnfjobid:
+                    continue
+                is_job_ok = self.wait_delete_vnf_job_finish(vnfjobid)
+                msg = "%s to delete VNF(%s)" % ("Succeed" if is_job_ok else "Failed", vnfinstid)
+                logger.debug(msg)
+                JobUtil.add_job_status(self.job_id, cur_progress, msg)
+            except Exception as e:
+                msg = "Exception occurs when delete VNF(%s)" % vnfinstid
+                logger.debug(msg)
+                JobUtil.add_job_status(self.job_id, cur_progress, msg)
 
     def delete_vnf(self, nf_instid):
         term_param = {