X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=83727f2dd20e19a2a81e822c30c0300762ad3f44;hb=3e5e393882d6c7b2cf1252d6b2ae4944efb7fe85;hp=9ca3e8deee7dac05977e9f22b949dbf869e24b04;hpb=b04be0ef54a804315289e34fa0676f60582a06fa;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 9ca3e8de..83727f2d 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -14,12 +14,15 @@ 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__) @@ -65,8 +68,71 @@ def get_res_id(res_cache, res_type, key): 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"] + logger.debug("%s,%s,%s,%s", vimId, tenantId, res_id, param) + 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"] + 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, resid) + logger.error("%s:%s", e.http_code, e.message) + raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid)) + + +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"): @@ -101,11 +167,11 @@ def delete_vim_res(data, do_notify): 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) @@ -131,7 +197,7 @@ def create_network(vim_cache, res_cache, network, do_notify, res_type): 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")) @@ -191,7 +257,7 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"]) param = { "networkId": network_id, - "name": port["properties"].get("name", "undefined") + "name": port["cp_id"] } set_opt_val(param, "subnetId", subnet_id) set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address")) @@ -200,8 +266,17 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): 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) @@ -211,47 +286,11 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) -def parse_unit(val, base_unit): - recognized_units = ["B", "kB", "KiB", "MB", "MiB", "GB", "GiB", "TB", "TiB"] - units_rate = [1, 1000, 1024, 1000000, 1048576, 1000000000, 1073741824, 1000000000000, 1099511627776] - unit_rate_map = {unit.upper(): rate for unit, rate in zip(recognized_units, units_rate)} - num_unit = val.strip().split(" ") - if len(num_unit) != 2: - return val.strip - num, unit = num_unit[0], num_unit[1] - 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): - 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 - - 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 = { @@ -261,40 +300,36 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): "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") + # Get flavor id from OOF + vdu_id = ignore_case_get(flavor, "vdu_id", "") + flavor_id = "" + for one_vdu in location_info["vduInfo"]: + if one_vdu["vduName"] == vdu_id: + flavor_id = ignore_case_get(one_vdu, "flavorId", "") + break - # 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"]) + # Add check if OOF return flavor id has value + # If value is not None, we use it. + # If value is None, we will create flavor again. + if flavor_id: + set_res_cache(res_cache, res_type, flavor["vdu_id"], 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"]) @@ -318,7 +353,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): 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) @@ -329,9 +364,9 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): 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) @@ -348,13 +383,15 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): "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 ret = api.create_vm(vim_id, tenant_id, param) + ret["ports"] = [nic.get("portId") for nic in param["nicArray"]] do_notify(res_type, ret) vm_id = ret["id"] if ignore_case_get(ret, "name"): @@ -365,7 +402,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): while retry_count < max_retry_count: vm_info = api.get_vm(vim_id, tenant_id, vm_id) if vm_info["status"].upper() == "ACTIVE": - logger.debug("Vm(%s) is active", vim_id) + logger.debug("Vm(%s) is active", vm_id) return if vm_info["status"].upper() == "ERROR": opt_vm_status = vm_info["status"] @@ -373,3 +410,131 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): time.sleep(2) retry_count = retry_count + 1 raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status), ERR_CODE) + + +def list_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_ref_vdu_id = ignore_case_get(port, "vdu_id") + for vdu in ignore_case_get(data, "vdus"): + if vdu["vdu_id"] == port_ref_vdu_id: + location_info = vdu["properties"]["location_info"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + break + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.list_vm_port(vim_id, tenant_id, vm_id) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) + + return ret + + +def get_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "cp_id") + port_ref_vdu_id = ignore_case_get(port, "vdu_id") + for vdu in ignore_case_get(data, "vdus"): + if vdu["vdu_id"] == port_ref_vdu_id: + location_info = vdu["properties"]["location_info"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + break + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.get_vm_port(vim_id, tenant_id, vm_id, port_id) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) + + return ret + + +def create_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "port_id") + port_ref_vdu_id = ignore_case_get(port, "vdu_id") + for vdu in ignore_case_get(data, "vdus"): + if vdu["vdu_id"] == port_ref_vdu_id: + location_info = vdu["properties"]["location_info"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + break + 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 = 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, + # "name": port["cp_id"] + # } + # set_opt_val(param, "subnetId", subnet_id) + # set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address")) + # ip_address = [] + # for one_protocol_data in port["properties"]["protocol_data"]: + # 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, "securityGroups", "") # TODO + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + + # ip_address = ignore_case_get(ignore_case_get(port, "properties"), "ip_address") + param = { + "interfaceAttachment": { + "port_id": port_id + } + } + ret = api.create_vm_port(vim_id, tenant_id, vm_id, param) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + + +def delete_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "cp_id") + port_ref_vdu_id = ignore_case_get(port, "vdu_id") + for vdu in ignore_case_get(data, "vdus"): + if vdu["vdu_id"] == port_ref_vdu_id: + location_info = vdu["properties"]["location_info"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + break + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.delete_vm_port(vim_id, tenant_id, vm_id, port_id) + ret["nodeId"] = port["cp_id"] + do_notify("delete", res_type, port_id) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"])