X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Finst_vnf.py;h=6ceddbb1ae80463e7512a98ad91f85a33fbbd24b;hb=cc8e51bd402ec135d7bfab7dcafedbdb47a95da1;hp=6bc996fb57a2bffeee61fa91ec924873abb98523;hpb=19fce59efa91c1e37b64098ce6e99b2c90eb8f05;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 6bc996fb..6ceddbb1 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -18,8 +18,8 @@ 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.database.models import NfInstModel, VmInstModel, NetworkInstModel, \ + SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel from lcm.pub.exceptions import NFLCMException 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 @@ -42,48 +42,13 @@ class InstVnf(Thread): self.vnfm_inst_id = '' self.csar_id = '' self.vnfd_info = [] - self.inst_resource = {'volumn': [], # [{"vim_id": ignore_case_get(ret, "vim_id")},{}] - 'network': [], - 'subnet': [], - 'port': [], - 'flavor': [], - 'vm': [], - } - # self.create_res_result = { - # 'jobid': 'res_001', - # 'resourceResult': [{'name': 'vm01'}, {'name': 'vm02'}], - # 'resource_result':{ - # 'affectedvnfc':[ - # { - # 'status':'success', - # 'vnfcinstanceid':'1', - # 'computeresource':{'resourceid':'11'}, - # 'vduid':'111', - # 'vdutype':'1111' - # } - # ], - # 'affectedvirtuallink':[ - # { - # 'status': 'success', - # 'virtuallinkinstanceid':'', - # 'networkresource':{'resourceid':'1'}, - # 'subnetworkresource':{'resourceid':'1'}, - # 'virtuallinkdescid': '', - # } - # ], - # 'affectedcp':[{ - # 'status': 'success', - # 'portresource':{'resourceid':'1'}, - # 'cpinstanceid':'2', - # 'cpdid':'22', - # 'ownertype':'222', - # 'ownerid':'2222', - # 'virtuallinkinstanceid':'22222', - # - # }], - # - # } - # } + # self.inst_resource = {'volumn': [], # [{"vim_id": ignore_case_get(ret, "vim_id")},{}] + # 'network': [], + # 'subnet': [], + # 'port': [], + # 'flavor': [], + # 'vm': [], + # } def run(self): try: @@ -92,16 +57,10 @@ class InstVnf(Thread): self.create_res() 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) except NFLCMException as e: self.vnf_inst_failed_handle(e.message) - # 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') def inst_pre(self): vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) @@ -184,178 +143,82 @@ class InstVnf(Thread): JobUtil.add_job_status(self.job_id, 70, '[NF instantiation] create resource finish') logger.info("[NF instantiation] create resource finish") - # def check_res_status(self): - # logger.info("[NF instantiation] confirm all vms are active start") - # vnfcs = self.create_res_result['resource_result']['affectedvnfc'] - # for vnfc in vnfcs: - # if 'success' != vnfc['status']: - # logger.error("VNFC_STATUS_IS_NOT_ACTIVE[vduid=%s]" % vnfc['vduId']) - # raise NFLCMException(msgid="VNFC_STATUS_IS_NOT_ACTIVE[vduid=%s]", args=vnfc['vduId']) - # - # JobUtil.add_job_status(self.job_id, 80, 'SAVE_VNFC_TO_DB') - # vls = self.create_res_result['resource_result']['affectedvirtuallink'] - # cps = self.create_res_result['resource_result']['affectedcp'] - # - # for vnfc in vnfcs: - # if 'failed' == vnfc['status']: - # continue - # compute_resource = vnfc['computeresource'] - # vminst = VmInstModel.objects.filter(resouceid=compute_resource['resourceid']).first() - # VNFCInstModel.objects.create( - # vnfcinstanceid=vnfc['vnfcinstanceid'], - # vduid=vnfc['vduid'], - # vdutype=vnfc['vdutype'], - # nfinstid=self.nf_inst_id, - # vmid=vminst.vmid) - # for vl in vls: - # if 'failed' == vl['status']: - # continue - # network_resource = vl['networkresource'] - # subnet_resource = vl['subnetworkresource'] - # networkinst = NetworkInstModel.objects.filter(resouceid=network_resource['resourceid']).first() - # subnetinst = SubNetworkInstModel.objects.filter(resouceid=subnet_resource['resourceid']).first() - # VLInstModel.objects.create( - # vlinstanceid=vl['virtuallinkinstanceid'], - # vldid=vl['virtuallinkdescid'], - # ownertype='0', - # ownerid=self.nf_inst_id, - # relatednetworkid=networkinst.networkid, - # relatedsubnetworkid=subnetinst.subnetworkid) - # # # for vs in vss: - # for cp in cps: - # if 'failed' == cp['status']: - # continue - # port_resource = cp['portresource'] - # portinst = PortInstModel.objects.filter(resouceid=port_resource['resourceid']).first() - # ttt = portinst.portid - # CPInstModel.objects.create( - # cpinstanceid=cp['cpinstanceid'], - # cpdid=cp['cpdid'], - # relatedtype='2', - # relatedport=portinst.portid, - # ownertype=cp['ownertype'], - # ownerid=cp['ownerid'], - # vlinstanceid=cp['virtuallinkinstanceid']) - # # self.add_job(43, 'INST_DPLY_VM_PRGS') - # logger.info("[NF instantiation] confirm all vms are active end") - 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() - # 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) + vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id) for vnfc in vnfcs: - compute_resource = {} + vmResource = {} if vnfc.vmid: vm = VmInstModel.objects.filter(vmid=vnfc.vmid) if vm: - compute_resource = {'vimId': vm[0].vimid, 'resourceId': vm[0].resouceid, - 'resourceName': vm[0].vmname, 'tenant': vm[0].tenant} + vmResource = {'vimId': vm[0].vimid, 'resourceId': vm[0].resouceid, + 'resourceName': vm[0].vmname, 'resourceType': 'vm'} affected_vnfc.append( - {'vnfcInstanceId': vnfc.vnfcinstanceid, 'vduId': vnfc.vduid, 'changeType': 'added', - 'computeResource': compute_resource, 'storageResource': [], 'vduType': vnfc.vdutype}) + {'vnfcInstanceId': vnfc.vnfcinstanceid, + 'vduId': vnfc.vduid, + 'changeType': 'added', + 'computeResource': vmResource}) affected_vl = [] - vls = VLInstModel.objects.filter(ownerid=self.nf_inst_id) - for vl in vls: - network_resource = {} - subnet_resource = {} - if vl.relatednetworkid: - network = NetworkInstModel.objects.filter(networkid=vl.relatednetworkid) - subnet = SubNetworkInstModel.objects.filter(subnetworkid=vl.relatedsubnetworkid) - if network: - network_resource = {'vimId': network[0].vimid, 'resourceId': network[0].resouceid, - 'resourceName': network[0].name, 'tenant': network[0].tenant} - if subnet: - subnet_resource = {'vimId': subnet[0].vimid, 'resourceId': subnet[0].resouceid, - 'resourceName': subnet[0].name, 'tenant': subnet[0].tenant} + 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( - {'virtualLinkInstanceId': vl.vlinstanceid, 'virtualLinkDescId': vl.vldid, 'changeType': 'added', - 'networkResource': network_resource, 'subnetworkResource': subnet_resource, 'tenant': vl.tenant}) + {'vlInstanceId': network.networkid, + 'vldid': network.nodeId, + 'changeType': 'added', + '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': 'added', + '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( - {'virtualStorageInstanceId': vs.storageid, 'virtualStorageDescId': '', 'changeType': 'added', + {'vsInstanceId': vs.storageid, + 'vsdId': vs.nodeId, + 'changeType': 'added', 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid, - 'resourceName': vs.name, 'tenant': vs.tenant}}) - affected_cp = [] - # vnfc cps - for vnfc in vnfcs: - cps = CPInstModel.objects.filter(ownerid=vnfc.vnfcinstanceid, ownertype=3) - for cp in cps: - port_resource = {} - if cp.relatedport: - port = PortInstModel.objects.filter(portid=cp.relatedport) - if port: - port_resource = {'vimId': port[0].vimid, 'resourceId': port[0].resouceid, - 'resourceName': port[0].name, 'tenant': port[0].tenant} - affected_cp.append( - {'cPInstanceId': cp.cpinstanceid, 'cpdId': cp.cpdid, 'ownerid': cp.ownerid, - 'ownertype': cp.ownertype, 'changeType': 'added', 'portResource': port_resource, - 'virtualLinkInstanceId': cp.vlinstanceid}) - # 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: - port_resource = {} - if cp.relatedport: - port = PortInstModel.objects.filter(portid=cp.relatedport) - if port: - port_resource = {'vimId': port[0].vimid, 'resourceId': port[0].resouceid, - 'resourceName': port[0].name, 'tenant': port[0].tenant} - affected_cp.append( - {'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)) + 'resourceName': vs.name, 'resourceType': 'volume'}}) content_args = { - # "vnfdmodule": allocate_data, - "additionalParam": addition_param, - "nfvoInstanceId": reg_info.nfvoid, - "vnfmInstanceId": self.vnfm_inst_id, - "status": 'finished', + "status": 'result', "nfInstanceId": self.nf_inst_id, "operation": 'instantiate', - "jobId": '', - # 'affectedcapacity': affectedcapacity, - 'affectedService': [], + "jobId": self.job_id, 'affectedVnfc': affected_vnfc, 'affectedVirtualLink': affected_vl, 'affectedVirtualStorage': affected_vs, - 'affectedCp': affected_cp} + # "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' % content_args) # call rest api - resp = notify_lcm_to_nfvo(content_args, self.nf_inst_id) + resp = notify_lcm_to_nfvo(content_args) logger.info('[NF instantiation] get lcm response %s' % resp) - if resp[0] != 0: - logger.error("notify lifecycle to nfvo failed.[%s]" % resp[1]) - raise NFLCMException("send notify request to nfvo failed") logger.info('[NF instantiation] send notify request to nfvo end') - 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") + # 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") def vnf_inst_failed_handle(self, error_msg): logger.error('VNF instantiation failed, detail message: %s' % error_msg) @@ -382,6 +245,7 @@ class InstVnf(Thread): size=ignore_case_get(ret, "size"), insttype=0, is_predefined=ignore_case_get(ret, "returnCode"), + nodeId=ignore_case_get(ret, "nodeId"), instid=self.nf_inst_id) elif res_type == adaptor.RES_NETWORK: logger.info('Create networks!') @@ -404,6 +268,7 @@ class InstVnf(Thread): routerExternal=get_boolean(ignore_case_get(ret, "routerExternal")), insttype = 0, is_predefined=ignore_case_get(ret, "returnCode"), + nodeId=ignore_case_get(ret, "nodeId"), instid = self.nf_inst_id) elif res_type == adaptor.RES_SUBNET: logger.info('Create subnets!') @@ -427,7 +292,7 @@ class InstVnf(Thread): hostRoutes=ignore_case_get(ret, "hostRoutes"), allocationPools=ignore_case_get(ret, "allocationPools"), insttype=0, - is_predefined=ret["returnCode"], + is_predefined=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id) elif res_type == adaptor.RES_PORT: logger.info('Create ports!') @@ -438,14 +303,19 @@ class InstVnf(Thread): JobUtil.add_job_status(self.job_id, 50, 'Create ports!') PortInstModel.objects.create( portid=str(uuid.uuid4()), - networkid=ret["networkId"], - subnetworkid=ret["subnetId"], - vimid=ret["vimId"], - resouceid=ret["id"], - name=ret["name"], - tenant=ret["tenatId"], + 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"), + nodeId=ignore_case_get(ret, "nodeId"), instid=self.nf_inst_id) elif res_type == adaptor.RES_FLAVOR: logger.info('Create flavors!') @@ -455,14 +325,19 @@ class InstVnf(Thread): # self.inst_resource['flavor'].append({"vim_id": "1"}, {"res_id": "2"}) JobUtil.add_job_status(self.job_id, 60, 'Create flavors!') FlavourInstModel.objects.create( - falavourid=str(uuid.uuid4()), - name=ret["name"], - vcpu=ret["vcpu"], - memory=ret["memory"], - extraspecs=ret["extraSpecs"], - is_predefined=ret["returnCode"], - tenant=ret["tenatId"], - vimid=ret["vimId"], + 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.RES_VM: logger.info('Create vms!') @@ -471,14 +346,30 @@ class InstVnf(Thread): # "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, 70, 'Create vms!') + vm_id = str(uuid.uuid4()) VmInstModel.objects.create( - vmid=str(uuid.uuid4()), - vimid=ret["vimId"], - resouceid=ret["id"], + vmid=vm_id, + vmname=ignore_case_get(ret, "name"), + vimid=ignore_case_get(ret, "vimId"), + resouceid=ignore_case_get(ret, "id"), + tenant=ignore_case_get(ret, "tenantId"), + nic_array=ignore_case_get(ret, "nicArray"), + metadata=ignore_case_get(ret, "metadata"), + volume_array=ignore_case_get(ret, "volumeArray"), + server_group=ignore_case_get(ret, "serverGroup"), + availability_zone=ignore_case_get(ret, "availabilityZone"), + flavor_id=ignore_case_get(ret, "flavorId"), + security_groups=ignore_case_get(ret, "securityGroups"), + operationalstate=ignore_case_get(ret, "status"), insttype=0, + is_predefined=ignore_case_get(ret, "returnCode"), + instid=self.nf_inst_id) + VNFCInstModel.objects.create( + vnfcinstanceid=str(uuid.uuid4()), + vduid=ignore_case_get(ret, "id"), + is_predefined=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id, - vmname=ret["name"], - is_predefined=ret["returnCode"]) + vmid=vm_id) # def do_rollback(self, args_=None): # logger.error('error info : %s' % args_)