X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Finst_vnf.py;h=0c0edbe11c69d561d5f4abf9a0849792f0d06020;hb=34806616c3a2ad5a7d627dfdd44e7db0cabff863;hp=a23ced9a4461671d97c43d555e2ec54b396ab120;hpb=4172b7cc2de363393808514b979c46cae3d0c642;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py index a23ced9a..0c0edbe1 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -16,10 +16,12 @@ import logging import traceback from threading import Thread -from lcm.pub.database.models import NfInstModel, JobStatusModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \ - PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, VLInstModel, CPInstModel +from lcm.pub.database.models import NfInstModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, \ + SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, VLInstModel, CPInstModel from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.nfvolcm import vnfd_rawdata_get, apply_grant_to_nfvo, notify_lcm_to_nfvo +from lcm.pub.msapi.catalog import query_rawdata_from_catalog +from lcm.pub.msapi.nfvolcm import vnfd_rawdata_get, apply_grant_to_nfvo, notify_lcm_to_nfvo, get_packageinfo_by_vnfdid +from lcm.pub.utils import toscautil from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time from lcm.pub.utils.values import ignore_case_get @@ -36,13 +38,14 @@ class InstVnf(Thread): self.job_id = job_id self.nfvo_inst_id = '' self.vnfm_inst_id = '' + self.csar_id = '' self.vnfd_info = [] - self.inst_resource = {'volumn':[],#'volumn':[{"vim_id": "1"}, {"res_id": "2"}] - 'network':[], - 'subnet':[], - 'port':[], - 'flavor':[], - 'vm':[], + self.inst_resource = {'volumn': [], # [{"vim_id": ignore_case_get(ret, "vim_id")},{}] + 'network': [], + 'subnet': [], + 'port': [], + 'flavor': [], + 'vm': [], } # self.create_res_result = { # 'jobid': 'res_001', @@ -85,12 +88,10 @@ class InstVnf(Thread): self.inst_pre() self.apply_grant() self.create_res() - # self.check_res_status() - # self.wait_inst_finish(args) - # self.lcm_notify() + self.lcm_notify() JobUtil.add_job_status(self.job_id, 100, "Instantiate Vnf success.") - is_exist = JobStatusModel.objects.filter(jobid=self.job_id).exists() - logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist) + # is_exist = JobStatusModel.objects.filter(jobid=self.job_id).exists() + # logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist) except NFLCMException as e: self.vnf_inst_failed_handle(e.message) # self.rollback(e.message) @@ -104,47 +105,57 @@ class InstVnf(Thread): if not vnf_insts.exists(): raise NFLCMException('VNF nf_inst_id is not exist.') - self.vnfm_inst_id = vnf_insts[0].vnfm_inst_id - if vnf_insts[0].instantiationState != 'NOT_INSTANTIATED': + # self.vnfm_inst_id = vnf_insts[0].vnfm_inst_id + if vnf_insts[0].status != 'NOT_INSTANTIATED': raise NFLCMException('VNF instantiationState is not NOT_INSTANTIATED.') - #get rawdata by vnfd_id - ret = vnfd_rawdata_get(vnf_insts[0].vnfdid) - if ret[0] != 0: - raise NFLCMException("Get vnfd_raw_data failed.") - self.vnfd_info = json.JSONDecoder().decode(ret[1]) - #checkParameterExist + # get csar_id from nslcm by vnfd_id + self.package_info = get_packageinfo_by_vnfdid(vnf_insts[0].vnfdid) + self.package_id = ignore_case_get(self.package_info, "package_id") + self.csar_id = ignore_case_get(self.package_info, "csar_id") + + #get rawdata from catalog by csar_id + raw_data = query_rawdata_from_catalog(self.csar_id, self.data) + self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json + self.vnfd = json.JSONDecoder().decode(self.vnfd) + self.vnfd_info = self.vnfd + + # checkParameterExist for cp in self.data: if cp not in self.vnfd_info: raise NFLCMException('Input parameter is not defined in vnfd_info.') - #get nfvo info - JobUtil.add_job_status(self.job_id, 5, 'GET_NFVO_CONNECTION_INFO') + # get nfvo info + JobUtil.add_job_status(self.job_id, 5, 'Get nfvo connection info') self.load_nfvo_config() - #update NfInstModel - NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(flavour_id=ignore_case_get(self.data, "flavourId"), - vnf_level=ignore_case_get(self.data, 'instantiationLevelId'), - input_params=ignore_case_get(self.data, 'additionalParams'), - extension=ignore_case_get(self.data, ''), - initallocatedata=self.vnfd_info, - localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'), - lastuptime=now_time()) + # update NfInstModel + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).\ + update(flavour_id=ignore_case_get(self.data, "flavourId"), + vnf_level=ignore_case_get(self.data, 'instantiationLevelId'), + input_params=ignore_case_get(self.data, 'additionalParams'), + extension=ignore_case_get(self.data, ''), + initallocatedata=self.vnfd_info, + localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'), + lastuptime=now_time()) JobUtil.add_job_status(self.job_id, 10, 'Nf instancing pre-check finish') logger.info("Nf instancing pre-check finish") def apply_grant(self): logger.info('[NF instantiation] send resource grand request to nfvo start') - #self.check_vm_capacity() + # self.check_vm_capacity() content_args = {'nfvoInstanceId': self.nfvo_inst_id, 'vnfmInstanceId': self.vnfm_inst_id, 'nfInstanceId': self.nf_inst_id, 'nfDescriptorId': '', 'lifecycleOperation': 'Instantiate', 'jobId': self.job_id, 'addResource': [], 'removeResource': [], 'placementConstraint': [], 'exVimIdList': [], 'additionalParam': {}} - vdus = self.vnfd_info['vdus'] + vdus = ignore_case_get(self.vnfd_info, "vdus") res_index = 1 for vdu in vdus: - res_def = {'type': 'VDU', 'resourceDefinitionId': str(res_index), 'vduId': vdu['vdu_id'], - 'vimid': '', 'tenant': ''} + res_def = {'type': 'VDU', + 'resourceDefinitionId': str(res_index), + 'vduId': ignore_case_get(vdu, "vdu_id"), + 'vimid': '', + 'tenant': ''} if self.vnfd_info['metadata']['cross_dc']: res_def['vimid'] = vdu['properties']['location_info']['vimId'] res_def['tenant'] = vdu['properties']['location_info']['tenant'] @@ -156,14 +167,15 @@ class InstVnf(Thread): if resp[0] != 0: raise NFLCMException('Nf instancing apply grant exception') - #update_resources_table() - NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(instantiationState='INSTANTIATED', lastuptime=now_time()) + # update_resources_table() + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(instantiationState='INSTANTIATED', + lastuptime=now_time()) JobUtil.add_job_status(self.job_id, 20, 'Nf instancing apply grant finish') logger.info("Nf instancing apply grant finish") def create_res(self): logger.info("[NF instantiation] create resource start") - adaptor.create_vim_res(self.vnfd_info, self.do_notify, self.do_rollback) + adaptor.create_vim_res('', self.do_notify, self.do_rollback) JobUtil.add_job_status(self.job_id, 70, '[NF instantiation] create resource finish') logger.info("[NF instantiation] create resource finish") @@ -223,23 +235,15 @@ class InstVnf(Thread): # # self.add_job(43, 'INST_DPLY_VM_PRGS') # logger.info("[NF instantiation] confirm all vms are active end") - # def wait_inst_finish(self, args): - # try: - # logger.info('wait_inst_finish, args=%s' % args) - # # WaitInstFinishTask(args).do_biz() - # return {'result': '100', 'msg': 'Nf instancing wait finish', 'context': {}} - # except Exception as e: - # logger.error('Nf instancing wait exception=%s' % e.message) - # logger.error(traceback.format_exc()) - # return {'result': '255', 'msg': 'Nf instancing wait exception', 'context': {}} - def lcm_notify(self): logger.info('[NF instantiation] send notify request to nfvo start') reg_info = NfvoRegInfoModel.objects.filter(vnfminstid=self.vnfm_inst_id).first() - nfs = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) - nf = nfs[0] - allocate_data = json.loads(nf.initallocatedata) - vmlist = json.loads(nf.predefinedvm) + # vm_info = VmInstModel.objects.filter(nfinstid=self.nf_inst_id) + vmlist = [] + # nfs = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) + # nf = nfs[0] + # allocate_data = json.loads(nf.initallocatedata) + # vmlist = json.loads(nf.predefinedvm) addition_param = {'vmList': vmlist} affected_vnfc = [] vnfcs = VNFCInstModel.objects.filter(nfinstid=self.nf_inst_id) @@ -278,7 +282,7 @@ class InstVnf(Thread): 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid, 'resourceName': vs.name, 'tenant': vs.tenant}}) affected_cp = [] - #vnfc cps + # vnfc cps for vnfc in vnfcs: cps = CPInstModel.objects.filter(ownerid=vnfc.vnfcinstanceid, ownertype=3) for cp in cps: @@ -292,7 +296,7 @@ class InstVnf(Thread): {'cPInstanceId': cp.cpinstanceid, 'cpdId': cp.cpdid, 'ownerid': cp.ownerid, 'ownertype': cp.ownertype, 'changeType': 'added', 'portResource': port_resource, 'virtualLinkInstanceId': cp.vlinstanceid}) - #nf cps + # nf cps cps = CPInstModel.objects.filter(ownerid=self.nf_inst_id, ownertype=0) logger.info('vnf_inst_id=%s, cps size=%s' % (self.nf_inst_id, cps.count())) for cp in cps: @@ -306,16 +310,16 @@ class InstVnf(Thread): {'cPInstanceId': cp.cpinstanceid, 'cpdId': cp.cpdid, 'ownerid': cp.ownerid, 'ownertype': cp.ownertype, 'changeType': 'added', 'portResource': port_resource, 'virtualLinkInstanceId': cp.vlinstanceid}) - affectedcapacity = {} - reserved_total = allocate_data.get('reserved_total', {}) - affectedcapacity['vm'] = str(reserved_total.get('vmnum', 0)) - affectedcapacity['vcpu'] = str(reserved_total.get('vcpunum', 0)) - affectedcapacity['vMemory'] = str(reserved_total.get('memorysize', 0)) - affectedcapacity['port'] = str(reserved_total.get('portnum', 0)) - affectedcapacity['localStorage'] = str(reserved_total.get('hdsize', 0)) - affectedcapacity['sharedStorage'] = str(reserved_total.get('shdsize', 0)) + # affectedcapacity = {} + # reserved_total = allocate_data.get('reserved_total', {}) + # affectedcapacity['vm'] = str(reserved_total.get('vmnum', 0)) + # affectedcapacity['vcpu'] = str(reserved_total.get('vcpunum', 0)) + # affectedcapacity['vMemory'] = str(reserved_total.get('memorysize', 0)) + # affectedcapacity['port'] = str(reserved_total.get('portnum', 0)) + # affectedcapacity['localStorage'] = str(reserved_total.get('hdsize', 0)) + # affectedcapacity['sharedStorage'] = str(reserved_total.get('shdsize', 0)) content_args = { - "vnfdmodule": allocate_data, + # "vnfdmodule": allocate_data, "additionalParam": addition_param, "nfvoInstanceId": reg_info.nfvoid, "vnfmInstanceId": self.vnfm_inst_id, @@ -323,14 +327,14 @@ class InstVnf(Thread): "nfInstanceId": self.nf_inst_id, "operation": 'instantiate', "jobId": '', - 'affectedcapacity': affectedcapacity, + # 'affectedcapacity': affectedcapacity, 'affectedService': [], 'affectedVnfc': affected_vnfc, 'affectedVirtualLink': affected_vl, 'affectedVirtualStorage': affected_vs, 'affectedCp': affected_cp} logger.info('content_args=%s' % content_args) - #call rest api + # call rest api resp = notify_lcm_to_nfvo(content_args, self.nf_inst_id) logger.info('[NF instantiation] get lcm response %s' % resp) if resp[0] != 0: @@ -338,23 +342,13 @@ class InstVnf(Thread): raise NFLCMException("send notify request to nfvo failed") logger.info('[NF instantiation] send notify request to nfvo end') - # def rollback(self, args): - # try: - # logger.info('inst_exception, args=%s' % args) - # # InstExceptionTask(args).do_biz() - # return {'result': '100', 'msg': 'Nf instancing exception process finish', 'context': {}} - # except Exception as e: - # logger.error('Nf instancing exception process exception=%s' % e.message) - # logger.error(traceback.format_exc()) - # return {'result': '255', 'msg': 'Nf instancing exception process exception', 'context': {}} - 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) + 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") @@ -365,12 +359,13 @@ class InstVnf(Thread): JobUtil.add_job_status(self.job_id, 255, error_msg) def do_notify(self, res_type, progress, ret): - logger.info('creating [%s] resource'%res_type) - progress = 20 + int(progress/2) #20-70 - if res_type == adaptor.RES_VOLUME: + logger.info('creating [%s] resource' % res_type) + progress = 20 + int(progress/2) # 20-70 + if res_type == adaptor.OPT_CREATE_VOLUME: logger.info('Create vloumns!') - if ret["returnCode"] == adaptor.RES_NEW:#new create - self.inst_resource['volumn'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + if ret["returnCode"] == adaptor.RES_NEW: # new create + self.inst_resource['volumn'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) JobUtil.add_job_status(self.job_id, progress, 'Create vloumns!') StorageInstModel.objects.create( storageid='1', @@ -379,11 +374,13 @@ class InstVnf(Thread): name='40G', tenant='admin', insttype=0, + is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.RES_NETWORK: + elif res_type == adaptor.OPT_CREATE_NETWORK: logger.info('Create networks!') if ret["returnCode"] == adaptor.RES_NEW: - self.inst_resource['network'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + self.inst_resource['network'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) # self.inst_resource['network'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, progress, 'Create networks!') NetworkInstModel.objects.create( @@ -393,11 +390,13 @@ class InstVnf(Thread): name='pnet_network', tenant='admin', insttype=0, + is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.RES_SUBNET: + elif res_type == adaptor.OPT_CREATE_SUBNET: logger.info('Create subnets!') if ret["returnCode"] == adaptor.RES_NEW: - self.inst_resource['subnet'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + self.inst_resource['subnet'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) # self.inst_resource['subnet'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, progress, 'Create subnets!') SubNetworkInstModel.objects.create( @@ -408,11 +407,13 @@ class InstVnf(Thread): name='sub_pnet', tenant='admin', insttype=0, + is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.RES_PORT: + elif res_type == adaptor.OPT_CREATE_PORT: logger.info('Create ports!') if ret["returnCode"] == adaptor.RES_NEW: - self.inst_resource['port'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + self.inst_resource['port'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) # self.inst_resource['port'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, progress, 'Create ports!') PortInstModel.objects.create( @@ -424,11 +425,13 @@ class InstVnf(Thread): name='aaa_pnet_cp', tenant='admin', insttype=0, + is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.RES_FLAVOR: + elif res_type == adaptor.OPT_CREATE_FLAVOR: logger.info('Create flavors!') if ret["returnCode"] == adaptor.RES_NEW: - self.inst_resource['flavor'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + self.inst_resource['flavor'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) # self.inst_resource['flavor'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, progress, 'Create flavors!') FlavourInstModel.objects.create( @@ -436,11 +439,13 @@ class InstVnf(Thread): name='1', vcpu='1', extraspecs='1', + is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.RES_VM: + elif res_type == adaptor.OPT_CREATE_VM: logger.info('Create vms!') if ret["returnCode"] == adaptor.RES_NEW: - self.inst_resource['vm'].append({"vim_id": ignore_case_get(ret, "vim_id")}, {"res_id": ignore_case_get(ret, "res_id")}) + self.inst_resource['vm'].append({"vim_id": ignore_case_get(ret, "vim_id"), + "res_id": ignore_case_get(ret, "res_id")}) # self.inst_resource['vm'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, progress, 'Create vms!') VmInstModel.objects.create( @@ -450,10 +455,11 @@ class InstVnf(Thread): insttype=0, instid=self.nf_inst_id, vmname="test_01", + is_predefined=ret["returnCode"], operationalstate=1) def do_rollback(self, args_=None): - logger.error('error info : %s'%(args_)) + logger.error('error info : %s' % args_) adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete) logger.error('rollback resource complete') @@ -466,7 +472,8 @@ class InstVnf(Thread): logger.error('delete table complete') raise NFLCMException("Create resource failed") - def do_notify_delete(ret): - logger.error('Deleting [%s] resource'%ret) - + def do_notify_delete(self, ret): + logger.error('Deleting [%s] resource' % ret) + def checkParameterExist(self, input_para, vnfd_info): + pass