summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
16c4a5f)
-Align grant request.
-Rename resouceid to resourceid.
Change-Id: I1a933ba6248911984500a06f3fd031fddec06880
Issue-ID: VFC-1101
Signed-off-by: laili <lai.li@zte.com.cn>
12 files changed:
def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
logger.info("Grant resource begin")
def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
logger.info("Grant resource begin")
- lifecycleOperration = grant_type
content_args = {
'vnfInstanceId': nf_inst_id,
content_args = {
'vnfInstanceId': nf_inst_id,
- 'vnfDescriptorId': '',
- 'lifecycleOperation': lifecycleOperration,
+ 'vnfdId': None, # TODO
+ 'flavourId': None, # TODO
+ 'operate': grant_type,
+ 'isAutomaticInvocation': True, # TODO
+ 'instantiationLevelId': None, # TODO
'updateResources': [],
'removeResources': [],
'placementConstraints': [],
'updateResources': [],
'removeResources': [],
'placementConstraints': [],
+ 'vimConstraints': [],
+ 'additionalParams': {},
+ '_links': None # TODO
- if grant_type == "Terminate":
+ if grant_type == GRANT_TYPE.TERMINATE:
res_index = 1
for vdu in vdus:
res_def = {
res_index = 1
for vdu in vdus:
res_def = {
- 'type': 'VDU',
- 'resDefId': str(res_index),
- 'resDesId': vdu.resouceid}
+ 'id': str(res_index),
+ 'type': 'COMPUTE',
+ 'vduId': None,
+ 'resourceTemplateId': None,
+ 'resource': {
+ 'vimConnectionId': None,
+ 'resourceProviderId': None,
+ 'resourceid': vdu.resourceid,
+ 'vimLevelResourceType': None
+ }
+ }
content_args['removeResources'].append(res_def)
res_index += 1
content_args['additionalParams']['vimid'] = vdus[0].vimid
content_args['removeResources'].append(res_def)
res_index += 1
content_args['additionalParams']['vimid'] = vdus[0].vimid
- elif grant_type == "Instantiate":
+ elif grant_type == GRANT_TYPE.INSTANTIATE:
vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
res_index = 1
for vdu in vdus:
res_def = {
vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
res_index = 1
for vdu in vdus:
res_def = {
- 'type': 'VDU',
- 'resDefId': str(res_index),
- 'resDesId': ignore_case_get(vdu, "vdu_id")
+ 'id': str(res_index),
+ 'type': 'COMPUTE',
+ 'vduId': None,
+ 'resourceTemplateId': None, # TODO: shall be present for the planned creation of new resources.
+ 'resource': None
}
content_args['addResources'].append(res_def)
res_index += 1
}
content_args['addResources'].append(res_def)
res_index += 1
res_index = 1
for vdu in vdus:
res_def = {
res_index = 1
for vdu in vdus:
res_def = {
- 'type': 'VDU',
- 'resDefId': str(res_index),
- 'resDesId': vdu.resouceid}
+ 'id': str(res_index),
+ 'type': 'COMPUTE',
+ 'vduId': None,
+ 'resourceTemplateId': None,
+ 'resource': {
+ 'vimConnectionId': None,
+ 'resourceProviderId': None,
+ 'resourceid': vdu.resourceid,
+ 'vimLevelResourceType': None
+ }
+ }
content_args['updateResources'].append(res_def)
res_index += 1
content_args['additionalParams']['vimid'] = vdus[0].vimid
content_args['updateResources'].append(res_def)
res_index += 1
content_args['additionalParams']['vimid'] = vdus[0].vimid
from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
+from lcm.nf.const import GRANT_TYPE
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
self.nf_inst_id = nf_inst_id
self.job_id = job_id
self.vim_id = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "vimId")
self.nf_inst_id = nf_inst_id
self.job_id = job_id
self.vim_id = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "vimId")
- self.grant_type = "Instantiate"
+ self.grant_type = GRANT_TYPE.INSTANTIATE
inputs = json.loads(inputs)
for key, val in inputs.items():
input_parameters.append({"key": key, "value": val})
inputs = json.loads(inputs)
for key, val in inputs.items():
input_parameters.append({"key": key, "value": val})
- vnf_package_info = query_vnfpackage_by_id(self.vnfd_id)
- self.vnfd_info = json.loads(ignore_case_get(ignore_case_get(vnf_package_info, "packageInfo"), "vnfdModel"))
+ vnf_package = query_vnfpackage_by_id(self.vnfd_id)
+ pkg_info = ignore_case_get(vnf_package, "packageInfo")
+ self.vnfd_info = json.loads(ignore_case_get(pkg_info, "vnfdModel"))
self.update_cps()
metadata = ignore_case_get(self.vnfd_info, "metadata")
self.update_cps()
metadata = ignore_case_get(self.vnfd_info, "metadata")
StorageInstModel.objects.create(
storageid=str(uuid.uuid4()),
vimid=ignore_case_get(ret, "vimId"),
StorageInstModel.objects.create(
storageid=str(uuid.uuid4()),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
name=ignore_case_get(ret, "name"),
tenant=ignore_case_get(ret, "tenantId"),
create_time=ignore_case_get(ret, "createTime"),
name=ignore_case_get(ret, "name"),
tenant=ignore_case_get(ret, "tenantId"),
create_time=ignore_case_get(ret, "createTime"),
networkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
networkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=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"),
tenant=ignore_case_get(ret, "tenantId"),
segmentid=str(ignore_case_get(ret, "segmentationId")),
network_type=ignore_case_get(ret, "networkType"),
subnetworkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
subnetworkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
networkid=ignore_case_get(ret, "networkId"),
cidr=ignore_case_get(ret, "cidr"),
tenant=ignore_case_get(ret, "tenantId"),
networkid=ignore_case_get(ret, "networkId"),
cidr=ignore_case_get(ret, "cidr"),
subnetworkid=ignore_case_get(ret, "subnetId"),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
subnetworkid=ignore_case_get(ret, "subnetId"),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
macaddress=ignore_case_get(ret, "macAddress"),
ipaddress=ignore_case_get(ret, "ip"),
tenant=ignore_case_get(ret, "tenantId"),
macaddress=ignore_case_get(ret, "macAddress"),
ipaddress=ignore_case_get(ret, "ip"),
flavourid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
flavourid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=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")),
tenant=ignore_case_get(ret, "tenantId"),
vcpu=get_integer(ignore_case_get(ret, "vcpu")),
memory=get_integer(ignore_case_get(ret, "memory")),
vmid=vm_id,
vmname=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
vmid=vm_id,
vmname=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
nic_array=ignore_case_get(ret, "nicArray"),
metadata=ignore_case_get(ret, "metadata"),
tenant=ignore_case_get(ret, "tenantId"),
nic_array=ignore_case_get(ret, "nicArray"),
metadata=ignore_case_get(ret, "metadata"),
resource_table = globals().get(resource_type + 'InstModel')
resource_insts = resource_table.objects.filter(instid=self.nf_inst_id)
for resource_inst in resource_insts:
resource_table = globals().get(resource_type + 'InstModel')
resource_insts = resource_table.objects.filter(instid=self.nf_inst_id)
for resource_inst in resource_insts:
- if not resource_inst.resouceid:
+ if not resource_inst.resourceid:
continue
self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
logger.info('Query resource end, resource=%s' % self.inst_resource)
continue
self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
logger.info('Query resource end, resource=%s' % self.inst_resource)
return {
"vim_id": resource.vimid,
"tenant_id": resource.tenant,
return {
"vim_id": resource.vimid,
"tenant_id": resource.tenant,
- "id": resource.resouceid
+ "id": resource.resourceid
}
def operate_resource(self):
}
def operate_resource(self):
def do_notify_op(self, status, resid):
logger.error('VNF resource %s updated to: %s' % (resid, status))
def do_notify_op(self, status, resid):
logger.error('VNF resource %s updated to: %s' % (resid, status))
- VmInstModel.objects.filter(instid=self.nf_inst_id, resouceid=resid).update(operationalstate=status)
+ VmInstModel.objects.filter(instid=self.nf_inst_id, resourceid=resid).update(operationalstate=status)
"id": s.storageid,
"storageResource": {
"vimConnectionId": s.vimid,
"id": s.storageid,
"storageResource": {
"vimConnectionId": s.vimid,
- "resourceId": s.resouceid
+ "resourceId": s.resourceid
"virtualLinkDescId": v.vldid,
"networkResource": {
"vimConnectionId": net[0].vimid,
"virtualLinkDescId": v.vldid,
"networkResource": {
"vimConnectionId": net[0].vimid,
- "resourceId": net[0].resouceid
+ "resourceId": net[0].resourceid
"vduId": vnfc.vduid,
"computeResource": {
"vimConnectionId": vm[0].vimid,
"vduId": vnfc.vduid,
"computeResource": {
"vimConnectionId": vm[0].vimid,
- "resourceId": vm[0].resouceid
+ "resourceId": vm[0].resourceid
},
"storageResourceIds": [s.storageid for s in storage]
}
},
"storageResourceIds": [s.storageid for s in storage]
}
from lcm.pub.utils.values import ignore_case_get
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
from lcm.pub.utils.values import ignore_case_get
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
+from lcm.nf.const import GRANT_TYPE
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
self.terminationType = ignore_case_get(self.data, "terminationType")
self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout")
self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
self.terminationType = ignore_case_get(self.data, "terminationType")
self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout")
self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
- self.grant_type = "Terminate"
+ self.grant_type = GRANT_TYPE.TERMINATE
resource_table = globals().get(resource_type + 'InstModel')
resource_insts = resource_table.objects.filter(instid=self.nf_inst_id)
for resource_inst in resource_insts:
resource_table = globals().get(resource_type + 'InstModel')
resource_insts = resource_table.objects.filter(instid=self.nf_inst_id)
for resource_inst in resource_insts:
- if not resource_inst.resouceid:
+ if not resource_inst.resourceid:
continue
self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
logger.info('Query resource end, resource=%s' % self.inst_resource)
continue
self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
logger.info('Query resource end, resource=%s' % self.inst_resource)
return {
"vim_id": resource.vimid,
"tenant_id": resource.tenant,
return {
"vim_id": resource.vimid,
"tenant_id": resource.tenant,
- "res_id": resource.resouceid,
+ "res_id": resource.resourceid,
"is_predefined": resource.is_predefined
}
"is_predefined": resource.is_predefined
}
logger.error('Deleting [%s] resource, resourceid [%s]' % (res_type, res_id))
resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)]
resource_table = globals().get(resource_type + 'InstModel')
logger.error('Deleting [%s] resource, resourceid [%s]' % (res_type, res_id))
resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)]
resource_table = globals().get(resource_type + 'InstModel')
- resource_table.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
+ resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete()
def lcm_notify(self):
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time())
def lcm_notify(self):
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time())
HEAL_ACTION_TYPE = enum(START="vmCreate", RESTART="vmReset")
ACTION_TYPE = enum(START=1, STOP=2, REBOOT=3)
HEAL_ACTION_TYPE = enum(START="vmCreate", RESTART="vmReset")
ACTION_TYPE = enum(START=1, STOP=2, REBOOT=3)
-GRANT_TYPE = enum(INSTANTIATE="Instantiate", TERMINATE="Terminate", HEAL_CREATE="Heal Create", HEAL_RESTART="Heal Restart", OPERATE="Operate")
+GRANT_TYPE = enum(INSTANTIATE="INSTANTIATE", TERMINATE="TERMINATE", HEAL_CREATE="Heal Create", HEAL_RESTART="Heal Restart", OPERATE="OPERATE")
VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive', ACTIVE="active",
FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
UPDATING="updating", HEALING="healing")
VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive', ACTIVE="active",
FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
UPDATING="updating", HEALING="healing")
self.client = Client()
StorageInstModel.objects.create(storageid="1",
vimid="1",
self.client = Client()
StorageInstModel.objects.create(storageid="1",
vimid="1",
insttype=0,
instid="1111",
is_predefined=1)
NetworkInstModel.objects.create(networkid='1',
vimid='1',
insttype=0,
instid="1111",
is_predefined=1)
NetworkInstModel.objects.create(networkid='1',
vimid='1',
name='pnet_network',
is_predefined=1,
tenant='admin',
name='pnet_network',
is_predefined=1,
tenant='admin',
instid='1111')
SubNetworkInstModel.objects.create(subnetworkid='1',
vimid='1',
instid='1111')
SubNetworkInstModel.objects.create(subnetworkid='1',
vimid='1',
networkid='1',
is_predefined=1,
name='sub_pnet',
networkid='1',
is_predefined=1,
name='sub_pnet',
networkid='1',
subnetworkid='1',
vimid='1',
networkid='1',
subnetworkid='1',
vimid='1',
is_predefined=1,
name='aaa_pnet_cp',
tenant='admin',
is_predefined=1,
name='aaa_pnet_cp',
tenant='admin',
instid='1111')
FlavourInstModel.objects.create(flavourid="1",
vimid="1",
instid='1111')
FlavourInstModel.objects.create(flavourid="1",
vimid="1",
instid="1111",
is_predefined=1)
VmInstModel.objects.create(vmid="1",
vimid="1",
instid="1111",
is_predefined=1)
VmInstModel.objects.create(vmid="1",
vimid="1",
insttype=0,
instid="1111",
vmname="test_01",
insttype=0,
instid="1111",
vmname="test_01",
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
- vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11")\r
+ vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11")\r
self.assertEqual("ACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
self.assertEqual("ACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
- vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11")\r
+ vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11")\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
- vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11")\r
+ vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11")\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id)\r
JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY")\r
OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
- vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11")\r
+ vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11")\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
self.assertEqual("INACTIVE", vm[0].operationalstate)\r
self.assert_job_result(self.job_id, 100, "Operate Vnf success.")\r
NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
StorageInstModel(storageid='s02',
vimid='vim01',
NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
StorageInstModel(storageid='s02',
vimid='vim01',
- resouceid='resource01',
+ resourceid='resource01',
insttype=1,
instid=vnf_inst_id).save()
response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
insttype=1,
instid=vnf_inst_id).save()
response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
status='INSTANTIATED').save()
StorageInstModel(storageid='s0%s' % i,
vimid='vim0%s' % i,
status='INSTANTIATED').save()
StorageInstModel(storageid='s0%s' % i,
vimid='vim0%s' % i,
- resouceid='resource0%s' % i,
+ resourceid='resource0%s' % i,
insttype=1,
instid='%s' % i).save()
response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
insttype=1,
instid='%s' % i).save()
response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
self.client = Client()\r
StorageInstModel.objects.create(storageid="1",\r
vimid="1",\r
self.client = Client()\r
StorageInstModel.objects.create(storageid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
is_predefined=1)\r
NetworkInstModel.objects.create(networkid='1',\r
vimid='1',\r
insttype=0,\r
instid="1111",\r
is_predefined=1)\r
NetworkInstModel.objects.create(networkid='1',\r
vimid='1',\r
name='pnet_network',\r
is_predefined=1,\r
tenant='admin',\r
name='pnet_network',\r
is_predefined=1,\r
tenant='admin',\r
instid='1111')\r
SubNetworkInstModel.objects.create(subnetworkid='1',\r
vimid='1',\r
instid='1111')\r
SubNetworkInstModel.objects.create(subnetworkid='1',\r
vimid='1',\r
networkid='1',\r
is_predefined=1,\r
name='sub_pnet',\r
networkid='1',\r
is_predefined=1,\r
name='sub_pnet',\r
networkid='1',\r
subnetworkid='1',\r
vimid='1',\r
networkid='1',\r
subnetworkid='1',\r
vimid='1',\r
is_predefined=1,\r
name='aaa_pnet_cp',\r
tenant='admin',\r
is_predefined=1,\r
name='aaa_pnet_cp',\r
tenant='admin',\r
instid='1111')\r
FlavourInstModel.objects.create(flavourid="1",\r
vimid="1",\r
instid='1111')\r
FlavourInstModel.objects.create(flavourid="1",\r
vimid="1",\r
instid="1111",\r
is_predefined=1)\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
instid="1111",\r
is_predefined=1)\r
VmInstModel.objects.create(vmid="1",\r
vimid="1",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
insttype=0,\r
instid="1111",\r
vmname="test_01",\r
storageid = models.CharField(db_column='STORAGEID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
storageid = models.CharField(db_column='STORAGEID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255, null=True)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255, null=True)
vmid = models.CharField(db_column='VMID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
vmid = models.CharField(db_column='VMID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
vmname = models.CharField(db_column='VMNAME', max_length=255)
nic_array = models.CharField(db_column='NICARRAY', max_length=255)
metadata = models.CharField(db_column='METADATA', max_length=255)
vmname = models.CharField(db_column='VMNAME', max_length=255)
nic_array = models.CharField(db_column='NICARRAY', max_length=255)
metadata = models.CharField(db_column='METADATA', max_length=255)
flavourid = models.CharField(db_column='FLAVOURID', max_length=255, primary_key=True)
vimid = models.CharField(db_column='VIMID', max_length=255)
flavourid = models.CharField(db_column='FLAVOURID', max_length=255, primary_key=True)
vimid = models.CharField(db_column='VIMID', max_length=255)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255)
tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
vcpu = models.IntegerField(db_column='VCPU', null=True)
name = models.CharField(db_column='NAME', max_length=255)
tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
vcpu = models.IntegerField(db_column='VCPU', null=True)
networkid = models.CharField(db_column='NETWORKID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
networkid = models.CharField(db_column='NETWORKID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255)
subnetworkid = models.CharField(db_column='SUBNETWORKID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
subnetworkid = models.CharField(db_column='SUBNETWORKID', primary_key=True, max_length=255)
vimid = models.CharField(db_column='VIMID', max_length=255)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
networkid = models.CharField(db_column='NETWORKID', max_length=255)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
networkid = models.CharField(db_column='NETWORKID', max_length=255)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
networkid = models.CharField(db_column='NETWORKID', max_length=255)
subnetworkid = models.CharField(db_column='SUBNETWORKID', max_length=255, null=True)
vimid = models.CharField(db_column='VIMID', max_length=255)
networkid = models.CharField(db_column='NETWORKID', max_length=255)
subnetworkid = models.CharField(db_column='SUBNETWORKID', max_length=255, null=True)
vimid = models.CharField(db_column='VIMID', max_length=255)
- resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+ resourceid = models.CharField(db_column='RESOURCEID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255, null=True)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
name = models.CharField(db_column='NAME', max_length=255, null=True)
insttype = models.IntegerField(db_column='INSTTYPE')
instid = models.CharField(db_column='INSTID', max_length=255)
if vm:
vm_resource = {
'vimId': vm[0].vimid,
if vm:
vm_resource = {
'vimId': vm[0].vimid,
- 'resourceId': vm[0].resouceid,
+ 'resourceId': vm[0].resourceid,
'resourceProviderId': vm[0].vmname, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'vm'
}
'resourceProviderId': vm[0].vmname, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'vm'
}
for network in networks:
network_resource = {
'vimConnectionId': network.vimid,
for network in networks:
network_resource = {
'vimConnectionId': network.vimid,
- 'resourceId': network.resouceid,
+ 'resourceId': network.resourceid,
'resourceProviderId': network.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'network'
}
'resourceProviderId': network.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'network'
}
'id': port.portid, # TODO: port.portid or port.nodeid?
'resourceHandle': {
'vimConnectionId': port.vimid,
'id': port.portid, # TODO: port.portid or port.nodeid?
'resourceHandle': {
'vimConnectionId': port.vimid,
- 'resourceId': port.resouceid,
+ 'resourceId': port.resourceid,
'resourceProviderId': port.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'port'
},
'resourceProviderId': port.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'port'
},
'changeType': changetype,
'storageResource': {
'vimConnectionId': vs.vimid,
'changeType': changetype,
'storageResource': {
'vimConnectionId': vs.vimid,
- 'resourceId': vs.resouceid,
+ 'resourceId': vs.resourceid,
'resourceProviderId': vs.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'volume'
}
'resourceProviderId': vs.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'volume'
}