X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Finst_vnf.py;h=d429c6de1acfd5b5cec80d253fb5ddedc5a1b16f;hb=0614226c5097a7ce3c91521db551592304566155;hp=759859cb2ec64632d1436b0a7238e96c236e9809;hpb=0e1b730ec0e0ac058e07ccf995c65204fa8a748a;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 759859cb..d429c6de 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -16,10 +16,13 @@ import logging import traceback from threading import Thread -from lcm.pub.database.models import NfInstModel, JobStatusModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, \ +from lcm.nf.vnfs.const import vnfd_model_dict +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 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,6 +39,7 @@ 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': [], # [{"vim_id": ignore_case_get(ret, "vim_id")},{}] 'network': [], @@ -103,65 +107,71 @@ class InstVnf(Thread): 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': + 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 - 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') - self.load_nfvo_config() + JobUtil.add_job_status(self.job_id, 5, 'Get packageinfo by vnfd_id') + # 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") + JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id') + # get rawdata from catalog by csar_id + input_parameters = [] + for key, val in self.data['additionalParams'].items(): + input_parameters.append({"key": key, "value": val}) + raw_data = query_rawdata_from_catalog(self.csar_id, input_parameters) + self.vnfd_info = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json + self.vnfd_info = json.JSONDecoder().decode(self.vnfd_info) + + self.vnfd_info = vnfd_model_dict + + self.checkParameterExist() # 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, + input_params=self.data, + vnfd_model=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') + JobUtil.add_job_status(self.job_id, 15, '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() - 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': {}} + content_args = {'vnfInstanceId': self.nf_inst_id, 'vnfDescriptorId': '', + 'lifecycleOperation': 'Instantiate', 'jobId': self.job_id, + 'addResource': [], 'removeResource': [], + 'placementConstraint': [], 'additionalParam': {}} vdus = ignore_case_get(self.vnfd_info, "vdus") res_index = 1 for vdu in vdus: 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'] + 'resDefId': str(res_index), + 'resDesId': ignore_case_get(vdu, "vdu_id")} content_args['addResource'].append(res_def) res_index += 1 + logger.info('content_args=%s' % content_args) - resp = apply_grant_to_nfvo(content_args) - logger.info("[NF instantiation] get grant response = %s" % resp) - if resp[0] != 0: - raise NFLCMException('Nf instancing apply grant exception') + self.apply_result = apply_grant_to_nfvo(content_args) + vim_info = ignore_case_get(self.apply_result, "vim") + + for vdu in self.vnfd_info["vdus"]: + if "location_info" in vdu["properties"]: + vdu["properties"]["location_info"]["vimid"] = ignore_case_get(vim_info, "vimid") + vdu["properties"]["location_info"]["tenant"] = ignore_case_get( + ignore_case_get(vim_info, "accessinfo"), "tenant") + else: + vdu["properties"]["location_info"] = {"vimid":ignore_case_get(vim_info, "vimid"), + "tenant":ignore_case_get( + ignore_case_get(vim_info, "accessinfo"), "tenant")} - # 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') + # update resources_table + NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='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): @@ -465,3 +475,8 @@ class InstVnf(Thread): def do_notify_delete(self, ret): logger.error('Deleting [%s] resource' % ret) + + def checkParameterExist(self): + # if ignore_case_get(self.data, "flavourId") not in self.vnfd_info: + # raise NFLCMException('Input parameter is not defined in vnfd_info.') + pass