X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=b79aaacadf5030f4ca052ad4ac7ba7c96fd584d5;hb=e9135613d23b622dfe02f872a8a95da690ed1c95;hp=27b6433680aab19d8699dbac6729ab460f509dda;hpb=ef2d340df0bcb7a662628884b7506df9ccf85bd5;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 27b64336..b79aaaca 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -107,7 +107,7 @@ def operate_vim_res(data, changeStateTo, stopType, gracefulStopTimeout, do_notif do_notify_op("INACTIVE", res["id"]) except VimException as e: logger.error("Failed to Operate %s(%s)", RES_VM, res["res_id"]) - logger.error("%s:%s", e.http_code, e.message) + logger.error("%s:%s", e.http_code, e.args[0]) raise NFLCMException("Failed to Operate %s(%s)", RES_VM, res["res_id"]) @@ -128,7 +128,7 @@ def heal_vim_res(vdus, vnfd_info, do_notify, data, vim_cache, res_cache): action_vm(ACTION_TYPE.REBOOT, vm_info, vimid, tenant) except VimException as e: logger.error("Failed to Heal %s(%s)", RES_VM, resid) - logger.error("%s:%s", e.http_code, e.message) + logger.error("%s:%s", e.http_code, e.args[0]) raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid)) @@ -160,7 +160,7 @@ def delete_vim_res(data, do_notify): 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) + logger.error("%s:%s", e.http_code, e.args[0]) do_notify(res_type, res["res_id"]) @@ -252,7 +252,10 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): 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: + if port["vl_id"] == "": + return 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 = { @@ -262,13 +265,17 @@ 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")) ip_address = [] + logger.debug("port['properties']:%s" % port["properties"]) 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) for one_virtual_network_interface in port["properties"].get("virtual_network_interface_requirements", []): - interfaceTypeString = one_virtual_network_interface["network_interface_requirements"]["interfaceType"] - interfaceType = json.loads(interfaceTypeString)["configurationValue"] + network_interface_requirements = one_virtual_network_interface["network_interface_requirements"] + interfaceTypeString = ignore_case_get(network_interface_requirements, "interfaceType") + interfaceType = "" + if interfaceTypeString != "": + interfaceType = json.loads(interfaceTypeString)["configurationValue"] vnic_type = ignore_case_get(port["properties"], "vnic_type") if vnic_type == "": if interfaceType == "SR-IOV": @@ -290,7 +297,7 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): location_info = flavor["properties"]["location_info"] vim_id, tenant_name = location_info["vimid"], location_info["tenant"] virtual_compute = flavor["virtual_compute"] - virtual_storages = flavor["virtual_storages"] + virtual_storages = ignore_case_get(flavor, "virtual_storages") virtual_cpu = ignore_case_get(virtual_compute, "virtual_cpu") virtual_memory = ignore_case_get(virtual_compute, "virtual_memory") param = { @@ -314,18 +321,26 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): if flavor_id: set_res_cache(res_cache, res_type, flavor["vdu_id"], flavor_id) else: - for virtual_storage in virtual_storages: - vs_id = virtual_storage["virtual_storage_id"] - for vs in data["volume_storages"]: - if vs["volume_storage_id"] == vs_id: - disk_type = ignore_case_get(vs["properties"], "type_of_storage") - disk_size = int(ignore_case_get(vs["properties"], "size_of_storage").replace('GB', '').replace('"', '').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 + if virtual_storages: + for virtual_storage in virtual_storages: + vs_id = virtual_storage["virtual_storage_id"] + for vs in data["volume_storages"]: + if vs["volume_storage_id"] == vs_id: + disk_type = ignore_case_get(vs["properties"], "type_of_storage") + size_of_storage = ignore_case_get(vs["properties"], "size_of_storage") + disk_size = int(size_of_storage.replace('GB', '').replace('"', '').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 + else: + virtual_storages = ignore_case_get(virtual_compute, "virtual_storages") + size_of_storage = ignore_case_get(virtual_storages[0], "size_of_storage") + disk_size = int(size_of_storage.replace('GB', '').replace('"', '').strip()) + param["disk"] = disk_size + 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) @@ -375,7 +390,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): param["nicArray"].append({ "portId": get_res_id(res_cache, RES_PORT, cp_id) }) - param["contextArray"] = ignore_case_get(vm["properties"], "inject_files") + 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"] @@ -383,7 +398,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): "volumeId": get_res_id(res_cache, RES_VOLUME, vol_id) }) - user_data = base64.encodestring(ignore_case_get(vm["properties"], "user_data")) + user_data = base64.b64encode(bytes(ignore_case_get(vm["properties"], "user_data"), "utf-8")).decode("utf-8") set_opt_val(param, "availabilityZone", ignore_case_get(location_info, "availability_zone")) set_opt_val(param, "userdata", user_data) set_opt_val(param, "metadata", ignore_case_get(vm["properties"], "meta_data")) @@ -391,6 +406,9 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): set_opt_val(param, "serverGroup", "") # TODO the ServerGroup for anti-affinity and affinity ret = api.create_vm(vim_id, tenant_id, param) + ret["ports"] = [nic.get("portId") for nic in param["nicArray"]] + ret["vimId"] = vim_id + ret["tenantId"] = tenant_id do_notify(res_type, ret) vm_id = ret["id"] if ignore_case_get(ret, "name"): @@ -513,7 +531,7 @@ def create_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): } ret = api.create_vm_port(vim_id, tenant_id, vm_id, param) ret["nodeId"] = port["cp_id"] - do_notify(res_type, ret) + do_notify("create", res_type, ret) def delete_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type):