if not location_info:
err_msg = "vdu_id(%s) for cp(%s) is not defined"
raise VimException(err_msg % (port_ref_vdu_id, port["cp_id"]), ERR_CODE)
- network_id = get_res_id(res_cache, RES_NETWORK, port["vl_id"])
- subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"])
+ network_id = ignore_case_get(port, "networkId")
+ subnet_id = ignore_case_get(port, "subnetId")
+ if not network_id:
+ network_id = get_res_id(res_cache, RES_NETWORK, port["vl_id"])
+ subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"])
param = {
"networkId": network_id,
- "subnetId": subnet_id,
"name": port["properties"]["name"]
}
+ set_opt_val(param, "subnetId", subnet_id)
set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address"))
set_opt_val(param, "ip", ignore_case_get(port["properties"], "ip_address"))
set_opt_val(param, "vnicType", ignore_case_get(port["properties"], "vnic_type"))
set_opt_val(param, "securityGroups", "") # TODO
vim_id, tenant_name = location_info["vimid"], location_info["tenant"]
tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name)
- ret = api.create_subnet(vim_id, tenant_id, param)
+ ret = api.create_port(vim_id, tenant_id, param)
ret["nodeId"] = port["cp_id"]
do_notify(res_type, ret)
set_res_cache(res_cache, res_type, port["cp_id"], ret["id"])
param = {
"name": "Flavor_%s" % flavor["vdu_id"],
"vcpu": int(flavor["nfv_compute"]["num_cpus"]),
- "memory": int(flavor["nfv_compute"]["mem_size"].replace('MB', '').strip()),
+ "memory": int(flavor["nfv_compute"]["mem_size"].replace('GB', '').strip()),
"isPublic": True
}
for local_storage_id in ignore_case_get(flavor, "local_storages"):
if local_storage_id != local_storage["local_storage_id"]:
continue
disk_type = local_storage["properties"]["disk_type"]
- disk_size = int(local_storage["properties"]["size"].replace('GB', '').strip())
+ disk_size = int(local_storage["properties"]["size"].replace('GB', '').strip())*1024
if disk_type == "root":
param["disk"] = disk_size
elif disk_type == "ephemeral":
if not img_name:
raise VimException("Undefined image(%s)" % vm["image_file"], ERR_CODE)
images = api.list_image(vim_id, tenant_id)
- for image in images["imageList"]:
+ for image in images["images"]:
if img_name == image["name"]:
param["boot"]["imageId"] = image["id"]
break
"fileName": inject_data["file_name"],
"fileData": inject_data["file_data"]
})
- for vol_data in vm["volume_storages"]:
+ for vol_data in ignore_case_get(vm, "volume_storages"):
vol_id = vol_data["volume_storage_id"]
param["volumeArray"].append({
"volumeId": get_res_id(res_cache, RES_VOLUME, vol_id)
ret = api.create_vm(vim_id, tenant_id, param)
do_notify(res_type, ret)
- vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"]
+ #vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"]
+ vm_id, return_code = ret["id"], ret["returnCode"]
+ if ignore_case_get(ret, "name"):
+ vm_name = vm["properties"]["name"]
+ logger.debug("vm_name:%s" % vm_name)
opt_vm_status = "Timeout"
retry_count, max_retry_count = 0, 100
while retry_count < max_retry_count: