X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=b7e9a34fbd5284b97c2fae1a40a5914b2c47fed1;hb=eb2b62f063e14a85a66cc8dfe54cf404b9099ef8;hp=e0d8cb7c3e386b8ce1dfcc1bc21b7580d21e54fa;hpb=98d7251bed2598fbe019c37efa3d123942e1cdb0;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index e0d8cb7c..b7e9a34f 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -16,6 +16,7 @@ import logging import time 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 @@ -32,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): @@ -72,10 +74,12 @@ 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): @@ -85,7 +89,7 @@ def delete_vim_res(data, do_notify): 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"]) @@ -122,14 +126,15 @@ def create_volume(vim_cache, res_cache, vol, do_notify, res_type): 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": 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) @@ -142,18 +147,20 @@ def create_network(vim_cache, res_cache, network, do_notify, res_type): 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")) @@ -187,7 +194,12 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): } 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")) + ip_address = [] + for one_protocol_data in port["properties"]["protocol_data"]: + l3_address_data = one_protocol_data["address_data"]["l3_address_data"] + fixed_ip_address = ignore_case_get(l3_address_data, "fixed_ip_address") + ip_address.extend(fixed_ip_address) + set_opt_val(param, "ip", 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"] @@ -198,37 +210,70 @@ 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 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):