Update python2 to python3

[vfc/nfvo/lcm.git] / lcm / ns / biz / ns_heal.py

diff --git a/lcm/ns/biz/ns_heal.py b/lcm/ns/biz/ns_heal.py
index 20db772..8ca033f 100644 (file)
--- a/lcm/ns/biz/ns_heal.py
+++ b/lcm/ns/biz/ns_heal.py
@@ -21,12 +21,12 @@ import traceback
 from lcm.ns.enum import NS_INST_STATUS
 from lcm.pub.database.models import JobModel, NSInstModel, NfInstModel, VNFCInstModel, VmInstModel
 from lcm.pub.exceptions import NSLCMException
-from lcm.pub.utils.jobutil import JobUtil, JOB_MODEL_STATUS
+from lcm.pub.utils.jobutil import JobUtil
+from lcm.pub.enum import JOB_MODEL_STATUS, JOB_PROGRESS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.biz.heal_vnfs import NFHealService
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc
 
-JOB_ERROR = 255
 logger = logging.getLogger(__name__)
 
 
@@ -44,12 +44,12 @@ class NSHealService(threading.Thread):
         try:
             self.do_biz()
         except NSLCMException as e:
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
-            NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.message)
+            JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, e.args[0])
+            NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.args[0])
         except Exception as e:
             logger.error(traceback.format_exc())
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, 'ns heal fail')
-            NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.message)
+            JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, 'ns heal fail')
+            NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.args[0])
 
     def do_biz(self):
         self.update_job(1, desc='ns heal start')
@@ -63,20 +63,20 @@ class NSHealService(threading.Thread):
     def get_and_check_params(self):
         ns_info = NSInstModel.objects.filter(id=self.ns_instance_id)
         if not ns_info:
-            logger.error('NS [id=%s] does not exist' % self.ns_instance_id)
-            raise NSLCMException(
-                'NS [id=%s] does not exist' % self.ns_instance_id)
+            errmsg = 'NS [id=%s] does not exist' % self.ns_instance_id
+            raise NSLCMException(errmsg)
+
         self.heal_ns_data = ignore_case_get(self.request_data, 'healNsData')
         self.heal_vnf_data = ignore_case_get(self.request_data, 'healVnfData')
+
         if self.heal_ns_data and self.heal_vnf_data:
-            logger.error('healNsData and healVnfData can not exist together')
-            raise NSLCMException(
-                'healNsData and healVnfData can not exist together')
+            errmsg = 'healNsData and healVnfData can not exist together'
+            logger.error(errmsg)
+            raise NSLCMException(errmsg)
+
         if not self.heal_ns_data and not self.heal_vnf_data:
-            logger.error(
-                'healNsData and healVnfData parameters does not exist or value is incorrect.')
-            raise NSLCMException(
-                'healNsData and healVnfData parameters does not exist or value is incorrect.')
+            errmsg = 'healNsData and healVnfData parameters does not exist or value is incorrect.'
+            raise NSLCMException(errmsg)
 
     def do_heal(self):
         if self.heal_vnf_data:
@@ -86,8 +86,8 @@ class NSHealService(threading.Thread):
                 logger.info('nf[%s] heal handle end' % vnf_heal_params.get('vnfInstanceId'))
                 self.update_job(90, desc='nf[%s] heal handle end' % vnf_heal_params.get('vnfInstanceId'))
             else:
-                logger.error('nf heal failed')
-                raise NSLCMException('nf heal failed')
+                errmsg = 'nf heal failed'
+                raise NSLCMException(errmsg)
         else:
             ns_heal_params = self.prepare_ns_heal_params(self.heal_ns_data)
             for ns_heal_param in ns_heal_params:
@@ -96,8 +96,9 @@ class NSHealService(threading.Thread):
                     logger.info('nf[%s] heal handle end' % ns_heal_param.get('vnfInstanceId'))
                     self.update_job(90, desc='nf[%s] heal handle end' % ns_heal_param.get('vnfInstanceId'))
                 else:
-                    logger.error('nf heal failed')
-                    raise NSLCMException('nf heal failed')
+                    errmsg = 'nf heal failed'
+                    logger.error(errmsg)
+                    raise NSLCMException(errmsg)
 
     def do_vnf_or_ns_heal(self, heal_param, progress):
         instance_id = heal_param.get('vnfInstanceId')
@@ -111,8 +112,9 @@ class NSHealService(threading.Thread):
     def prepare_ns_heal_params(self, ns_data):
         degree_healing = ignore_case_get(ns_data, 'degreeHealing')
         if not degree_healing:
-            logger.error('degreeHealing does not exist.')
-            raise NSLCMException('degreeHealing does not exist.')
+            errmsg = 'degreeHealing does not exist.'
+            logger.error(errmsg)
+            raise NSLCMException(errmsg)
         ns_instance_id = self.ns_instance_id
         cause = 'vm is down'
         # action = ignore_case_get(ns_data, 'actionsHealing')
@@ -149,17 +151,16 @@ class NSHealService(threading.Thread):
                     result_arr.append(result)
             return result_arr
         else:
-            logger.error(
-                'The degree of healing dose not exist or value is incorrect.')
-            raise NSLCMException(
-                'The degree of healing dose not exist or value is incorrect.')
+            errmsg = 'The degree of healing dose not exist or value is incorrect.'
+            logger.error(errmsg)
+            raise NSLCMException(errmsg)
 
     def prepare_vnf_heal_params(self, vnf_data):
         vnf_instance_id = ignore_case_get(vnf_data, 'vnfInstanceId')
         if not vnf_instance_id:
-            logger.error('vnfinstanceid does not exist or value is incorrect.')
-            raise NSLCMException(
-                'vnfinstanceid does not exist or value is incorrect.')
+            errmsg = 'vnfinstanceid does not exist or value is incorrect.'
+            logger.error(errmsg)
+            raise NSLCMException(errmsg)
         cause = ignore_case_get(vnf_data, 'cause')
         additional_params = ignore_case_get(vnf_data, 'additionalParams')
         action = ignore_case_get(additional_params, 'action')
@@ -190,9 +191,9 @@ class NSHealService(threading.Thread):
             job_result = JobModel.objects.get(jobid=sub_job_id)
             time.sleep(query_interval)
             end_time = datetime.datetime.now()
-            if job_result.progress == 100:
+            if job_result.progress == JOB_PROGRESS.FINISHED:
                 return JOB_MODEL_STATUS.FINISHED
-            elif job_result.progress > 100:
+            elif job_result.progress > JOB_PROGRESS.FINISHED:
                 return JOB_MODEL_STATUS.ERROR
             else:
                 continue