import logging
import time
+import ast
from lcm.pub.utils.values import ignore_case_get, set_opt_val
from lcm.pub.msapi.aai import get_flavor_info
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)
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"))
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")
}
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"] # l3 is not 13
+ fixed_ip_address = ignore_case_get(l3_address_data, "fixed_ip_address")
+ ip_address.extend(fixed_ip_address)
+ 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"]
set_res_cache(res_cache, res_type, port["cp_id"], ret["id"])
-def search_flavor_aai(vim_id, memory_page_size):
+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[0]["flavors"]["flavor"]
+ aai_flavor = aai_flavors["flavor"]
for one_aai_flavor in aai_flavor:
- hpa_capabilities = one_aai_flavor["hpa-capabilities"]
+ 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_value = one_hpa_attr["hpa-attribute-value"]["value"]
- if hpa_key == "memoryPageSize" and int(hpa_value) == memory_page_size:
+ 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
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_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(virtual_compute["virtual_cpu"]["num_virtual_cpu"]),
- "memory": int(virtual_compute["virtual_memory"]["virtual_mem_size"].replace('MB', '').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
}
# just do memory huge page
flavor_extra_specs = ""
- vdu_memory_requirements = virtual_compute["virtual_memory"]["vdu_memory_requirements"]
+ 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:mem_page_size=%sMB" % memory_page_size)
+ flavor_extra_specs = {"hw": memory_page_size, } # TODO
logger.debug("flavor_extra_specs:%s" % flavor_extra_specs)
- # search aai flavor
- aai_flavor = search_flavor_aai(vim_id, memory_page_size)
+ # FIXME: search aai flavor
+ aai_flavor = search_flavor_aai(vim_id, memory_page_size, "MB")
# add aai flavor
if aai_flavor:
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())
+ 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":
"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"]
+ for artifact in vm["artifacts"]:
+ if artifact["artifact_name"] == "sw_image":
+ # TODO: after DM define
+ img_name = 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)
+ raise VimException("Undefined artifacts image(%s)" % vm["artifacts"], ERR_CODE)
elif vm["volume_storages"]:
param["boot"]["type"] = BOOT_FROM_VOLUME
vol_id = vm["volume_storages"][0]["volume_storage_id"]
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({
})
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, "userdata", ignore_case_get(vm["properties"], "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