X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_cancel%2Fterm_vnf.py;h=c8c85d2b458f75152b34ec100540a1ee3898c565;hb=2583004ea6a2e329bfdcf7888a03e0f93646b881;hp=c9d1c12f1a0345c146eb69f06b64d5e0b61c2943;hpb=ea8804fa3d477d76736c9f14b931dda86b1c825e;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 c9d1c12f..c8c85d2b 100644 --- a/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py @@ -11,15 +11,17 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +import json import logging import traceback 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, VNFCInstModel +from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \ + FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel, NfvoRegInfoModel from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.nfvolcm import apply_grant_to_nfvo, notify_lcm_to_nfvo +from lcm.pub.msapi.gvnfmdriver 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 @@ -38,7 +40,7 @@ class TermVnf(Thread): 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")},{}] + self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], @@ -48,12 +50,12 @@ class TermVnf(Thread): def run(self): try: - self.term_pre() - self.grant_resource() - self.query_inst_resource() - self.query_notify_data() - self.delete_resource() - self.lcm_notify() + if self.term_pre(): + self.grant_resource() + 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) @@ -63,21 +65,26 @@ class TermVnf(Thread): def term_pre(self): vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) if not vnf_insts.exists(): - 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) + logger.warn('VnfInst(%s) does not exist' % self.nf_inst_id) + return False + # 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 terminate vnf(status:[%s])" % sel_vnf.status) if self.terminationType == 'GRACEFUL' and not self.gracefulTerminationTimeout: - raise NFLCMException("Graceful termination must set timeout") + logger.warn("Set Graceful default termination timeout = 60") + self.gracefulTerminationTimeout = 60 + # raise NFLCMException("Graceful termination must set timeout") NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status=VNF_STATUS.TERMINATING) JobUtil.add_job_status(self.job_id, 10, 'Nf terminating pre-check finish') logger.info("Nf terminating pre-check finish") + return True def grant_resource(self): logger.info("nf_cancel_task grant_resource begin") content_args = {'vnfInstanceId': self.nf_inst_id, 'vnfDescriptorId': '', - 'lifecycleOperation': 'Instantiate', 'jobId': self.job_id, + 'lifecycleOperation': 'Terminate', 'jobId': self.job_id, 'addResource': [], 'removeResource': [], 'placementConstraint': [], 'additionalParam': {}} @@ -90,15 +97,19 @@ class TermVnf(Thread): content_args['removeResource'].append(res_def) res_index += 1 + vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) + if len(vnfmInfo) == 0: + raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id) + content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid + content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl logger.info('content_args=%s' % content_args) - self.apply_result = apply_grant_to_nfvo(content_args) + self.apply_result = apply_grant_to_nfvo(json.dumps(content_args)) logger.info("nf_cancel_task grant_resource end") JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') def query_inst_resource(self): logger.info('[query_resource begin]:inst_id=%s' % self.nf_inst_id) - # query_volumn_resource - vol_list = StorageInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + vol_list = StorageInstModel.objects.filter(instid=self.nf_inst_id) for vol in vol_list: vol_info = {} if not vol.resouceid: @@ -106,11 +117,11 @@ class TermVnf(Thread): vol_info["vim_id"] = vol.vimid vol_info["tenant_id"] = vol.tenant vol_info["res_id"] = vol.resouceid + vol_info["is_predefined"] = vol.is_predefined self.inst_resource['volumn'].append(vol_info) logger.info('[query_volumn_resource]:ret_volumns=%s' % self.inst_resource['volumn']) - # query_network_resource - network_list = NetworkInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + network_list = NetworkInstModel.objects.filter(instid=self.nf_inst_id) for network in network_list: network_info = {} if not network.resouceid: @@ -118,11 +129,11 @@ class TermVnf(Thread): network_info["vim_id"] = network.vimid network_info["tenant_id"] = network.tenant network_info["res_id"] = network.resouceid + network_info["is_predefined"] = network.is_predefined self.inst_resource['network'].append(network_info) logger.info('[query_network_resource]:ret_networks=%s' % self.inst_resource['network']) - # query_subnetwork_resource - subnetwork_list = SubNetworkInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + subnetwork_list = SubNetworkInstModel.objects.filter(instid=self.nf_inst_id) for subnetwork in subnetwork_list: subnetwork_info = {} if not subnetwork.resouceid: @@ -130,11 +141,11 @@ class TermVnf(Thread): subnetwork_info["vim_id"] = subnetwork.vimid subnetwork_info["tenant_id"] = subnetwork.tenant subnetwork_info["res_id"] = subnetwork.resouceid + subnetwork_info["is_predefined"] = subnetwork.is_predefined self.inst_resource['subnet'].append(subnetwork_info) logger.info('[query_subnetwork_resource]:ret_networks=%s' % self.inst_resource['subnet']) - # query_port_resource - port_list = PortInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + port_list = PortInstModel.objects.filter(instid=self.nf_inst_id) for port in port_list: port_info = {} if not port.resouceid: @@ -142,11 +153,11 @@ class TermVnf(Thread): port_info["vim_id"] = port.vimid port_info["tenant_id"] = port.tenant port_info["res_id"] = port.resouceid + port_info["is_predefined"] = port.is_predefined self.inst_resource['port'].append(port_info) logger.info('[query_port_resource]:ret_networks=%s' % self.inst_resource['port']) - # query_flavor_resource - flavor_list = FlavourInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + flavor_list = FlavourInstModel.objects.filter(instid=self.nf_inst_id) for flavor in flavor_list: flavor_info = {} if not flavor.resouceid: @@ -154,11 +165,11 @@ class TermVnf(Thread): flavor_info["vim_id"] = flavor.vimid flavor_info["tenant_id"] = flavor.tenant flavor_info["res_id"] = flavor.resouceid + flavor_info["is_predefined"] = flavor.is_predefined self.inst_resource['flavor'].append(flavor_info) logger.info('[query_flavor_resource]:ret_networks=%s' % self.inst_resource['flavor']) - # query_vm_resource - vm_list = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) + vm_list = VmInstModel.objects.filter(instid=self.nf_inst_id) for vm in vm_list: vm_info = {} if not vm.resouceid: @@ -166,11 +177,12 @@ class TermVnf(Thread): vm_info["vim_id"] = vm.vimid vm_info["tenant_id"] = vm.tenant vm_info["res_id"] = vm.resouceid + vm_info["is_predefined"] = vm.is_predefined 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') + logger.info('[NF terminate] send notify request to nfvo start') affected_vnfc = [] vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id) for vnfc in vnfcs: @@ -215,26 +227,24 @@ class TermVnf(Thread): 'resourceName': vs.name, 'resourceType': 'volume'}}) self.notify_data = { "status": 'result', - "nfInstanceId": self.nf_inst_id, + "vnfInstanceId": 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 - } + 'affectedCp': affected_cp} + + vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) + if len(vnfmInfo) == 0: + raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id) + self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid logger.info('content_args=%s' % self.notify_data) def delete_resource(self): - logger.error('rollback resource begin') + logger.info('rollback resource begin') adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete) - logger.error('rollback resource complete') + logger.info('rollback resource complete') def do_notify_delete(self, res_type, res_id): logger.error('Deleting [%s] resource:resourceid [%s]' % (res_type, res_id)) @@ -254,7 +264,7 @@ class TermVnf(Thread): def lcm_notify(self): 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, self.nf_inst_id) + resp = notify_lcm_to_nfvo(json.dumps(self.notify_data)) logger.info('[NF termination] get lcm response %s' % resp) logger.info('[NF termination] send notify request to nfvo end')