Update python2 to python3

[vfc/nfvo/lcm.git] / lcm / ns_vnfs / biz / scale_vnfs.py

diff --git a/lcm/ns_vnfs/biz/scale_vnfs.py b/lcm/ns_vnfs/biz/scale_vnfs.py
index c405a40..f46852b 100644 (file)
--- a/lcm/ns_vnfs/biz/scale_vnfs.py
+++ b/lcm/ns_vnfs/biz/scale_vnfs.py
@@ -19,13 +19,12 @@ import traceback
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.vnfmdriver import send_nf_scaling_request
-from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE, JOB_MODEL_STATUS
+from lcm.pub.utils.jobutil import JobUtil
+from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.enum import VNF_STATUS
 from lcm.ns_vnfs.biz.wait_job import wait_job_finish
 
-JOB_ERROR = 255
-SCALE_TYPE = ("SCALE_OUT", "SCALE_IN")
 logger = logging.getLogger(__name__)
 
 
@@ -44,11 +43,11 @@ class NFManualScaleService(threading.Thread):
         try:
             self.do_biz()
         except NSLCMException as e:
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
+            JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, e.args[0])
         except Exception as ex:
-            logger.error(ex.message)
+            logger.error(ex.args[0])
             logger.error(traceback.format_exc())
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, 'VNF scale failed')
+            JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, 'VNF scale failed')
         finally:
             self.update_nf_status()