X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=3b959c450b63e2388afb58efc2bb0f7d3f3e917f;hb=0424858cefb1c6b8b06796304b04eff4af487937;hp=28c173dac4cc522dd861ddb047a085b81bdf7c1b;hpb=15c96bf2692b7da348ea3c91cb04c64ddaeb7742;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 28c173da..3b959c45 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -13,13 +13,17 @@ # limitations under the License. import logging -import sys import time -import traceback +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__) @@ -34,6 +38,7 @@ RES_SUBNET = "subnet" RES_PORT = "port" RES_FLAVOR = "flavor" RES_VM = "vm" +NOT_PREDEFINED = 1 def get_tenant_id(vim_cache, vim_id, tenant_name): @@ -47,6 +52,7 @@ def get_tenant_id(vim_cache, vim_id, tenant_name): raise VimException("Tenant(%s) not found in vim(%s)" % (tenant_name, vim_id), ERR_CODE) return vim_cache[vim_id][tenant_name] + def set_res_cache(res_cache, res_type, key, val): if res_type not in res_cache: res_cache[res_type] = {} @@ -54,6 +60,7 @@ def set_res_cache(res_cache, res_type, key, val): raise VimException("Duplicate key(%s) of %s" % (key, res_type), ERR_CODE) res_cache[res_type][key] = val + def get_res_id(res_cache, res_type, key): if res_type not in res_cache: raise VimException("%s not found in cache" % res_type, ERR_CODE) @@ -61,8 +68,66 @@ def get_res_id(res_cache, res_type, key): raise VimException("%s(%s) not found in cache" % (res_type, key), ERR_CODE) 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"): @@ -71,39 +136,44 @@ def create_vim_res(data, do_notify): create_subnet(vim_cache, res_cache, subnet, do_notify, RES_SUBNET) for port in ignore_case_get(data, "cps"): create_port(vim_cache, res_cache, data, port, do_notify, RES_PORT) - for flavor in ignore_case_get(data, "vdus"): - create_flavor(vim_cache, res_cache, data, flavor, do_notify, RES_FLAVOR) - for vm in ignore_case_get(data, "vdus"): - create_vm(vim_cache, res_cache, data, vm, do_notify, RES_VM) + for vdu in ignore_case_get(data, "vdus"): + if vdu["type"] == "tosca.nodes.nfv.Vdu.Compute": + create_flavor(vim_cache, res_cache, data, vdu, do_notify, RES_FLAVOR) + for vdu in ignore_case_get(data, "vdus"): + if vdu["type"] == "tosca.nodes.nfv.Vdu.Compute": + create_vm(vim_cache, res_cache, data, vdu, do_notify, RES_VM) + def delete_vim_res(data, do_notify): res_types = [RES_VM, RES_FLAVOR, RES_PORT, RES_SUBNET, RES_NETWORK, RES_VOLUME] - res_del_funs = [api.delete_vm, api.delete_flavor, api.delete_port, - api.delete_subnet, api.delete_network, api.delete_volume] + res_del_funs = [api.delete_vm, api.delete_flavor, api.delete_port, + api.delete_subnet, api.delete_network, api.delete_volume] for res_type, res_del_fun in zip(res_types, res_del_funs): for res in ignore_case_get(data, res_type): try: - res_del_fun(res["vim_id"], res["tenant_id"], res["res_id"]) + if NOT_PREDEFINED == res["is_predefined"]: + res_del_fun(res["vim_id"], res["tenant_id"], res["res_id"]) except VimException as e: logger.error("Failed to delete %s(%s)", res_type, res["res_id"]) logger.error("%s:%s", e.http_code, e.message) do_notify(res_type, res["res_id"]) + 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) ret = api.create_volume(vim_id, tenant_id, param) ret["nodeId"] = vol["volume_storage_id"] do_notify(res_type, ret) - vol_id, vol_name, return_code = ret["id"], ret["name"], ret["returnCode"] + vol_id, vol_name = ret["id"], ret["name"] set_res_cache(res_cache, res_type, vol["volume_storage_id"], vol_id) retry_count, max_retry_count = 0, 300 while retry_count < max_retry_count: @@ -114,17 +184,19 @@ def create_volume(vim_cache, res_cache, vol, do_notify, res_type): time.sleep(2) retry_count = retry_count + 1 raise VimException("Failed to create Volume(%s): Timeout." % vol_name, ERR_CODE) - + + def create_network(vim_cache, res_cache, network, do_notify, res_type): location_info = network["properties"]["location_info"] + vl_profile = network["properties"]["vl_profile"] param = { - "name": network["properties"]["network_name"], + "name": vl_profile["networkName"], "shared": False, - "networkType": network["properties"]["network_type"], - "physicalNetwork": ignore_case_get(network["properties"], "physical_network") + "networkType": ignore_case_get(vl_profile, "networkType"), + "physicalNetwork": ignore_case_get(vl_profile, "physicalNetwork") } - set_opt_val(param, "vlanTransparent", ignore_case_get(network["properties"], "vlan_transparent")) - set_opt_val(param, "segmentationId", int(ignore_case_get(network["properties"], "segmentation_id", "0"))) + set_opt_val(param, "vlanTransparent", ignore_case_get(vl_profile, "vlanTransparent")) + set_opt_val(param, "segmentationId", int(ignore_case_get(vl_profile, "segmentationId", "0"))) set_opt_val(param, "routerExternal", ignore_case_get(network, "route_external")) vim_id, tenant_name = location_info["vimid"], location_info["tenant"] tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) @@ -132,22 +204,25 @@ def create_network(vim_cache, res_cache, network, do_notify, res_type): ret["nodeId"] = network["vl_id"] do_notify(res_type, ret) set_res_cache(res_cache, res_type, network["vl_id"], ret["id"]) - + + def create_subnet(vim_cache, res_cache, subnet, do_notify, res_type): location_info = subnet["properties"]["location_info"] network_id = get_res_id(res_cache, RES_NETWORK, subnet["vl_id"]) + vl_profile = subnet["properties"]["vl_profile"] + layer_protocol = ignore_case_get(subnet["properties"]["connectivity_type"], "layer_protocol") param = { "networkId": network_id, - "name": subnet["properties"]["name"], - "cidr": ignore_case_get(subnet["properties"], "cidr"), - "ipVersion": ignore_case_get(subnet["properties"], "ip_version", IP_V4) + "name": vl_profile["networkName"] + "_subnet", + "cidr": ignore_case_get(vl_profile, "cidr"), + "ipVersion": IP_V4 if(layer_protocol == 'ipv4') else (IP_V6 if(layer_protocol == 'ipv6') else None) } - set_opt_val(param, "enableDhcp", ignore_case_get(subnet["properties"], "dhcp_enabled")) - set_opt_val(param, "gatewayIp", ignore_case_get(subnet["properties"], "gateway_ip")) + set_opt_val(param, "enableDhcp", ignore_case_get(vl_profile, "dhcpEnabled")) + set_opt_val(param, "gatewayIp", ignore_case_get(vl_profile, "gatewayIp")) set_opt_val(param, "dnsNameservers", ignore_case_get(subnet["properties"], "dns_nameservers")) allocation_pool = {} - set_opt_val(allocation_pool, "start", ignore_case_get(subnet["properties"], "start_ip")) - set_opt_val(allocation_pool, "end", ignore_case_get(subnet["properties"], "end_ip")) + set_opt_val(allocation_pool, "start", ignore_case_get(vl_profile, "startIp")) + set_opt_val(allocation_pool, "end", ignore_case_get(vl_profile, "endIp")) if allocation_pool: param["allocationPools"] = [allocation_pool] set_opt_val(param, "hostRoutes", ignore_case_get(subnet["properties"], "host_routes")) @@ -156,16 +231,19 @@ def create_subnet(vim_cache, res_cache, subnet, do_notify, res_type): ret = api.create_subnet(vim_id, tenant_id, param) do_notify(res_type, ret) set_res_cache(res_cache, res_type, subnet["vl_id"], ret["id"]) - + + def create_port(vim_cache, res_cache, data, port, do_notify, res_type): location_info = None 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" + 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") @@ -174,13 +252,27 @@ 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"]["name"] + "name": port["properties"].get("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 + 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) ret = api.create_port(vim_id, tenant_id, param) @@ -188,44 +280,84 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): do_notify(res_type, ret) 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, flavor_name): + aai_flavors = get_flavor_info(vim_id) + if not aai_flavors: + return None + aai_flavor = aai_flavors["flavor"] + for one_aai_flavor in 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"] - local_storages = ignore_case_get(data, "local_storages") + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + virtual_compute = flavor["virtual_compute"] + virtual_storages = flavor["virtual_storages"] + virtual_cpu = ignore_case_get(virtual_compute, "virtual_cpu") + virtual_memory = ignore_case_get(virtual_compute, "virtual_memory") param = { "name": "Flavor_%s" % flavor["vdu_id"], - "vcpu": int(flavor["nfv_compute"]["num_cpus"]), - "memory": int(flavor["nfv_compute"]["mem_size"].replace('GB', '').strip()), + "vcpu": int(ignore_case_get(virtual_cpu, "num_virtual_cpu")), + "memory": int(ignore_case_get(virtual_memory, "virtual_mem_size").replace('MB', '').strip()), "isPublic": True } - for local_storage_id in ignore_case_get(flavor, "local_storages"): - for local_storage in 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())*1024 - if disk_type == "root": - param["disk"] = disk_size - elif disk_type == "ephemeral": - param["ephemeral"] = disk_size - elif disk_type == "swap": - param["swap"] = disk_size - flavor_extra_specs = ignore_case_get(flavor["nfv_compute"], "flavor_extra_specs") - extra_specs = [] - for es in flavor_extra_specs: - extra_specs.append({"keyName": es, "value": flavor_extra_specs[es]}) - set_opt_val(param, "extraSpecs", extra_specs) - vim_id, tenant_name = location_info["vimid"], location_info["tenant"] - tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) - ret = api.create_flavor(vim_id, tenant_id, param) - do_notify(res_type, ret) - set_res_cache(res_cache, res_type, flavor["vdu_id"], ret["id"]) - + + # 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 + 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: + 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"]) + + def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): location_info = vm["properties"]["location_info"] vim_id, tenant_name = location_info["vimid"], location_info["tenant"] tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) param = { - "name": vm["properties"]["name"], + "name": vm["properties"].get("name", "undefined"), "flavorId": get_res_id(res_cache, RES_FLAVOR, vm["vdu_id"]), "boot": {}, "nicArray": [], @@ -233,25 +365,26 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): "volumeArray": [] } # set boot param - if "image_file" in vm and vm["image_file"]: + if "artifacts" in vm and vm["artifacts"]: param["boot"]["type"] = BOOT_FROM_IMAGE img_name = "" - for img in ignore_case_get(data, "image_files"): - if vm["image_file"] == img["image_file_id"]: - img_name = img["properties"]["name"] - break + for artifact in vm["artifacts"]: + if artifact["artifact_name"] == "sw_image": + # TODO: after DM define + img_name = os.path.basename(artifact["file"]) + break if not img_name: - raise VimException("Undefined image(%s)" % vm["image_file"], ERR_CODE) + raise VimException("Undefined image(%s)" % vm["artifacts"], ERR_CODE) images = api.list_image(vim_id, tenant_id) for image in images["images"]: if img_name == image["name"]: param["boot"]["imageId"] = image["id"] break if "imageId" not in param["boot"]: - raise VimException("Image(%s) not found in Vim(%s)" % (img_name, vim_id), ERR_CODE) - elif vm["volume_storages"]: + raise VimException("Undefined artifacts image(%s)" % vm["artifacts"], ERR_CODE) + 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) @@ -260,29 +393,26 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): param["nicArray"].append({ "portId": get_res_id(res_cache, RES_PORT, cp_id) }) - for inject_data in ignore_case_get(vm["properties"], "inject_data_list"): - param["contextArray"].append({ - "fileName": inject_data["file_name"], - "fileData": inject_data["file_data"] - }) + param["contextArray"] = ignore_case_get(vm["properties"], "inject_files") + logger.debug("contextArray:%s", param["contextArray"]) 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) }) + 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", "") # TODO Configuration information or scripts to use upon launch - set_opt_val(param, "metadata", "") # TODO [{"keyName": "foo", "value": "foo value"}] - 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 - + 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) do_notify(res_type, ret) - #vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] - vm_id, return_code = ret["id"], ret["returnCode"] + vm_id = ret["id"] if ignore_case_get(ret, "name"): - vm_name = vm["properties"]["name"] + vm_name = vm["properties"].get("name", "undefined") logger.debug("vm_name:%s" % vm_name) opt_vm_status = "Timeout" retry_count, max_retry_count = 0, 100