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=46dbfaa6feb79d2ac776803e2a6da267e0549414;hpb=794bf69b7fd14671e80b1caebaf807e1b5f85073;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 46dbfaa6..1d5825e9 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -14,6 +14,7 @@ import json import logging import traceback +import uuid from threading import Thread from lcm.nf.vnfs.const import vnfd_model_dict @@ -25,7 +26,7 @@ from lcm.pub.msapi.nfvolcm import apply_grant_to_nfvo, notify_lcm_to_nfvo, get_p 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__) @@ -98,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') @@ -159,6 +161,7 @@ class InstVnf(Thread): 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") @@ -364,115 +367,144 @@ class InstVnf(Thread): # 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")}) + # 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.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, 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) + 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, 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.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, 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=ignore_case_get(ret, "returnCode"), instid=self.nf_inst_id) 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, 60, 'Create flavors!') FlavourInstModel.objects.create( - falavourid='1', - name='1', - vcpu='1', - extraspecs='1', + 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!') - 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, 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) + vmname=ret["name"], + is_predefined=ret["returnCode"]) - 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 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: