diff options
Diffstat (limited to 'lcm/ns_vnfs/biz/heal_vnfs.py')
| -rw-r--r-- | lcm/ns_vnfs/biz/heal_vnfs.py | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/lcm/ns_vnfs/biz/heal_vnfs.py b/lcm/ns_vnfs/biz/heal_vnfs.py index 9821878b..fa3702fa 100644 --- a/lcm/ns_vnfs/biz/heal_vnfs.py +++ b/lcm/ns_vnfs/biz/heal_vnfs.py @@ -23,9 +23,9 @@ from lcm.pub.database.models import NfInstModel, VNFCInstModel, VmInstModel from lcm.pub.exceptions import NSLCMException from lcm.pub.msapi.vnfmdriver import send_nf_heal_request from lcm.pub.utils import restcall -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.const import JOB_ERROR from lcm.ns_vnfs.enum import VNF_STATUS from lcm.ns_vnfs.biz.wait_job import wait_job_finish @@ -39,7 +39,6 @@ class NFHealService(threading.Thread): self.vnf_instance_id = vnf_instance_id self.data = data self.job_id = JobUtil.create_job("NF", JOB_TYPE.HEAL_VNF, vnf_instance_id) - self.nf_model = {} self.nf_additional_params = {} self.nf_heal_params = {} @@ -48,34 +47,28 @@ class NFHealService(threading.Thread): def run(self): try: - self.do_biz() + JobUtil.add_job_status(self.job_id, JOB_PROGRESS.STARTED, 'vnf heal start') + self.get_and_check_params() + self.update_nf_status(VNF_STATUS.HEALING) + self.send_nf_healing_request() + self.update_nf_status(VNF_STATUS.ACTIVE) + JobUtil.add_job_status(self.job_id, JOB_PROGRESS.FINISHED, 'vnf heal success') 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.message) except: logger.error(traceback.format_exc()) - JobUtil.add_job_status(self.job_id, JOB_ERROR, 'nf heal fail') - - def do_biz(self): - self.update_job(1, desc='nf heal start') - self.get_and_check_params() - self.update_nf_status(VNF_STATUS.HEALING) - self.send_nf_healing_request() - self.update_nf_status(VNF_STATUS.ACTIVE) - self.update_job(100, desc='nf heal success') + JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, 'vnf heal fail') def get_and_check_params(self): nf_info = NfInstModel.objects.filter(nfinstid=self.vnf_instance_id) if not nf_info: - logger.error('NF instance[id=%s] does not exist' % self.vnf_instance_id) - raise NSLCMException('NF instance[id=%s] does not exist' % self.vnf_instance_id) + raise NSLCMException('VNF instance[id=%s] does not exist' % self.vnf_instance_id) logger.debug('vnfd_model = %s, vnf_instance_id = %s' % (nf_info[0].vnfd_model, self.vnf_instance_id)) self.nf_model = nf_info[0].vnfd_model self.m_nf_inst_id = nf_info[0].mnfinstid self.vnfm_inst_id = nf_info[0].vnfm_inst_id self.nf_additional_params = ignore_case_get(self.data, 'additionalParams') - if not self.nf_additional_params: - logger.error('additionalParams parameter does not exist or value incorrect') raise NSLCMException('additionalParams parameter does not exist or value incorrect') actionvminfo = ignore_case_get(self.nf_additional_params, 'actionvminfo') @@ -120,8 +113,7 @@ class NFHealService(threading.Thread): vnfm_job_id = ignore_case_get(rsp, 'jobId') if not vnfm_job_id: return - ret = wait_job_finish(self.vnfm_inst_id, self.job_id, vnfm_job_id, progress_range=None, timeout=1200, - mode='1') + ret = wait_job_finish(self.vnfm_inst_id, self.job_id, vnfm_job_id, progress_range=None, timeout=1200, mode='1') if ret != JOB_MODEL_STATUS.FINISHED: logger.error('[NF heal] nf heal failed') raise NSLCMException("nf heal failed") @@ -140,8 +132,5 @@ class NFHealService(threading.Thread): return vmid return vms.first().vmname - def update_job(self, progress, desc=''): - JobUtil.add_job_status(self.job_id, progress, desc) - def update_nf_status(self, status): NfInstModel.objects.filter(nfinstid=self.vnf_instance_id).update(status=status) |