X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=28c173dac4cc522dd861ddb047a085b81bdf7c1b;hb=15c96bf2692b7da348ea3c91cb04c64ddaeb7742;hp=e1d7537b66b1cb004c06c8f503919f27bbf32e79;hpb=33e38547c8345726d995318c46655ec5ffc81184;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index e1d7537b..28c173da 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -70,7 +70,7 @@ 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"): @@ -101,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) @@ -128,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"]) @@ -155,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"]) @@ -180,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": int(flavor["nfv_compute"]["mem_size"].replace('MB', '').strip()), + "memory": int(flavor["nfv_compute"]["mem_size"].replace('GB', '').strip()), "isPublic": True } for local_storage_id in ignore_case_get(flavor, "local_storages"): @@ -188,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": @@ -229,7 +243,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): 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["imageList"]: + for image in images["images"]: if img_name == image["name"]: param["boot"]["imageId"] = image["id"] break @@ -251,7 +265,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): "fileName": inject_data["file_name"], "fileData": inject_data["file_data"] }) - for vol_data in vm["volume_storages"]: + 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) @@ -265,11 +279,15 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): 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, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] + vm_id, return_code = ret["id"], ret["returnCode"] + if ignore_case_get(ret, "name"): + vm_name = vm["properties"]["name"] + 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