X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fheal_vnf.py;h=c338fe6c0c4116c5cadd7a16ecc3e3814bece59c;hb=46ad7c172411214c5432ed93fda4271288077447;hp=5e013042dc9c35e78581290ee16687b914d694f6;hpb=1be16bee6fc098097aa28eba07ff7ab624901010;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/biz/heal_vnf.py b/lcm/lcm/nf/biz/heal_vnf.py index 5e013042..c338fe6c 100644 --- a/lcm/lcm/nf/biz/heal_vnf.py +++ b/lcm/lcm/nf/biz/heal_vnf.py @@ -15,20 +15,27 @@ import json import logging import traceback +import uuid from threading import Thread -from lcm.pub.database.models import NfInstModel, VmInstModel, VNFCInstModel +from lcm.pub.database.models import NfInstModel +from lcm.pub.database.models import VmInstModel +from lcm.pub.database.models import VNFCInstModel from lcm.pub.exceptions import NFLCMException +from lcm.pub.exceptions import NFLCMExceptionConflict from lcm.pub.utils.jobutil import JobUtil +from lcm.pub.utils.notificationsutil import NotificationsUtil from lcm.pub.utils.timeutil import now_time from lcm.pub.utils.values import ignore_case_get from lcm.pub.vimapi import adaptor from lcm.nf.biz.grant_vnf import grant_resource -from lcm.nf.const import VNF_STATUS, GRANT_TYPE, OPERATION_STATE_TYPE, LCM_NOTIFICATION_STATUS +from lcm.nf.const import VNF_STATUS, GRANT_TYPE +from lcm.nf.const import OPERATION_STATE_TYPE, LCM_NOTIFICATION_STATUS from lcm.nf.const import CHANGE_TYPE, OPERATION_TYPE, HEAL_ACTION_TYPE +from lcm.nf.const import OPERATION_TASK +from lcm.nf.const import SUB_OPERATION_TASK from lcm.nf.biz import common -import uuid -from lcm.pub.utils.notificationsutil import NotificationsUtil +from .operate_vnf_lcm_op_occ import VnfLcmOpOcc logger = logging.getLogger(__name__) @@ -40,33 +47,75 @@ class HealVnf(Thread): self.data = data self.nf_inst_id = nf_inst_id self.job_id = job_id - self.affectedvm = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "affectedvm") + self.affectedvm = ignore_case_get( + ignore_case_get( + self.data, + "additionalParams" + ), + "affectedvm" + ) # TODO: Check if we could move the action param into the list of affectedvm structure - self.action = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "action") + self.action = ignore_case_get( + ignore_case_get( + self.data, + "additionalParams" + ), + "action" + ) self.grant_type = "" if self.action == HEAL_ACTION_TYPE.START: self.grant_type = GRANT_TYPE.HEAL_CREATE elif self.action == HEAL_ACTION_TYPE.RESTART: self.grant_type = GRANT_TYPE.HEAL_RESTART + self.lcm_op_occ = VnfLcmOpOcc( + vnf_inst_id=nf_inst_id, + lcm_op_id=job_id, + operation=OPERATION_TYPE.HEAL, + task=OPERATION_TASK.HEAL + ) + self.pre_deal() def run(self): try: self.heal_pre() - self.lcm_notify(LCM_NOTIFICATION_STATUS.START, OPERATION_STATE_TYPE.STARTING) + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.STARTING) self.apply_grant() - self.lcm_notify(LCM_NOTIFICATION_STATUS.RESULT, OPERATION_STATE_TYPE.PROCESSING) + self.lcm_op_occ.upd( + sub_operation=SUB_OPERATION_TASK.GRANTED, + operation_state=OPERATION_STATE_TYPE.PROCESSING + ) + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.PROCESSING) self.heal_resource() JobUtil.add_job_status(self.job_id, 100, "Heal Vnf success.") - NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='INSTANTIATED', lastuptime=now_time()) - self.lcm_notify(LCM_NOTIFICATION_STATUS.RESULT, OPERATION_STATE_TYPE.COMPLETED) + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update( + status='INSTANTIATED', + lastuptime=now_time() + ) + self.lcm_notify( + LCM_NOTIFICATION_STATUS.RESULT, + OPERATION_STATE_TYPE.COMPLETED + ) + self.lcm_op_occ.upd( + sub_operation=SUB_OPERATION_TASK.SUCCESS, + operation_state=OPERATION_STATE_TYPE.COMPLETED + ) except NFLCMException as e: - logger.error(e.message) - self.lcm_notify(LCM_NOTIFICATION_STATUS.RESULT, OPERATION_STATE_TYPE.FAILED, str(e)) - self.vnf_heal_failed_handle(e.message) + logger.error(e.args[0]) + self.vnf_heal_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) - self.lcm_notify(LCM_NOTIFICATION_STATUS.RESULT, OPERATION_STATE_TYPE.FAILED, str(e)) - self.vnf_heal_failed_handle(traceback.format_exc()) + logger.error(e.args[0]) + logger.error(traceback.format_exc()) + self.vnf_heal_failed_handle(e.args[0]) + + def pre_deal(self): + logger.debug("Start pre deal for VNF heal_vnf task") + + vnf_is_in_processing, vnf_op = self.lcm_op_occ.is_in_processing() + if vnf_is_in_processing: + raise NFLCMExceptionConflict('VNF(%s) %s in processing.' % ( + self.nf_inst_id, vnf_op + )) + self.lcm_op_occ.add() def heal_pre(self): if self.action not in (HEAL_ACTION_TYPE.START, HEAL_ACTION_TYPE.RESTART): @@ -117,8 +166,20 @@ class HealVnf(Thread): def vnf_heal_failed_handle(self, error_msg): logger.error('VNF Healing failed, detail message: %s' % error_msg) - NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status=VNF_STATUS.FAILED, lastuptime=now_time()) + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update( + status=VNF_STATUS.FAILED, + lastuptime=now_time() + ) + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, error_msg) JobUtil.add_job_status(self.job_id, 255, error_msg) + self.lcm_op_occ.upd( + sub_operation=SUB_OPERATION_TASK.ERROR, + operation_state=OPERATION_STATE_TYPE.FAILED, + error={ + "status": 500, + "detail": error_msg + } + ) def lcm_notify(self, status, opState, err=None): notification_content = self.prepareNotificationData(status, opState, err)