X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Finst_vnf.py;h=1d5825e91db8406cce262ae124753e0005dc63b5;hb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;hp=ef895380204dd47809be20c5bf8af2dfb6ed1174;hpb=665ab553e8c09fa35c46a9fe3e5e773af5df7f43;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 ef895380..1d5825e9 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -14,17 +14,19 @@ import json import logging import traceback +import uuid from threading import Thread +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.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.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 +from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean from lcm.pub.vimapi import adaptor logger = logging.getLogger(__name__) @@ -97,6 +99,7 @@ class InstVnf(Thread): # self.rollback(e.message) except: self.vnf_inst_failed_handle('unexpected exception') + tt= traceback.format_exc() logger.error(traceback.format_exc()) # self.rollback('unexpected exception') @@ -116,7 +119,7 @@ class InstVnf(Thread): 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 + # get rawdata from catalog by csar_id input_parameters = [] for key, val in self.data['additionalParams'].items(): input_parameters.append({"key": key, "value": val}) @@ -124,6 +127,8 @@ class InstVnf(Thread): 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 # just for test + self.checkParameterExist() # update NfInstModel NfInstModel.objects.filter(nfinstid=self.nf_inst_id).\ @@ -146,19 +151,26 @@ class InstVnf(Thread): vdus = ignore_case_get(self.vnfd_info, "vdus") res_index = 1 for vdu in vdus: - location_info = ignore_case_get(ignore_case_get(vdu, "properties"), "location_info") res_def = {'type': 'VDU', 'resDefId': str(res_index), - 'resDesId': ignore_case_get(vdu, "vdu_id"), - 'vimid': ignore_case_get(location_info, "vimId"), - 'tenant': ignore_case_get(location_info, "tenant")} + '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") + + # update vnfd_info + 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(status='INSTANTIATED', lastuptime=now_time()) @@ -167,7 +179,7 @@ class InstVnf(Thread): def create_res(self): logger.info("[NF instantiation] create resource start") - adaptor.create_vim_res('', self.do_notify, self.do_rollback) + adaptor.create_vim_res(self.vnfd_info, self.do_notify) JobUtil.add_job_status(self.job_id, 70, '[NF instantiation] create resource finish') logger.info("[NF instantiation] create resource finish") @@ -350,122 +362,149 @@ class InstVnf(Thread): NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='failed', lastuptime=now_time()) JobUtil.add_job_status(self.job_id, 255, error_msg) - def do_notify(self, res_type, progress, ret): + def do_notify(self, res_type, ret): logger.info('creating [%s] resource' % res_type) - progress = 20 + int(progress/2) # 20-70 - if res_type == adaptor.OPT_CREATE_VOLUME: + # progress = 20 + int(progress/2) # 20-70 + if res_type == adaptor.RES_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")}) - JobUtil.add_job_status(self.job_id, progress, '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")}) + JobUtil.add_job_status(self.job_id, 25, 'Create vloumns!') StorageInstModel.objects.create( - storageid='1', - vimid='1', - resouceid='1', - name='40G', - tenant='admin', + storageid=str(uuid.uuid4()), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + name=ignore_case_get(ret, "name"), + tenant=ignore_case_get(ret, "tenantId"), + create_time=ignore_case_get(ret, "createTime"), + storagetype=get_none(ignore_case_get(ret, "type")), + size=ignore_case_get(ret, "size"), insttype=0, - is_predefined=ret["returnCode"], + is_predefined=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id) - elif res_type == adaptor.OPT_CREATE_NETWORK: + elif res_type == adaptor.RES_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")}) + # 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": "1"}, {"res_id": "2"}) - JobUtil.add_job_status(self.job_id, progress, 'Create networks!') + JobUtil.add_job_status(self.job_id, 35, 'Create networks!') NetworkInstModel.objects.create( - networkid='1', - vimid='1', - resouceid='1', - name='pnet_network', - tenant='admin', - insttype=0, - is_predefined=ret["returnCode"], - instid=self.nf_inst_id) - elif res_type == adaptor.OPT_CREATE_SUBNET: + networkid=str(uuid.uuid4()), + name=ignore_case_get(ret, "name"), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + tenant=ignore_case_get(ret, "tenantId"), + segmentid=str(ignore_case_get(ret, "segmentationId")), + network_type=ignore_case_get(ret, "networkType"), + physicalNetwork=ignore_case_get(ret, "physicalNetwork"), + vlantrans=get_boolean(ignore_case_get(ret, "vlanTransparent")), + is_shared=get_boolean(ignore_case_get(ret, "shared")), + routerExternal=get_boolean(ignore_case_get(ret, "routerExternal")), + insttype = 0, + is_predefined=ignore_case_get(ret, "returnCode"), + instid = self.nf_inst_id) + elif res_type == adaptor.RES_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")}) + # 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": "1"}, {"res_id": "2"}) - JobUtil.add_job_status(self.job_id, progress, 'Create subnets!') + JobUtil.add_job_status(self.job_id, 40, 'Create subnets!') SubNetworkInstModel.objects.create( - subnetworkid='1', - vimid='1', - resouceid='1', - networkid='1', - name='sub_pnet', - tenant='admin', + subnetworkid=str(uuid.uuid4()), + name=ignore_case_get(ret, "name"), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + tenant=ignore_case_get(ret, "tenantId"), + networkid=ignore_case_get(ret, "networkId"), + cidr=ignore_case_get(ret, "cidr"), + ipversion=ignore_case_get(ret, "ipversion"), + isdhcpenabled=ignore_case_get(ret, "enableDhcp"), + gatewayip=ignore_case_get(ret, "gatewayIp"), + dnsNameservers=ignore_case_get(ret, "dnsNameservers"), + hostRoutes=ignore_case_get(ret, "hostRoutes"), + allocationPools=ignore_case_get(ret, "allocationPools"), insttype=0, is_predefined=ret["returnCode"], instid=self.nf_inst_id) - elif res_type == adaptor.OPT_CREATE_PORT: + elif res_type == adaptor.RES_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")}) + # 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": "1"}, {"res_id": "2"}) - JobUtil.add_job_status(self.job_id, progress, 'Create ports!') + JobUtil.add_job_status(self.job_id, 50, 'Create ports!') PortInstModel.objects.create( - portid='1', - networkid='1', - subnetworkid='1', - vimid='1', - resouceid='1', - name='aaa_pnet_cp', - tenant='admin', + portid=str(uuid.uuid4()), + networkid=ignore_case_get(ret, "networkId"), + subnetworkid=ignore_case_get(ret, "subnetId"), + name=ignore_case_get(ret, "name"), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + tenant=ignore_case_get(ret, "tenantId"), + macaddress = ignore_case_get(ret, "macAddress"), + ipaddress = ignore_case_get(ret, "ip"), + typevirtualnic=ignore_case_get(ret, "vnicType"), + securityGroups=ignore_case_get(ret, "securityGroups"), insttype=0, - is_predefined=ret["returnCode"], + is_predefined=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id) - elif res_type == adaptor.OPT_CREATE_FLAVOR: + elif res_type == adaptor.RES_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")}) + # 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": "1"}, {"res_id": "2"}) - JobUtil.add_job_status(self.job_id, progress, 'Create flavors!') + JobUtil.add_job_status(self.job_id, 60, 'Create flavors!') FlavourInstModel.objects.create( - falavourid='1', - name='1', - vcpu='1', - extraspecs='1', - is_predefined=ret["returnCode"], + flavourid=str(uuid.uuid4()), + name=ignore_case_get(ret, "name"), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + tenant=ignore_case_get(ret, "tenantId"), + vcpu=ignore_case_get(ret, "vcpu"), + memory=ignore_case_get(ret, "memory"), + disk=ignore_case_get(ret, "disk"), + ephemeral=ignore_case_get(ret, "ephemeral"), + swap=ignore_case_get(ret, "swap"), + isPublic=get_boolean(ignore_case_get(ret, "isPublic")), + extraspecs=ignore_case_get(ret, "extraSpecs"), + is_predefined=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id) - elif res_type == adaptor.OPT_CREATE_VM: + elif res_type == adaptor.RES_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")}) + # 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": "1"}, {"res_id": "2"}) - JobUtil.add_job_status(self.job_id, progress, 'Create vms!') + JobUtil.add_job_status(self.job_id, 70, 'Create vms!') VmInstModel.objects.create( - vmid="1", - vimid="1", - resouceid="11", + vmid=str(uuid.uuid4()), + vimid=ret["vimId"], + resouceid=ret["id"], 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_) - adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete) - logger.error('rollback resource complete') + vmname=ret["name"], + is_predefined=ret["returnCode"]) - StorageInstModel.objects.filter(instid=self.nf_inst_id).delete() - NetworkInstModel.objects.filter(instid=self.nf_inst_id).delete() - SubNetworkInstModel.objects.filter(instid=self.nf_inst_id).delete() - PortInstModel.objects.filter(instid=self.nf_inst_id).delete() - FlavourInstModel.objects.filter(instid=self.nf_inst_id).delete() - VmInstModel.objects.filter(instid=self.nf_inst_id).delete() - logger.error('delete table complete') - raise NFLCMException("Create resource failed") - - def do_notify_delete(self, ret): - logger.error('Deleting [%s] resource' % ret) + # def do_rollback(self, args_=None): + # logger.error('error info : %s' % args_) + # adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete) + # logger.error('rollback resource complete') + # + # StorageInstModel.objects.filter(instid=self.nf_inst_id).delete() + # NetworkInstModel.objects.filter(instid=self.nf_inst_id).delete() + # SubNetworkInstModel.objects.filter(instid=self.nf_inst_id).delete() + # PortInstModel.objects.filter(instid=self.nf_inst_id).delete() + # FlavourInstModel.objects.filter(instid=self.nf_inst_id).delete() + # VmInstModel.objects.filter(instid=self.nf_inst_id).delete() + # logger.error('delete table complete') + # raise NFLCMException("Create resource failed") + # + # 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: