import logging
import time
-import ast
+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
from . import api
from .exceptions import VimException
+from lcm.pub.exceptions import NFLCMException
+from lcm.nf.const import ACTION_TYPE, HEAL_ACTION_TYPE
logger = logging.getLogger(__name__)
return res_cache[res_type][key]
-def create_vim_res(data, do_notify):
- vim_cache, res_cache = {}, {}
+def action_vm(action_type, server, vimId, tenantId):
+ param = {}
+ if action_type == ACTION_TYPE.START:
+ param = {
+ "os-start": None,
+ }
+ elif action_type == ACTION_TYPE.STOP:
+ param = {
+ "os-stop": None,
+ }
+ elif action_type == ACTION_TYPE.REBOOT:
+ param = {
+ "reboot": {}
+ }
+ if server["status"] == "ACTIVE":
+ param["reboot"]["type"] = "SOFT"
+ else:
+ param["reboot"]["type"] = "HARD"
+ res_id = server["id"]
+ api.action_vm(vimId, tenantId, res_id, param)
+
+
+# TODO Have to check if the resources should be started and stopped in some order.
+def operate_vim_res(data, changeStateTo, stopType, gracefulStopTimeout, do_notify_op):
+ for res in ignore_case_get(data, "vm"):
+ try:
+ if changeStateTo == "STARTED":
+ action_vm(ACTION_TYPE.START, res, res["vim_id"], res["tenant_id"])
+ do_notify_op("ACTIVE", res["id"])
+ elif changeStateTo == "STOPPED":
+ if stopType == "GRACEFUL":
+ if gracefulStopTimeout > 60:
+ gracefulStopTimeout = 60
+ time.sleep(gracefulStopTimeout)
+ action_vm(ACTION_TYPE.STOP, res, res["vim_id"], res["tenant_id"])
+ do_notify_op("INACTIVE", res["id"])
+ except VimException as e:
+ logger.error("Failed to Operate %s(%s)", RES_VM, res["res_id"])
+ logger.error("%s:%s", e.http_code, e.message)
+ raise NFLCMException("Failed to Operate %s(%s)", RES_VM, res["res_id"])
+
+
+def heal_vim_res(vdus, vnfd_info, do_notify, data, vim_cache, res_cache):
+ try:
+ vimid = data["vimid"]
+ tenant = data["tenant"]
+ actionType = data["action"]
+ if actionType == HEAL_ACTION_TYPE.START:
+ create_vm(vim_cache, res_cache, vnfd_info, vdus[0], do_notify, RES_VM)
+ elif actionType == HEAL_ACTION_TYPE.RESTART:
+ vm_info = api.get_vm(vimid, tenant, vdus[0].resourceid)
+ 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("%s:%s", e.http_code, e.message)
+ raise NFLCMException("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"])
+
+
+def create_vim_res(data, do_notify, vim_cache={}, res_cache={}):
for vol in ignore_case_get(data, "volume_storages"):
create_volume(vim_cache, res_cache, vol, do_notify, RES_VOLUME)
for network in ignore_case_get(data, "vls"):
def create_volume(vim_cache, res_cache, vol, do_notify, res_type):
location_info = vol["properties"]["location_info"]
param = {
- "name": vol["properties"]["volume_name"],
- "volumeSize": int(ignore_case_get(vol["properties"], "size", "0").replace('GB', '').strip())
+ "name": vol["properties"]["volume_name"] if vol["properties"].get("volume_name", None) else vol["volume_storage_id"],
+ "volumeSize": int(ignore_case_get(vol["properties"], "size_of_storage", "0").replace('GB', '').replace('"', '').strip())
}
set_opt_val(param, "imageName", ignore_case_get(vol, "image_file"))
- set_opt_val(param, "volumeType", ignore_case_get(vol["properties"], "custom_volume_type"))
+ set_opt_val(param, "volumeType", ignore_case_get(vol["properties"], "type_of_storage"))
set_opt_val(param, "availabilityZone", ignore_case_get(location_info, "availability_zone"))
vim_id, tenant_name = location_info["vimid"], location_info["tenant"]
tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name)
param = {
"name": vl_profile["networkName"],
"shared": False,
- "networkType": vl_profile["networkType"],
+ "networkType": ignore_case_get(vl_profile, "networkType"),
"physicalNetwork": ignore_case_get(vl_profile, "physicalNetwork")
}
set_opt_val(param, "vlanTransparent", ignore_case_get(vl_profile, "vlanTransparent"))
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"))
l3_address_data = one_protocol_data["address_data"]["l3_address_data"] # l3 is not 13
fixed_ip_address = ignore_case_get(l3_address_data, "fixed_ip_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)["configurationValue"]
+ vnic_type = ignore_case_get(port["properties"], "vnic_type")
+ if vnic_type == "":
+ if interfaceType == "SR-IOV":
+ set_opt_val(param, "vnicType", "direct")
+ else:
+ set_opt_val(param, "vnicType", vnic_type)
+
set_opt_val(param, "ip", ",".join(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)
return int(num) * unit_rate_map[unit.upper()] / unit_rate_map[base_unit.upper()]
-def search_flavor_aai(vim_id, memory_page_size, memory_page_unit):
+def search_flavor_aai(vim_id, flavor_name):
aai_flavors = get_flavor_info(vim_id)
if not aai_flavors:
return None
- logger.debug("aai_flavors:%s" % aai_flavors)
aai_flavor = aai_flavors["flavor"]
for one_aai_flavor in aai_flavor:
- if one_aai_flavor["flavor-name"].find("onap.") == -1:
- continue
- hpa_capabilities = one_aai_flavor["hpa-capabilities"]["hpa-capability"]
- logger.debug("hpa_capabilities=%s", hpa_capabilities)
- for one_hpa_capa in hpa_capabilities:
- logger.debug("one_hpa_capa=%s", one_hpa_capa)
- hpa_feature_attr = one_hpa_capa["hpa-feature-attributes"]
- for one_hpa_attr in hpa_feature_attr:
- hpa_key = one_hpa_attr["hpa-attribute-key"]
- hpa_attr_value = ast.literal_eval(one_hpa_attr["hpa-attribute-value"])
- mem_size = ignore_case_get(hpa_attr_value, 'value')
- mem_unit = ignore_case_get(hpa_attr_value, 'unit')
- value = mem_size + " " + mem_unit
- hpa_mem_size = parse_unit(value, memory_page_unit)
- if hpa_key == "memoryPageSize" and hpa_mem_size == memory_page_size:
- return one_aai_flavor
+ if one_aai_flavor["flavor-name"].find(flavor_name) == -1:
+ return one_aai_flavor
+
+ return None
def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type):
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 = {
"isPublic": True
}
- # just do memory huge page
- flavor_extra_specs = ""
- vdu_memory_requirements = ignore_case_get(virtual_memory, "vdu_memory_requirements")
- if "memoryPageSize" in vdu_memory_requirements:
- memory_page_size = int(vdu_memory_requirements["memoryPageSize"].replace('MB', '').strip())
- flavor_extra_specs = {"hw": memory_page_size, } # TODO
- logger.debug("flavor_extra_specs:%s" % flavor_extra_specs)
-
- # FIXME: search aai flavor
- aai_flavor = search_flavor_aai(vim_id, memory_page_size, "MB")
+ # 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
- # add aai flavor
+ # Add aai flavor
if aai_flavor:
ret = aai_flavor
do_notify(res_type, ret)
set_res_cache(res_cache, res_type, flavor["vdu_id"], ret["flavor-id"])
else:
- extra_specs = []
- 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 es in flavor_extra_specs:
- extra_specs.append({"keyName": es, "value": flavor_extra_specs[es]})
-
- set_opt_val(param, "extraSpecs", extra_specs)
+ 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)
+ logger.debug("hhb ret:%s" % ret)
do_notify(res_type, ret)
set_res_cache(res_cache, res_type, flavor["vdu_id"], ret["id"])
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
Code Review / vfc / gvnfm / vnflcm.git / blobdiff