X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=83727f2dd20e19a2a81e822c30c0300762ad3f44;hb=3e5e393882d6c7b2cf1252d6b2ae4944efb7fe85;hp=3b959c450b63e2388afb58efc2bb0f7d3f3e917f;hpb=4d830f4d202669d16c8baf6ef9ad1d8c67aa6c61;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 3b959c45..83727f2d 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -19,7 +19,6 @@ import os import base64 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 from lcm.pub.exceptions import NFLCMException @@ -88,6 +87,7 @@ def action_vm(action_type, server, vimId, tenantId): else: param["reboot"]["type"] = "HARD" res_id = server["id"] + logger.debug("%s,%s,%s,%s", vimId, tenantId, res_id, param) api.action_vm(vimId, tenantId, res_id, param) @@ -116,15 +116,20 @@ def heal_vim_res(vdus, vnfd_info, do_notify, data, vim_cache, res_cache): vimid = data["vimid"] tenant = data["tenant"] actionType = data["action"] + resid = '' if actionType == HEAL_ACTION_TYPE.START: + resid = vdus[0]["vdu_id"] create_vm(vim_cache, res_cache, vnfd_info, vdus[0], do_notify, RES_VM) elif actionType == HEAL_ACTION_TYPE.RESTART: + resid = vdus[0].resourceid + logger.debug("Start restart vm(%s)", resid) vm_info = api.get_vm(vimid, tenant, vdus[0].resourceid) + logger.debug("vminfo=%s", vm_info) action_vm(ACTION_TYPE.REBOOT, vm_info, vimid, tenant) except VimException as e: - logger.error("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"]) + logger.error("Failed to Heal %s(%s)", RES_VM, resid) logger.error("%s:%s", e.http_code, e.message) - raise NFLCMException("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"]) + raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid)) def create_vim_res(data, do_notify, vim_cache={}, res_cache={}): @@ -252,7 +257,7 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type): subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"]) param = { "networkId": network_id, - "name": port["properties"].get("name", "") + "name": port["cp_id"] } set_opt_val(param, "subnetId", subnet_id) set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address")) @@ -281,29 +286,6 @@ 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 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, flavor_name): - aai_flavors = get_flavor_info(vim_id) - if not aai_flavors: - return None - aai_flavor = aai_flavors["flavor"] - for one_aai_flavor in aai_flavor: - if one_aai_flavor["flavor-name"].find(flavor_name) == -1: - return one_aai_flavor - - return None - - 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"] @@ -318,19 +300,19 @@ def create_flavor(vim_cache, res_cache, data, flavor, do_notify, res_type): "isPublic": True } - # Using flavor name returned by OOF to search falvor - vdu_id = ignore_case_get(flavor, "vdu_id") - aai_flavor = None + # Get flavor id from OOF + vdu_id = ignore_case_get(flavor, "vdu_id", "") + flavor_id = "" for one_vdu in location_info["vduInfo"]: if one_vdu["vduName"] == vdu_id: - aai_flavor = search_flavor_aai(vim_id, one_vdu["flavorName"]) + flavor_id = ignore_case_get(one_vdu, "flavorId", "") break - # 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"]) + # Add check if OOF return flavor id has value + # If value is not None, we use it. + # If value is None, we will create flavor again. + 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"] @@ -409,6 +391,7 @@ 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"]] do_notify(res_type, ret) vm_id = ret["id"] if ignore_case_get(ret, "name"): @@ -419,7 +402,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): while retry_count < max_retry_count: 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) + logger.debug("Vm(%s) is active", vm_id) return if vm_info["status"].upper() == "ERROR": opt_vm_status = vm_info["status"] @@ -427,3 +410,131 @@ def create_vm(vim_cache, res_cache, data, 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) + + +def list_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + 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"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.list_vm_port(vim_id, tenant_id, vm_id) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) + + return ret + + +def get_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "cp_id") + 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"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.get_vm_port(vim_id, tenant_id, vm_id, port_id) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"]) + + return ret + + +def create_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "port_id") + 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"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + 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, + # "name": port["cp_id"] + # } + # set_opt_val(param, "subnetId", subnet_id) + # set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_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) + # 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"] + # vnic_type = ignore_case_get(port["properties"], "vnic_type") + # if vnic_type == "": + # if interfaceType == "SR-IOV": + # set_opt_val(param, "vnicType", "direct") + # else: + # set_opt_val(param, "vnicType", vnic_type) + # + # set_opt_val(param, "ip", ",".join(ip_address)) + # 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) + + # ip_address = ignore_case_get(ignore_case_get(port, "properties"), "ip_address") + param = { + "interfaceAttachment": { + "port_id": port_id + } + } + ret = api.create_vm_port(vim_id, tenant_id, vm_id, param) + ret["nodeId"] = port["cp_id"] + do_notify(res_type, ret) + + +def delete_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type): + location_info = None + vm_id = ignore_case_get(port, "vm_id") + port_id = ignore_case_get(port, "cp_id") + 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"] + if port["cp_id"] not in vdu["cps"]: + vdu["cps"].append(port["cp_id"]) + 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) + + vim_id, tenant_name = location_info["vimid"], location_info["tenant"] + tenant_id = get_tenant_id(vim_cache, vim_id, tenant_name) + ret = api.delete_vm_port(vim_id, tenant_id, vm_id, port_id) + ret["nodeId"] = port["cp_id"] + do_notify("delete", res_type, port_id) + set_res_cache(res_cache, res_type, port["cp_id"], ret["id"])