X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_cancel%2Fterm_vnf.py;h=85df23cd2f85cbb20cd4da060d8996c0358aeab1;hb=cc8e51bd402ec135d7bfab7dcafedbdb47a95da1;hp=dcf5c4ba8612a96eb9af6ba4bd41628b243d1b0b;hpb=4b5e00e27f536a5db0f8cae2e45bee3ba180cec0;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py b/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py index dcf5c4ba..85df23cd 100644 --- a/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py @@ -17,12 +17,13 @@ from threading import Thread from lcm.nf.vnfs.const import VNF_STATUS from lcm.pub.database.models import JobStatusModel, NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \ - FlavourInstModel, PortInstModel, SubNetworkInstModel + FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.nfvolcm import apply_grant_to_nfvo +from lcm.pub.msapi.nfvolcm import apply_grant_to_nfvo, 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 logger = logging.getLogger(__name__) @@ -35,6 +36,8 @@ class TermVnf(Thread): self.job_id = job_id self.terminationType = ignore_case_get(self.data, "terminationType") self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout") + self.apply_result = None + self.notify_data = None self.inst_resource = {'volumn': [], # [{"vim_id": ignore_case_get(ret, "vim_id")},{}] 'network': [], 'subnet': [], @@ -48,13 +51,13 @@ class TermVnf(Thread): self.term_pre() self.grant_resource() self.query_inst_resource() - # self.delete_resource() - # self.lcm_notify() + 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: - logger.error(traceback.format_exc()) self.vnf_term_failed_handle(traceback.format_exc()) def term_pre(self): @@ -63,7 +66,7 @@ class TermVnf(Thread): raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id) sel_vnf = vnf_insts[0] if sel_vnf.status != 'VNF_INSTANTIATED': - raise NFLCMException("Don't allow to delete vnf(status:[%s])" % sel_vnf.status) + raise NFLCMException("Don't allow to terminate vnf(status:[%s])" % sel_vnf.status) if self.terminationType == 'GRACEFUL' and not self.gracefulTerminationTimeout: raise NFLCMException("Graceful termination must set timeout") @@ -89,7 +92,6 @@ class TermVnf(Thread): logger.info('content_args=%s' % content_args) self.apply_result = apply_grant_to_nfvo(content_args) - vim_info = ignore_case_get(self.apply_result, "vim") logger.info("nf_cancel_task grant_resource end") JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') @@ -167,24 +169,96 @@ class TermVnf(Thread): self.inst_resource['vm'].append(vm_info) logger.info('[query_vm_resource]:ret_vms=%s' % self.inst_resource['vm']) + def query_notify_data(self): + logger.info('[NF instantiation] send notify request to nfvo start') + 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 = { + "status": 'result', + "nfInstanceId": self.nf_inst_id, + "operation": 'Terminal', + "jobId": self.job_id, + 'affectedVnfc': affected_vnfc, + 'affectedVirtualLink': affected_vl, + 'affectedVirtualStorage': affected_vs, + # "vnfdmodule": allocate_data, + # "additionalParam": addition_param, + # "nfvoInstanceId": self.nfvo_inst_id, + # "vnfmInstanceId": self.vnfm_inst_id, + # 'affectedcapacity': affectedcapacity, + # 'affectedService': [], + 'affectedCp': affected_cp + } + logger.info('content_args=%s' % self.notify_data) + def delete_resource(self): - pass + logger.error('rollback resource begin') + adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete) + logger.error('rollback resource complete') + + def do_notify_delete(self, res_type, res_id): + logger.error('Deleting [%s] resource:resourceid [%s]' % (res_type, res_id)) + if res_type == adaptor.RES_VM: + VmInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + elif res_type == adaptor.RES_FLAVOR: + FlavourInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + elif res_type == adaptor.RES_PORT: + PortInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + elif res_type == adaptor.RES_SUBNET: + SubNetworkInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + elif res_type == adaptor.RES_NETWORK: + NetworkInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() + elif res_type == adaptor.RES_VOLUME: + StorageInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete() def lcm_notify(self): - pass - - # def load_nfvo_config(self): - # logger.info("[NF instantiation]get nfvo connection info start") - # reg_info = NfvoRegInfoModel.objects.filter(vnfminstid='vnfm111').first() - # if reg_info: - # self.vnfm_inst_id = reg_info.vnfminstid - # self.nfvo_inst_id = reg_info.nfvoid - # logger.info("[NF instantiation] Registered nfvo id is [%s]" % self.nfvo_inst_id) - # else: - # raise NFLCMException("Nfvo was not registered") - # logger.info("[NF instantiation]get nfvo connection info end") + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time()) + logger.info('[NF termination] send notify request to nfvo end') + resp = notify_lcm_to_nfvo(self.notify_data) + logger.info('[NF termination] get lcm response %s' % resp) + logger.info('[NF termination] send notify request to nfvo end') 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) \ No newline at end of file + JobUtil.add_job_status(self.job_id, 255, error_msg)