diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-11-24 17:08:43 +0800 |
|---|---|---|
| committer | Fu Jinhua <fu.jinhua@zte.com.cn> | 2018-11-24 11:28:46 +0000 |
| commit | e5e8877bc39da4f56a57855cc43a3cbc4f1d775f (patch) | |
| tree | a0c7994b3210fd592b7de12ec43f3fd484d92c2b | |
| parent | a49a776181fc4cfc721cb8935c13e1928e6de999 (diff) | |
Fix ns term logic
Change-Id: Idc2c908c3b28089ff5d30bc6a23974794993a2c9
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
(cherry picked from commit 4dbdc1c04cb58cb578e191f94bf9036d559a537c)
| -rw-r--r-- | lcm/ns/biz/ns_terminate.py | 19 |
1 files changed, 12 insertions, 7 deletions
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 = { |