X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=lcm%2Flcm%2Fnf%2Fbiz%2Fterminate_vnf.py;h=5b299f20242c8e426b504be3ffd671553cd632f7;hb=70bb01f730b2586821d7d231906d1e1f6f090cb8;hp=e23d5ef743cc79eb98813cf126f9f946c70711a0;hpb=906066a651385fac2eb5d57c93ef428cfef1f01e;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py index e23d5ef7..5b299f20 100644 --- a/lcm/lcm/nf/biz/terminate_vnf.py +++ b/lcm/lcm/nf/biz/terminate_vnf.py @@ -14,17 +14,23 @@ import json import logging +import traceback from threading import Thread from lcm.nf.const import VNF_STATUS, RESOURCE_MAP -from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \ - PortInstModel, VNFCInstModel, NfvoRegInfoModel, FlavourInstModel, SubNetworkInstModel +from lcm.pub.database.models import ( + NfInstModel, VmInstModel, NetworkInstModel, + StorageInstModel, PortInstModel, VNFCInstModel, + FlavourInstModel, SubNetworkInstModel +) from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo +from lcm.pub.msapi.gvnfmdriver import prepare_notification_data, notify_lcm_to_nfvo from lcm.pub.utils.jobutil import JobUtil 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 GRANT_TYPE logger = logging.getLogger(__name__) @@ -38,15 +44,26 @@ class TerminateVnf(Thread): self.terminationType = ignore_case_get(self.data, "terminationType") self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout") self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []} + self.grant_type = GRANT_TYPE.TERMINATE def run(self): + try: if self.term_pre(): - self.grant_resource() + 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) + logger.info("Grant resource end, response: %s" % apply_result) + JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') self.query_inst_resource() self.query_notify_data() self.delete_resource() self.lcm_notify() JobUtil.add_job_status(self.job_id, 100, "Terminate Vnf success.") + except NFLCMException as e: + self.vnf_term_failed_handle(e.message) + except Exception as e: + logger.error(e.message) + self.vnf_term_failed_handle(traceback.format_exc()) def term_pre(self): vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) @@ -61,46 +78,13 @@ class TerminateVnf(Thread): logger.info("Nf terminating pre-check finish") return True - def grant_resource(self): - logger.info("Grant resource begin") - content_args = { - 'vnfInstanceId': self.nf_inst_id, - 'vnfDescriptorId': '', - 'lifecycleOperation': 'Terminate', - 'jobId': self.job_id, - 'addResource': [], - 'removeResource': [], - 'placementConstraint': [], - 'additionalParam': {} - } - - vdus = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) - res_index = 1 - for vdu in vdus: - res_def = { - 'type': 'VDU', - 'resDefId': str(res_index), - 'resDesId': vdu.resouceid} - content_args['removeResource'].append(res_def) - res_index += 1 - - vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) - if len(vnfmInfo) == 0: - raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id) - content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid - content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl - logger.info('Grant request data=%s' % content_args) - self.apply_result = apply_grant_to_nfvo(json.dumps(content_args)) - logger.info("Grant resource end, response: %s" % self.apply_result) - JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') - def query_inst_resource(self): logger.info('Query resource begin') for resource_type in RESOURCE_MAP.keys(): 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) @@ -109,74 +93,18 @@ class TerminateVnf(Thread): return { "vim_id": resource.vimid, "tenant_id": resource.tenant, - "res_id": resource.resouceid, + "res_id": resource.resourceid, "is_predefined": resource.is_predefined } def query_notify_data(self): - logger.info('Send notify request to nfvo') - affected_vnfc = [] - 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 = {'vimId': vm[0].vimid, 'resourceId': vm[0].resouceid, - 'resourceName': vm[0].vmname, 'resourceType': 'vm'} - affected_vnfc.append( - {'vnfcInstanceId': vnfc.vnfcinstanceid, - 'vduId': vnfc.vduid, - 'changeType': 'removed', - 'computeResource': vm_resource}) - affected_vl = [] - networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id) - for network in networks: - network_resource = { - 'vimId': network.vimid, - 'resourceId': network.resouceid, - 'resourceName': network.name, - 'resourceType': 'network'} - affected_vl.append( - {'vlInstanceId': network.networkid, - 'vldid': network.nodeId, - 'changeType': 'removed', - 'networkResource': network_resource}) - affected_cp = [] - ports = PortInstModel.objects.filter(instid=self.nf_inst_id) - for port in ports: - affected_cp.append( - {'vsInstanceId': port.portid, - 'cpdid': port.nodeId, - 'changeType': 'removed', - 'storageResource': {'vimId': port.vimid, 'resourceId': port.resouceid, - 'resourceName': port.name, 'resourceType': 'port'}}) - affected_vs = [] - vss = StorageInstModel.objects.filter(instid=self.nf_inst_id) - for vs in vss: - affected_vs.append( - {'vsInstanceId': vs.storageid, - 'vsdId': vs.nodeId, - 'changeType': 'removed', - 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid, - 'resourceName': vs.name, 'resourceType': 'volume'}}) + self.notify_data = prepare_notification_data(self.nf_inst_id, self.job_id, "RMOVED") + NetworkInstModel.objects.filter(instid=self.nf_inst_id) + StorageInstModel.objects.filter(instid=self.nf_inst_id) + PortInstModel.objects.filter(instid=self.nf_inst_id) + VNFCInstModel.objects.filter(instid=self.nf_inst_id) FlavourInstModel.objects.filter(instid=self.nf_inst_id) SubNetworkInstModel.objects.filter(instid=self.nf_inst_id) - self.notify_data = { - "status": 'result', - "vnfInstanceId": self.nf_inst_id, - "operation": 'Terminal', - "jobId": self.job_id, - 'affectedVnfc': affected_vnfc, - 'affectedVirtualLink': affected_vl, - 'affectedVirtualStorage': affected_vs, - 'affectedCp': affected_cp} - - vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) - if len(vnfmInfo) == 0: - raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id) - self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid - logger.info('Notify request data=%s' % self.notify_data) def delete_resource(self): logger.info('Rollback resource begin') @@ -187,10 +115,15 @@ class TerminateVnf(Thread): logger.error('Deleting [%s] resource, resourceid [%s]' % (res_type, res_id)) resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)] resource_table = globals().get(resource_type + 'InstModel') - resource_table.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete() def lcm_notify(self): NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time()) logger.info('Send notify request to nfvo') resp = notify_lcm_to_nfvo(json.dumps(self.notify_data)) logger.info('Lcm notify end, response: %s' % resp) + + def vnf_term_failed_handle(self, error_msg): + logger.error('VNF termination failed, detail message: %s' % error_msg) + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='failed', lastuptime=now_time()) + JobUtil.add_job_status(self.job_id, 255, error_msg)