Change-Id: I4a306a2328a2b53927ea4dd8d9cdc3e78d14392a
Issue-Id: GVNFM-49
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
c8_data_list_image = {
"vimid": "",
"vimname": "",
c8_data_list_image = {
"vimid": "",
"vimname": "",
{
"status": "active",
"id": "5e2757c1-f846-4727-915c-9a872553ed75",
{
"status": "active",
"id": "5e2757c1-f846-4727-915c-9a872553ed75",
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)
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"])
ret["nodeId"] = port["cp_id"]
do_notify(res_type, ret)
set_res_cache(res_cache, res_type, port["cp_id"], ret["id"])
if local_storage_id != local_storage["local_storage_id"]:
continue
disk_type = local_storage["properties"]["disk_type"]
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 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)
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
if img_name == image["name"]:
param["boot"]["imageId"] = image["id"]
break
def call(vim_id, tenant_id, res, method, data=''):
if data and not isinstance(data, (str, unicode)):
data = json.JSONEncoder().encode(data)
def call(vim_id, tenant_id, res, method, data=''):
if data and not isinstance(data, (str, unicode)):
data = json.JSONEncoder().encode(data)
- url = "{base_url}/{vim_id}{tenant_id}/{res}".format(
+ url = "{base_url}/{vim_id}/{tenant_id}/{res}".format(
base_url=VIM_DRIVER_BASE_URL,
vim_id=vim_id,
tenant_id="/" + tenant_id if tenant_id else "",
base_url=VIM_DRIVER_BASE_URL,
vim_id=vim_id,
tenant_id="/" + tenant_id if tenant_id else "",