X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Foperate_vnf.py;h=c0c8540b1a6f58f47241a1a0b4757f289f786169;hb=c71175866d16bedda627b47acde2d46f33559127;hp=5f6499d60456c109776c964d7ae627ff116f8767;hpb=0b8b410f563039cfc8879631bcb2587974de7875;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/biz/operate_vnf.py b/lcm/lcm/nf/biz/operate_vnf.py index 5f6499d6..c0c8540b 100644 --- a/lcm/lcm/nf/biz/operate_vnf.py +++ b/lcm/lcm/nf/biz/operate_vnf.py @@ -12,20 +12,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json +# import json import logging import traceback +import uuid from threading import Thread -from lcm.pub.database.models import NfInstModel, VmInstModel +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.msapi.gvnfmdriver import notify_lcm_to_nfvo, prepare_notification_data from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time +from lcm.pub.utils.notificationsutil import NotificationsUtil 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, RESOURCE_MAP, GRANT_TYPE +from lcm.nf.const import RESOURCE_MAP +from lcm.nf.const import GRANT_TYPE +from lcm.nf.const import OPERATION_STATE_TYPE +from lcm.nf.const import LCM_NOTIFICATION_STATUS +from lcm.nf.const import CHANGE_TYPE +from lcm.nf.const import OPERATION_TYPE +from lcm.nf.const import OPERATION_TASK +from .operate_vnf_lcm_op_occ import VnfLcmOpOcc logger = logging.getLogger(__name__) @@ -41,25 +51,43 @@ class OperateVnf(Thread): self.stopType = ignore_case_get(self.data, "stopType") self.gracefulStopTimeout = ignore_case_get(self.data, "gracefulStopTimeout") self.inst_resource = {'vm': []} + self.lcm_op_occ = VnfLcmOpOcc( + vnf_inst_id=nf_inst_id, + lcm_op_id=job_id, + operation=OPERATION_TYPE.OPERATE, + task=OPERATION_TASK.OPERATE + ) def run(self): try: + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.STARTING) self.apply_grant() self.query_inst_resource() + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.PROCESSING) self.operate_resource() JobUtil.add_job_status(self.job_id, 100, "Operate Vnf success.") - NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='INSTANTIATED', lastuptime=now_time(), operationState=self.changeStateTo) - self.lcm_notify() + 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 + ) except NFLCMException as e: self.vnf_operate_failed_handle(e.message) except Exception as e: logger.error(e.message) - self.vnf_operate_failed_handle(traceback.format_exc()) + logger.error(traceback.format_exc()) + self.vnf_operate_failed_handle(e.message) def apply_grant(self): - vdus = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) - apply_result = grant_resource(data=self.data, nf_inst_id=self.nf_inst_id, job_id=self.job_id, - grant_type=self.grant_type, vdus=vdus) + vdus = VmInstModel.objects.filter(instid=self.nf_inst_id) + apply_result = grant_resource(data=self.data, + nf_inst_id=self.nf_inst_id, + job_id=self.job_id, + grant_type=self.grant_type, + vdus=vdus) logger.info("Grant resource, response: %s" % apply_result) JobUtil.add_job_status(self.job_id, 20, 'Nf Operate grant_resource finish') @@ -70,7 +98,7 @@ class OperateVnf(Thread): resource_table = globals().get(resource_type + 'InstModel') resource_insts = resource_table.objects.filter(instid=self.nf_inst_id) for resource_inst in resource_insts: - if not resource_inst.resouceid: + if not resource_inst.resourceid: continue self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst)) logger.info('Query resource end, resource=%s' % self.inst_resource) @@ -79,25 +107,78 @@ class OperateVnf(Thread): return { "vim_id": resource.vimid, "tenant_id": resource.tenant, - "id": resource.resouceid + "id": resource.resourceid } def operate_resource(self): logger.info('Operate resource begin') - adaptor.operate_vim_res(self.inst_resource, self.changeStateTo, self.stopType, self.gracefulStopTimeout, self.do_notify_op) + adaptor.operate_vim_res(self.inst_resource, + self.changeStateTo, + self.stopType, + self.gracefulStopTimeout, + self.do_notify_op) logger.info('Operate resource complete') - def lcm_notify(self): - notification_content = prepare_notification_data(self.nf_inst_id, self.job_id, "MODIFIED") - logger.info('Notify request data = %s' % notification_content) - resp = notify_lcm_to_nfvo(json.dumps(notification_content)) - logger.info('Lcm notify end, response %s' % resp) + def lcm_notify(self, status, opState, err=None): + notification_content = self.prepareNotificationData(status, opState, err) + logger.info('Notify data = %s' % notification_content) + NotificationsUtil().send_notification(notification_content) + logger.info('Notify end') def vnf_operate_failed_handle(self, error_msg): logger.error('VNF Operation 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) def do_notify_op(self, status, resid): logger.error('VNF resource %s updated to: %s' % (resid, status)) - VmInstModel.objects.filter(instid=self.nf_inst_id, resouceid=resid).update(operationalstate=status) + + def prepareNotificationData(self, status, opState, err=None): + affected_vnfcs = [] + if status == LCM_NOTIFICATION_STATUS.RESULT and opState == OPERATION_STATE_TYPE.COMPLETED: + vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id) + for vnfc in vnfcs: + vm_resource = {} + if vnfc.vmid: + vm = VmInstModel.objects.filter(vmid=vnfc.vmid) + if vm: + vm_resource = { + 'vimConnectionId': vm[0].vimid, + 'resourceId': vm[0].resourceid, + 'vimLevelResourceType': 'vm' + } + affected_vnfcs.append({ + 'id': vnfc.vnfcinstanceid, + 'vduId': vnfc.vduid, + 'changeType': CHANGE_TYPE.MODIFIED, + 'computeResource': vm_resource + }) + notification_content = { + "id": str(uuid.uuid4()), + "notificationType": "VnfLcmOperationOccurrenceNotification", + "subscriptionId": "", + "timeStamp": now_time(), + "notificationStatus": status, + "operationState": opState, + "vnfInstanceId": self.nf_inst_id, + "operation": OPERATION_TYPE.OPERATE, + "isAutomaticInvocation": "false", + "vnfLcmOpOccId": self.job_id, + "affectedVnfcs": affected_vnfcs, + "affectedVirtualLinks": [], + "affectedVirtualStorages": [], + "changedInfo": {}, + "changedExtConnectivity": [], + "_links": {"vnfInstance": {"href": ""}, + "subscription": {"href": ""}, + "vnfLcmOpOcc": {"href": ""}} + } + if opState in (OPERATION_STATE_TYPE.FAILED, OPERATION_STATE_TYPE.FAILED_TEMP): + notification_content["error"] = {"status": 500, "detail": err} + notification_content["_links"]["vnfInstance"]["href"] = "/vnf_instances/%s" % self.nf_inst_id + notification_content["_links"]["vnfLcmOpOcc"]["href"] = "/vnf_lc_ops/%s" % self.job_id + return notification_content