Optimize ns instant.

Issue-ID: VFC-1435

Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: Ic74c73980fdbdcd583da4e0e18ecb17ee8cf3b2f

diff --git a/lcm/ns/biz/ns_instant.py b/lcm/ns/biz/ns_instant.py
index 1340790..c2653aa 100644 (file)
--- a/lcm/ns/biz/ns_instant.py
+++ b/lcm/ns/biz/ns_instant.py
@@ -97,9 +97,7 @@ class InstantNSService(object):
                 if isinstance(vnfm_type_temp, list):
                     vnfm_type = vnfm_type_temp[0]
                 vimid = self.get_vnf_vim_id(vim_id, location_constraints, vnfd_id)
-                s_vimid = vimid
-                if isinstance(vimid, dict):
-                    s_vimid = "%s_%s" % (vimid["cloud_owner"], vimid["cloud_regionid"])
+                s_vimid = "%s_%s" % (vimid["cloud_owner"], vimid["cloud_regionid"])
                 vnfm_info = extsys.select_vnfm(vnfm_type=vnfm_type, vim_id=s_vimid)
 
                 params_vnf.append({

diff --git a/lcm/pub/utils/jobutil.py b/lcm/pub/utils/jobutil.py
index 8a68fcb..414e6ba 100644 (file)
--- a/lcm/pub/utils/jobutil.py
+++ b/lcm/pub/utils/jobutil.py
@@ -18,6 +18,7 @@ import traceback
 import uuid
 
 from lcm.pub.database.models import JobStatusModel, JobModel
+from lcm.pub.enum import JOB_PROGRESS
 from lcm.pub.enum import JOB_STATUS
 from lcm.pub.utils import idutil
 
@@ -65,7 +66,7 @@ class JobUtil(object):
         job.status = JOB_STATUS.PROCESSING
         job.user = user
         job.starttime = datetime.datetime.now().strftime('%Y-%m-%d %X')
-        job.progress = 0
+        job.progress = JOB_PROGRESS.STARTED
         job.resname = res_name
         logger.debug("create a new job, jobid=%s, jobtype=%s, jobaction=%s, resid=%s, status=%d" %
                      (job.jobid, job.jobtype, job.jobaction, job.resid, job.status))