From: maopeng zhang <zhang.maopeng1@zte.com.cn>
Date: Mon, 13 Apr 2020 10:44:08 +0000 (+0000)
Subject: Merge "Update ns_terminate code about cancel wait delete vnfs multithreading"
X-Git-Tag: 1.3.9~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c186495de0d47d1d9bc2f3d957633f31275f51b7;hp=37885adf8ee0ac29d35b34df763ae9a5aa218597;p=vfc%2Fnfvo%2Flcm.git

Merge "Update ns_terminate code about cancel wait delete vnfs multithreading"
---

diff --git a/lcm/ns/biz/ns_terminate.py b/lcm/ns/biz/ns_terminate.py
index 32845ddc..a4ae4df5 100644
--- a/lcm/ns/biz/ns_terminate.py
+++ b/lcm/ns/biz/ns_terminate.py
@@ -145,11 +145,7 @@ class TerminateNsService(threading.Thread):
             job_msg = "Delete vnfinst:[%s] %s." % (vnfinst.nfinstid, delete_result)
             JobUtil.add_job_status(self.job_id, cur_progress, job_msg)
             vnf_jobs.append((vnfinst.nfinstid, vnf_job_id))
-
-        thread = threading.Thread(
-            target=self.wait_delete_vnfs,
-            args=(vnf_jobs, cur_progress, step_progress,))
-        thread.start()
+        self.wait_delete_vnfs(vnf_jobs, cur_progress, step_progress)
 
     def wait_delete_vnfs(self, vnf_jobs, cur_progress, step_progress):
         for vnfinstid, vnfjobid in vnf_jobs: