X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=348561978f3a3df5208e394f24ef9679b5691a90;hb=653ba9efebb7d28d9ee3a7e09aea9d34af63a2be;hp=bf57b355a2f455ae7160ab405a99fa4d187b95d9;hpb=583f46a5118119384c23a0104b21698f80691a4a;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index bf57b355..34856197 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -13,11 +13,10 @@ # 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 @@ -34,6 +33,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 +47,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 +55,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,6 +63,7 @@ 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 = {}, {} for vol in ignore_case_get(data, "volume_storages"): @@ -71,25 +74,29 @@ 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: - if 1 == res["is_predefined"]: + 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 = { @@ -104,7 +111,7 @@ def create_volume(vim_cache, res_cache, vol, do_notify, res_type): 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: @@ -115,7 +122,8 @@ 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"] param = { @@ -133,7 +141,8 @@ 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"]) @@ -157,14 +166,15 @@ 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"]: + if port["cp_id"] not in vdu["cps"]: vdu["cps"].append(port["cp_id"]) break if not location_info: @@ -177,13 +187,13 @@ 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["properties"].get("name", "undefined") } 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 + 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) @@ -191,44 +201,79 @@ 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 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"] - local_storages = ignore_case_get(data, "local_storages") + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + virtual_compute = flavor["virtual_compute"] 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(virtual_compute["virtual_cpu"]["num_virtual_cpu"]), + "memory": int(virtual_compute["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()) - 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"]) - + + # 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 = { - "name": vm["properties"].get("name","undefined"), + "name": vm["properties"].get("name", "undefined"), "flavorId": get_res_id(res_cache, RES_FLAVOR, vm["vdu_id"]), "boot": {}, "nicArray": [], @@ -241,8 +286,8 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): 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 + 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) @@ -275,17 +320,16 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): }) 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", "") # 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, 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"].get("name","undefined") + 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