X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=9cbc7b16106d2a3ad4c2deb04c3f1c8173979063;hb=3340d1d7039d56457cca112c93351ad326ea22cd;hp=b63cf1eefa7f4615e33cc28bce7fc30846a3f5f3;hpb=2b7749ec69c06af3431bf9666c7c175a38762866;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index b63cf1ee..9cbc7b16 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -26,7 +26,8 @@ logger = logging.getLogger(__name__) ERR_CODE = "500" RES_EXIST, RES_NEW = 0, 1 IP_V4, IP_V6 = 4, 6 -DHCP_DISABLED, DHCP_ENABLED = 0, 1 +BOOT_FROM_VOLUME, BOOT_FROM_IMAGE = 1, 2 + RES_VOLUME = "volume" RES_NETWORK = "network" RES_SUBNET = "subnet" @@ -35,8 +36,6 @@ RES_FLAVOR = "flavor" RES_VM = "vm" -BOOT_FROM_VOLUME = 1 - def get_tenant_id(vim_cache, vim_id, tenant_name): if vim_id not in vim_cache: tenants = api.list_tenant(vim_id) @@ -71,11 +70,11 @@ def create_vim_res(data, do_notify): for subnet in ignore_case_get(data, "vls"): 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, port, do_notify, RES_PORT) + 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, vm, do_notify, RES_VM) + create_vm(vim_cache, res_cache, data, vm, 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] @@ -94,7 +93,7 @@ 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()) } set_opt_val(param, "imageName", ignore_case_get(vol, "image_file")) set_opt_val(param, "volumeType", ignore_case_get(vol["properties"], "custom_volume_type")) @@ -102,6 +101,7 @@ def create_volume(vim_cache, res_cache, vol, do_notify, res_type): 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"] set_res_cache(res_cache, res_type, vol["volume_storage_id"], vol_id) @@ -129,6 +129,7 @@ def create_network(vim_cache, res_cache, network, do_notify, res_type): 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"]) @@ -156,22 +157,34 @@ def create_subnet(vim_cache, res_cache, subnet, do_notify, res_type): do_notify(res_type, ret) set_res_cache(res_cache, res_type, subnet["vl_id"], ret["id"]) -def create_port(vim_cache, res_cache, port, do_notify, res_type): - location_info = port["properties"]["location_info"] - network_id = get_res_id(res_cache, RES_NETWORK, port["vl_id"]) - subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_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"] + 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 = { "networkId": network_id, - "subnetId": subnet_id, "name": port["properties"]["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 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) + 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"]) @@ -181,7 +194,7 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): param = { "name": "Flavor_%s" % flavor["vdu_id"], "vcpu": int(flavor["nfv_compute"]["num_cpus"]), - "memory": '', + "memory": int(flavor["nfv_compute"]["mem_size"].replace('GB', '').strip()), "isPublic": True } for local_storage_id in ignore_case_get(flavor, "local_storages"): @@ -189,7 +202,7 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): 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()) + disk_size = int(local_storage["properties"]["size"].replace('GB', '').strip())*1024 if disk_type == "root": param["disk"] = disk_size elif disk_type == "ephemeral": @@ -207,36 +220,70 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): do_notify(res_type, ret) set_res_cache(res_cache, res_type, flavor["vdu_id"], ret["id"]) -def create_vm(vim_cache, res_cache, vm, do_notify, res_type): +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"]["name"], + "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) + 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, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] 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 @@ -246,5 +293,3 @@ def create_vm(vim_cache, res_cache, vm, do_notify, res_type): time.sleep(2) retry_count = retry_count + 1 raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status), ERR_CODE) - -