import logging
import time
import json
+import os
+import base64
from lcm.pub.utils.values import ignore_case_get, set_opt_val
from lcm.pub.msapi.aai import get_flavor_info
else:
param["reboot"]["type"] = "HARD"
res_id = server["id"]
+ logger.debug("%s,%s,%s,%s", vimId, tenantId, res_id, param)
api.action_vm(vimId, tenantId, res_id, param)
vimid = data["vimid"]
tenant = data["tenant"]
actionType = data["action"]
+ resid = ''
if actionType == HEAL_ACTION_TYPE.START:
+ resid = vdus[0]["vdu_id"]
create_vm(vim_cache, res_cache, vnfd_info, vdus[0], do_notify, RES_VM)
elif actionType == HEAL_ACTION_TYPE.RESTART:
+ resid = vdus[0].resourceid
+ logger.debug("Start restart vm(%s)", resid)
vm_info = api.get_vm(vimid, tenant, vdus[0].resourceid)
+ logger.debug("vminfo=%s", vm_info)
action_vm(ACTION_TYPE.REBOOT, vm_info, vimid, tenant)
except VimException as e:
- logger.error("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"])
+ logger.error("Failed to Heal %s(%s)", RES_VM, resid)
logger.error("%s:%s", e.http_code, e.message)
- raise NFLCMException("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"])
+ raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid))
def create_vim_res(data, do_notify, vim_cache={}, res_cache={}):
subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"])
param = {
"networkId": network_id,
- "name": port["properties"].get("name", "undefined")
+ "name": port["properties"].get("name", "")
}
set_opt_val(param, "subnetId", subnet_id)
set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address"))
ip_address.extend(fixed_ip_address)
for one_virtual_network_interface in port["properties"].get("virtual_network_interface_requirements", []):
interfaceTypeString = one_virtual_network_interface["network_interface_requirements"]["interfaceType"]
- interfaceType = json.loads(interfaceTypeString)["configuration-value"]
+ interfaceType = json.loads(interfaceTypeString)["configurationValue"]
vnic_type = ignore_case_get(port["properties"], "vnic_type")
if vnic_type == "":
if interfaceType == "SR-IOV":
location_info = flavor["properties"]["location_info"]
vim_id, tenant_name = location_info["vimid"], location_info["tenant"]
virtual_compute = flavor["virtual_compute"]
- virtual_storage = flavor["virtual_storage"]
+ virtual_storages = flavor["virtual_storages"]
virtual_cpu = ignore_case_get(virtual_compute, "virtual_cpu")
virtual_memory = ignore_case_get(virtual_compute, "virtual_memory")
param = {
# Using flavor name returned by OOF to search falvor
vdu_id = ignore_case_get(flavor, "vdu_id")
+ aai_flavor = None
for one_vdu in location_info["vduInfo"]:
if one_vdu["vduName"] == vdu_id:
+ aai_flavor = search_flavor_aai(vim_id, one_vdu["flavorName"])
break
- aai_flavor = search_flavor_aai(vim_id, one_vdu["flavorName"])
# Add aai flavor
if aai_flavor:
do_notify(res_type, ret)
set_res_cache(res_cache, res_type, flavor["vdu_id"], ret["flavor-id"])
else:
- disk_type = ignore_case_get(virtual_storage, "type_of_storage")
- disk_size = int(ignore_case_get(virtual_storage, "size_of_storage").replace('GB', '').strip())
- if disk_type == "root":
- param["disk"] = disk_size
- elif disk_type == "ephemeral":
- param["ephemeral"] = disk_size
- elif disk_type == "swap":
- param["swap"] = disk_size
-
+ for virtual_storage in virtual_storages:
+ vs_id = virtual_storage["virtual_storage_id"]
+ for vs in data["volume_storages"]:
+ if vs["volume_storage_id"] == vs_id:
+ disk_type = ignore_case_get(vs["properties"], "type_of_storage")
+ disk_size = int(ignore_case_get(vs["properties"], "size_of_storage").replace('GB', '').replace('"', '').strip())
+ if disk_type == "root":
+ param["disk"] = disk_size
+ elif disk_type == "ephemeral":
+ param["ephemeral"] = disk_size
+ elif disk_type == "swap":
+ param["swap"] = disk_size
tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name)
logger.debug("param:%s" % param)
ret = api.create_flavor(vim_id, tenant_id, param)
for artifact in vm["artifacts"]:
if artifact["artifact_name"] == "sw_image":
# TODO: after DM define
- img_name = artifact["file"]
+ img_name = os.path.basename(artifact["file"])
break
if not img_name:
raise VimException("Undefined image(%s)" % vm["artifacts"], ERR_CODE)
break
if "imageId" not in param["boot"]:
raise VimException("Undefined artifacts image(%s)" % vm["artifacts"], ERR_CODE)
- elif vm["volume_storages"]:
+ elif vm["virtual_storages"]:
param["boot"]["type"] = BOOT_FROM_VOLUME
- vol_id = vm["volume_storages"][0]["volume_storage_id"]
+ vol_id = vm["virtual_storages"][0]["virtual_storage_id"]
param["boot"]["volumeId"] = get_res_id(res_cache, RES_VOLUME, vol_id)
else:
raise VimException("No image and volume defined", ERR_CODE)
"volumeId": get_res_id(res_cache, RES_VOLUME, vol_id)
})
+ user_data = base64.encodestring(ignore_case_get(vm["properties"], "user_data"))
set_opt_val(param, "availabilityZone", ignore_case_get(location_info, "availability_zone"))
- set_opt_val(param, "userdata", ignore_case_get(vm["properties"], "user_data"))
+ set_opt_val(param, "userdata", user_data)
set_opt_val(param, "metadata", ignore_case_get(vm["properties"], "meta_data"))
set_opt_val(param, "securityGroups", "") # TODO List of names of security group
set_opt_val(param, "serverGroup", "") # TODO the ServerGroup for anti-affinity and affinity