import json
import logging
import traceback
+import uuid
from threading import Thread
-from lcm.pub.database.models import NfInstModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, \
- SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, VLInstModel, CPInstModel
+from lcm.nf.vnfs.const import vnfd_model_dict
+from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
+ SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, NfvoRegInfoModel
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.gvnfmdriver 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, get_integer
from lcm.pub.vimapi import adaptor
logger = logging.getLogger(__name__)
self.data = data
self.nf_inst_id = nf_inst_id
self.job_id = job_id
+ self.vnfd_id = ''
self.nfvo_inst_id = ''
self.vnfm_inst_id = ''
- self.csar_id = ''
+ self.package_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',
- #
- # }],
- #
- # }
- # }
def run(self):
try:
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')
logger.error(traceback.format_exc())
- # self.rollback('unexpected exception')
+ self.vnf_inst_failed_handle('unexpected exception')
def inst_pre(self):
vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
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].status != 'NOT_INSTANTIATED':
raise NFLCMException('VNF instantiationState is not NOT_INSTANTIATED.')
- # 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, 5, 'Get packageinfo by vnfd_id')
+ self.vnfd_id = vnf_insts[0].vnfdid
+ package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
+ for val in ignore_case_get(package_info, "csars"):
+ if self.vnfd_id == ignore_case_get(val, "vnfdId"):
+ self.package_id = ignore_case_get(val, "csarId")
+ break
- #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)
+ JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id')
+ input_parameters = []
+ inputs = ignore_case_get(self.data['additionalParams'], "inputs")
+ if inputs:
+ if isinstance(inputs, (str, unicode)):
+ inputs = json.loads(inputs)
+ for key, val in inputs.items():
+ input_parameters.append({"key": key, "value": val})
+ raw_data = query_rawdata_from_catalog(self.package_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)
- ret = vnfd_rawdata_get(vnf_insts[0].vnfdid, self.data)
- 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()
+ #self.vnfd_info = vnfd_model_dict # just for test
+ self.update_cps()
- # update NfInstModel
+ self.check_parameter_exist()
+ metadata = ignore_case_get(self.vnfd_info, "metadata")
+ version = ignore_case_get(metadata, "vnfd_version")
+ vendor = ignore_case_get(metadata, "vendor")
+ netype = ignore_case_get(metadata, "vnf_type")
+ vnfsoftwareversion = ignore_case_get(metadata, "version")
+ vnfd_model = self.vnfd_info
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')
+ update(package_id=self.package_id, flavour_id=ignore_case_get(self.data, "flavourId"), version=version,
+ vendor=vendor, netype=netype, vnfd_model=vnfd_model, status='NOT_INSTANTIATED', vnfdid=self.vnfd_id,
+ localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'), input_params=self.data,
+ vnfSoftwareVersion=vnfsoftwareversion, lastuptime=now_time())
+ NfvoRegInfoModel.objects.create(nfvoid=str(uuid.uuid4()), vnfminstid=ignore_case_get(self.data, "vnfmId"))
+ 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
+
+ vnfmInfo = NfvoRegInfoModel.objects.all()
+ content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid
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')
+ apply_result = apply_grant_to_nfvo(json.dumps(content_args))
+ #vim_info = ignore_case_get(apply_result, "vim")
+ #vim_info = ignore_case_get(json.JSONDecoder().decode(apply_result), "vim")
+
+ for vdu in ignore_case_get(self.vnfd_info, "vdus"):
+ if "location_info" in vdu["properties"]:
+ vdu["properties"]["location_info"]["vimid"] = ignore_case_get(apply_result, "vimid")
+ vdu["properties"]["location_info"]["tenant"] = ignore_case_get(apply_result, "tenant")
+ else:
+ vdu["properties"]["location_info"] = {
+ "vimid": ignore_case_get(apply_result, "vimid"),
+ "tenant": ignore_case_get(apply_result, "tenant")}
+ logger.info('vdu["properties"]["location_info"]=%s' % vdu["properties"]["location_info"])
- # update_resources_table()
- NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(instantiationState='INSTANTIATED',
- lastuptime=now_time())
+ 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):
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")
- # 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 = {}
+ vm_resource = {}
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}
+ vm_resource = {'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': vm_resource})
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}
+ '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(json.dumps(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 vnf_inst_failed_handle(self, error_msg):
logger.error('VNF instantiation failed, detail message: %s' % error_msg)
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:
+ 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!')
+ 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"),
+ nodeId=ignore_case_get(ret, "nodeId"),
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")})
- # 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',
+ 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=ret["returnCode"],
+ is_predefined=ignore_case_get(ret, "returnCode"),
+ nodeId=ignore_case_get(ret, "nodeId"),
instid=self.nf_inst_id)
- elif res_type == adaptor.OPT_CREATE_SUBNET:
+ 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")})
- # 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"],
+ is_predefined=ignore_case_get(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")})
- # 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"),
+ nodeId=ignore_case_get(ret, "nodeId"),
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")})
- # 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=get_integer(ignore_case_get(ret, "vcpu")),
+ memory=get_integer(ignore_case_get(ret, "memory")),
+ disk=get_integer(ignore_case_get(ret, "disk")),
+ ephemeral=get_integer(ignore_case_get(ret, "ephemeral")),
+ swap=get_integer(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")})
- # 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!')
+ vm_id = str(uuid.uuid4())
VmInstModel.objects.create(
- vmid="1",
- vimid="1",
- resouceid="11",
+ 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="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')
+ vmid=vm_id)
- 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 update_cps(self):
+ for extlink in ignore_case_get(self.data, "extVirtualLinks"):
+ for cp in ignore_case_get(self.vnfd_info, "cps"):
+ cpdid = ignore_case_get(extlink, "cpdId")
+ if cpdid == ignore_case_get(cp, "cp_id"):
+ cp["networkId"] = ignore_case_get(extlink, "resourceId")
+ cp["subnetId"] = ignore_case_get(extlink, "resourceSubnetId")
+ break
- def do_notify_delete(self, ret):
- logger.error('Deleting [%s] resource' % ret)
+ def check_parameter_exist(self):
+ pass
Code Review / vfc / gvnfm / vnflcm.git / blobdiff