X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=348561978f3a3df5208e394f24ef9679b5691a90;hb=653ba9efebb7d28d9ee3a7e09aea9d34af63a2be;hp=254fe9b370d2b6a0f42f9a13345b6a914607f07f;hpb=fe5e9f995c124835e181cd8a987263ad3c24f0db;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 254fe9b3..34856197 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -13,29 +13,28 @@ # limitations under the License. import logging -import sys import time -import traceback 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 logger = logging.getLogger(__name__) +ERR_CODE = "500" RES_EXIST, RES_NEW = 0, 1 -NET_PRIVATE, NET_SHSRED = 0, 1 -VLAN_TRANSPARENT_NO, VLAN_TRANSPARENT_YES = 0, 1 IP_V4, IP_V6 = 4, 6 -DHCP_DISABLED, DHCP_ENABLED = 0, 1 -OPT_CREATE_VOLUME = 20 -OPT_CREATE_NETWORK = 30 -OPT_CREATE_SUBNET = 40 -OPT_CREATE_PORT = 50 -OPT_CREATE_FLAVOR = 60 -OPT_CREATE_VM = 80 +BOOT_FROM_VOLUME, BOOT_FROM_IMAGE = 1, 2 + +RES_VOLUME = "volume" +RES_NETWORK = "network" +RES_SUBNET = "subnet" +RES_PORT = "port" +RES_FLAVOR = "flavor" +RES_VM = "vm" +NOT_PREDEFINED = 1 -BOOT_FROM_VOLUME = 1 def get_tenant_id(vim_cache, vim_id, tenant_name): if vim_id not in vim_cache: @@ -45,52 +44,75 @@ def get_tenant_id(vim_cache, vim_id, tenant_name): id, name = tenant["id"], tenant["name"] vim_cache[vim_id][name] = id if tenant_name not in vim_cache[vim_id]: - raise VimException("Tenant(%s) not found in vim(%s)" % (tenant_name, vim_id), "500") + 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] = {} + if key in res_cache[res_type]: + 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) + if key not in res_cache[res_type]: + 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 = {} + vim_cache, res_cache = {}, {} for vol in ignore_case_get(data, "volume_storages"): - create_volume(vim_cache, vol, do_notify, OPT_CREATE_VOLUME) + create_volume(vim_cache, res_cache, vol, do_notify, RES_VOLUME) for network in ignore_case_get(data, "vls"): - create_network(vim_cache, network, do_notify, OPT_CREATE_NETWORK) + create_network(vim_cache, res_cache, network, do_notify, RES_NETWORK) for subnet in ignore_case_get(data, "vls"): - create_subnet(vim_cache, subnet, do_notify, OPT_CREATE_SUBNET) + create_subnet(vim_cache, res_cache, subnet, do_notify, RES_SUBNET) for port in ignore_case_get(data, "cps"): - create_port(vim_cache, port, do_notify, OPT_CREATE_PORT) - for flavor in ignore_case_get(data, "vdus"): - create_flavor(vim_cache, flavor, do_notify, OPT_CREATE_FLAVOR) - for vm in ignore_case_get(data, "vdus"): - create_vm(vim_cache, vm, do_notify, OPT_CREATE_VM) + create_port(vim_cache, res_cache, data, port, do_notify, RES_PORT) + 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 = ["vm", "flavor", "port", "subnet", "network", "volume"] - res_del_funs = [api.delete_vm, api.delete_flavor, api.delete_port, - api.delete_subnet, api.delete_network, api.delete_volume] + 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] 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, vol, do_notify, progress): + +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")) + "volumeSize": int(ignore_case_get(vol["properties"], "size", "0").replace('GB', '').strip()) } - location_info = vol["properties"]["location_info"] 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, "availabilityZone", ignore_case_get(location_info, "availability_zone")) - vim_id = location_info["vimid"] - tenant_name = location_info["tenant"] + 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) - do_notify(progress, ret) - vol_id, vol_name, return_code = ret["id"], ret["name"], ret["returnCode"] + ret["nodeId"] = vol["volume_storage_id"] + do_notify(res_type, ret) + 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: vol_info = api.get_volume(vim_id, tenant_id, vol_id) @@ -99,33 +121,38 @@ def create_volume(vim_cache, vol, do_notify, progress): return time.sleep(2) retry_count = retry_count + 1 - raise VimException("Failed to create Volume(%s): Timeout." % vol_name, "500") - -def create_network(vim_cache, network, do_notify, progress): + 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"] param = { - "tenant": network["properties"]["location_info"]["tenant"], - "networkName": network["properties"]["network_name"], - "shared": NET_PRIVATE, + "name": network["properties"]["network_name"], + "shared": False, "networkType": network["properties"]["network_type"], "physicalNetwork": ignore_case_get(network["properties"], "physical_network") } - set_opt_val(param, "vlanTransparent", - ignore_case_get(network["properties"], "vlan_transparent"), VLAN_TRANSPARENT_YES) - set_opt_val(param, "segmentationId", ignore_case_get(network["properties"], "segmentation_id")) - vim_id = network["properties"]["location_info"]["vimid"] - ret = api.create_network(vim_id, param) - do_notify(progress, ret) - -def create_subnet(vim_cache, subnet, do_notify, progress): + 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, "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) + ret = api.create_network(vim_id, tenant_id, param) + 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"]) param = { - "tenant": subnet["properties"]["location_info"]["tenant"], - "networkName": subnet["properties"]["network_name"], - "subnetName": subnet["properties"]["name"], + "networkId": network_id, + "name": subnet["properties"]["name"], "cidr": ignore_case_get(subnet["properties"], "cidr"), "ipVersion": ignore_case_get(subnet["properties"], "ip_version", IP_V4) } - set_opt_val(param, "enableDhcp", - ignore_case_get(subnet["properties"], "dhcp_enabled"), DHCP_ENABLED) + 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, "dnsNameservers", ignore_case_get(subnet["properties"], "dns_nameservers")) allocation_pool = {} @@ -134,62 +161,180 @@ def create_subnet(vim_cache, subnet, do_notify, progress): if allocation_pool: param["allocationPools"] = [allocation_pool] set_opt_val(param, "hostRoutes", ignore_case_get(subnet["properties"], "host_routes")) - vim_id = subnet["properties"]["location_info"]["vimid"] - ret = api.create_subnet(vim_id, param) - do_notify(progress, ret) - -def create_port(vim_cache, port, do_notify, progress): + 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) + 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" + 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 = { - "tenant": port["properties"]["location_info"]["tenant"], - "networkName": port["properties"]["network_name"], - "subnetName": port["properties"]["name"], - "portName": port["properties"]["name"] + "networkId": network_id, + "name": port["properties"].get("name", "undefined") } - vim_id = port["properties"]["location_info"]["vimid"] - ret = api.create_subnet(vim_id, param) - do_notify(progress, ret) + 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 + 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) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) -def create_flavor(vim_cache, flavor, do_notify, progress): + +def search_flavor_aai(vim_id, memory_page_size): + aai_flavors = get_flavor_info(vim_id) + if not aai_flavors: + return None + logger.debug("aai_flavors:%s" % aai_flavors) + aai_flavor = aai_flavors[0]["flavors"]["flavor"] + for one_aai_flavor in aai_flavor: + hpa_capabilities = one_aai_flavor["hpa-capabilities"] + for one_hpa_capa in hpa_capabilities: + 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_value = one_hpa_attr["hpa-attribute-value"]["value"] + if hpa_key == "memoryPageSize" and int(hpa_value) == 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"] param = { - "tenant": flavor["properties"]["location_info"]["tenant"], - "vcpu": int(flavor["nfv_compute"]["num_cpus"]), - "memory": int(flavor["nfv_compute"]["mem_size"].replace('MB', '').strip()) + "name": "Flavor_%s" % flavor["vdu_id"], + "vcpu": int(virtual_compute["virtual_cpu"]["num_virtual_cpu"]), + "memory": int(virtual_compute["virtual_memory"]["virtual_mem_size"].replace('MB', '').strip()), + "isPublic": True } - set_opt_val(param, "extraSpecs", ignore_case_get(flavor["nfv_compute"], "flavor_extra_specs")) - vim_id = flavor["properties"]["location_info"]["vimid"] - ret = api.create_flavor(vim_id, param) - do_notify(progress, ret) - -def create_vm(vim_cache, vm, do_notify, progress): + + # just do memory huge page + flavor_extra_specs = "" + vdu_memory_requirements = virtual_compute["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:mem_page_size=%sMB" % memory_page_size) + logger.debug("flavor_extra_specs:%s" % flavor_extra_specs) + + # search aai flavor + aai_flavor = search_flavor_aai(vim_id, memory_page_size) + + # 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 = virtual_compute["virtual_storage"]["type_of_storage"] + disk_size = int(virtual_compute["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) + 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) + 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 = { - "tenant": vm["properties"]["location_info"]["tenant"], - "vmName": vm["properties"]["name"], - "boot": { - "type": BOOT_FROM_VOLUME, - "volumeName": vm["volume_storages"][0]["volume_storage_id"] - }, + "name": vm["properties"].get("name", "undefined"), + "flavorId": get_res_id(res_cache, RES_FLAVOR, vm["vdu_id"]), + "boot": {}, "nicArray": [], "contextArray": [], "volumeArray": [] } - set_opt_val(param, "availabilityZone", - ignore_case_get(vm["properties"]["location_info"], "availability_zone")) + # set boot param + if "image_file" in vm and vm["image_file"]: + 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 + 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["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"]: + param["boot"]["type"] = BOOT_FROM_VOLUME + vol_id = vm["volume_storages"][0]["volume_storage_id"] + param["boot"]["volumeId"] = get_res_id(res_cache, RES_VOLUME, vol_id) + else: + raise VimException("No image and volume defined", ERR_CODE) + + for cp_id in ignore_case_get(vm, "cps"): + 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"] }) - for vol_data in vm["volume_storages"]: - param["contextArray"].append(vol_data["volume_storage_id"]) - # nicArray TODO: - vim_id = vm["properties"]["location_info"]["vimid"] - ret = api.create_vm(vim_id, param) - do_notify(progress, ret) - vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] + 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) + }) + + 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 + + ret = api.create_vm(vim_id, tenant_id, param) + do_notify(res_type, ret) + vm_id = ret["id"] + if ignore_case_get(ret, "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 while retry_count < max_retry_count: - vm_info = api.get_vm(vim_id, vm_id) + 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) return @@ -198,6 +343,4 @@ def create_vm(vim_cache, vm, do_notify, progress): break time.sleep(2) retry_count = retry_count + 1 - raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status), "500") - - + raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status), ERR_CODE)