X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO%2Fosm_ro%2Fnfvo.py;h=e346699af2f783e1c656db73cdeb687ed486d2dd;hp=30aae222b37864f44aa67224ed9f989ee4cf7faa;hb=274bfc7019af82dac67bbbeb121ef45739a45e4e;hpb=0937f203806a304b6bed8705c0c17f58de8dc844 diff --git a/RO/osm_ro/nfvo.py b/RO/osm_ro/nfvo.py index 30aae222..e346699a 100644 --- a/RO/osm_ro/nfvo.py +++ b/RO/osm_ro/nfvo.py @@ -36,7 +36,10 @@ from osm_ro import utils from osm_ro.utils import deprecated from osm_ro.vim_thread import vim_thread import osm_ro.console_proxy_thread as cli -from osm_ro import vimconn, vim_dummy +from osm_ro_plugin.vim_dummy import VimDummyConnector +from osm_ro_plugin.sdn_dummy import SdnDummyConnector +from osm_ro_plugin.sdn_failing import SdnFailingConnector +from osm_ro_plugin import vimconn, sdnconn import logging import collections import math @@ -58,9 +61,6 @@ from pkg_resources import iter_entry_points # WIM -from .wim import sdnconn -from .wim.wimconn_dummy import DummyConnector -from .wim.failing_connector import FailingConnector from .http_tools import errors as httperrors from .wim.engine import WimEngine from .wim.persistence import WimPersistence @@ -110,12 +110,12 @@ def _load_plugin(name, type="vim"): except Exception as e: logger.critical("Cannot load osm_{}: {}".format(name, e)) if name: - plugins[name] = FailingConnector("Cannot load osm_{}: {}".format(name, e)) + plugins[name] = SdnFailingConnector("Cannot load osm_{}: {}".format(name, e)) if name and name not in plugins: error_text = "Cannot load a module for {t} type '{n}'. The plugin 'osm_{n}' has not been" \ " registered".format(t=type, n=name) logger.critical(error_text) - plugins[name] = FailingConnector(error_text) + plugins[name] = SdnFailingConnector(error_text) # raise NfvoException("Cannot load a module for {t} type '{n}'. The plugin 'osm_{n}' has not been registered". # format(t=type, n=name), httperrors.Bad_Request) @@ -150,11 +150,13 @@ def get_process_id(): # Try getting docker id. If fails, get pid try: with open("/proc/self/cgroup", "r") as f: - text_id_ = f.readline() - _, _, text_id = text_id_.rpartition("/") - text_id = text_id.replace("\n", "")[:12] - if text_id: - return text_id + for text_id_ in f.readlines(): + if "docker/" not in text_id_: + continue + _, _, text_id = text_id_.rpartition("/") + text_id = text_id.replace("\n", "")[:12] + if text_id: + return text_id except Exception: pass # Return a random id @@ -191,9 +193,9 @@ def start_service(mydb, persistence=None, wim=None): try: worker_id = get_process_id() if "rosdn_dummy" not in plugins: - plugins["rosdn_dummy"] = DummyConnector + plugins["rosdn_dummy"] = SdnDummyConnector if "rovim_dummy" not in plugins: - plugins["rovim_dummy"] = vim_dummy + plugins["rovim_dummy"] = VimDummyConnector # starts ovim library ovim = Sdn(db, plugins) @@ -230,14 +232,14 @@ def start_service(mydb, persistence=None, wim=None): try: #if not tenant: # return -httperrors.Bad_Request, "You must provide a valid tenant name or uuid for VIM %s" % ( vim["type"]) - myvim = plugins[plugin_name].vimconnector( + myvim = plugins[plugin_name]( uuid=vim['datacenter_id'], name=vim['datacenter_name'], tenant_id=vim['vim_tenant_id'], tenant_name=vim['vim_tenant_name'], url=vim['vim_url'], url_admin=vim['vim_url_admin'], user=vim['user'], passwd=vim['passwd'], config=extra, persistent_info=vim_persistent_info[thread_id] ) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: myvim = e logger.error("Cannot launch thread for VIM {} '{}': {}".format(vim['datacenter_name'], vim['datacenter_id'], e)) @@ -429,7 +431,7 @@ def get_vim(mydb, nfvo_tenant=None, datacenter_id=None, datacenter_name=None, da persistent_info = {} #if not tenant: # return -httperrors.Bad_Request, "You must provide a valid tenant name or uuid for VIM %s" % ( vim["type"]) - vim_dict[vim['datacenter_id']] = plugins[plugin_name].vimconnector( + vim_dict[vim['datacenter_id']] = plugins[plugin_name]( uuid=vim['datacenter_id'], name=vim['datacenter_name'], tenant_id=vim.get('vim_tenant_id',vim_tenant), tenant_name=vim.get('vim_tenant_name',vim_tenant_name), @@ -442,7 +444,7 @@ def get_vim(mydb, nfvo_tenant=None, datacenter_id=None, datacenter_name=None, da logger.error("Error at VIM {}; {}: {}".format(vim["type"], type(e).__name__, str(e))) continue http_code = httperrors.Internal_Server_Error - if isinstance(e, vimconn.vimconnException): + if isinstance(e, vimconn.VimConnException): http_code = e.http_code raise NfvoException("Error at VIM {}; {}: {}".format(vim["type"], type(e).__name__, str(e)), http_code) return vim_dict @@ -472,7 +474,7 @@ def rollback(mydb, vims, rollback_list): vim.delete_network(item["uuid"]) elif item["what"]=="vm": vim.delete_vminstance(item["uuid"]) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: logger.error("Error in rollback. Not possible to delete VIM %s '%s'. Message: %s", item['what'], item["uuid"], str(e)) undeleted_items.append("{} {} from VIM {}".format(item['what'], item["uuid"], vim["name"])) except db_base_Exception as e: @@ -488,9 +490,9 @@ def rollback(mydb, vims, rollback_list): logger.error("Error in rollback. Not possible to delete %s '%s' from DB. Message: %s", item['what'], item["uuid"], str(e)) undeleted_items.append("{} '{}'".format(item['what'], item["uuid"])) if len(undeleted_items)==0: - return True," Rollback successful." + return True, "Rollback successful." else: - return False," Rollback fails to delete: " + str(undeleted_items) + return False, "Rollback fails to delete: " + str(undeleted_items) def check_vnf_descriptor(vnf_descriptor, vnf_descriptor_version=1): @@ -649,14 +651,14 @@ def create_or_use_image(mydb, vims, image_dict, rollback_list, only_create_at_vi vim_images = vim.get_image_list(filter_dict) #logger.debug('>>>>>>>> VIM images: %s', str(vim_images)) if len(vim_images) > 1: - raise vimconn.vimconnException("More than one candidate VIM image found for filter: {}".format(str(filter_dict)), httperrors.Conflict) + raise vimconn.VimConnException("More than one candidate VIM image found for filter: {}".format(str(filter_dict)), httperrors.Conflict) elif len(vim_images) == 0: - raise vimconn.vimconnNotFoundException("Image not found at VIM with filter: '{}'".format(str(filter_dict))) + raise vimconn.VimConnNotFoundException("Image not found at VIM with filter: '{}'".format(str(filter_dict))) else: #logger.debug('>>>>>>>> VIM image 0: %s', str(vim_images[0])) image_vim_id = vim_images[0]['id'] - except vimconn.vimconnNotFoundException as e: + except vimconn.VimConnNotFoundException as e: #Create the image in VIM only if image_dict['location'] or image_dict['new_location'] is not None try: #image_dict['location']=image_dict.get('new_location') if image_dict['location'] is None @@ -666,15 +668,15 @@ def create_or_use_image(mydb, vims, image_dict, rollback_list, only_create_at_vi image_created="true" else: #If we reach this point, then the image has image name, and optionally checksum, and could not be found - raise vimconn.vimconnException(str(e)) - except vimconn.vimconnException as e: + raise vimconn.VimConnException(str(e)) + except vimconn.VimConnException as e: if return_on_error: logger.error("Error creating image at VIM '%s': %s", vim["name"], str(e)) raise image_vim_id = None logger.warn("Error creating image at VIM '%s': %s", vim["name"], str(e)) continue - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: if return_on_error: logger.error("Error contacting VIM to know if the image exists at VIM: %s", str(e)) raise @@ -812,7 +814,7 @@ def create_or_use_flavor(mydb, vims, flavor_dict, rollback_list, only_create_at_ try: vim.get_flavor(flavor_vim_id) continue #flavor exist - except vimconn.vimconnException: + except vimconn.VimConnException: pass #create flavor at vim logger.debug("nfvo.create_or_use_flavor() adding flavor to VIM %s", vim["name"]) @@ -820,14 +822,14 @@ def create_or_use_flavor(mydb, vims, flavor_dict, rollback_list, only_create_at_ flavor_vim_id = None flavor_vim_id=vim.get_flavor_id_from_data(flavor_dict) flavor_created="false" - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: pass try: if not flavor_vim_id: flavor_vim_id = vim.new_flavor(flavor_dict) rollback_list.append({"where":"vim", "vim_id": vim_id, "what":"flavor","uuid":flavor_vim_id}) flavor_created="true" - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: if return_on_error: logger.error("Error creating flavor at VIM %s: %s.", vim["name"], str(e)) raise @@ -1546,7 +1548,7 @@ def new_vnf(mydb, tenant_id, vnf_descriptor): # Step 8. Adding the VNF to the NFVO DB vnf_id = mydb.new_vnf_as_a_whole(tenant_id,vnf_name,vnf_descriptor,VNFCDict) return vnf_id - except (db_base_Exception, vimconn.vimconnException, KeyError) as e: + except (db_base_Exception, vimconn.VimConnException, KeyError) as e: _, message = rollback(mydb, vims, rollback_list) if isinstance(e, db_base_Exception): error_text = "Exception at database" @@ -1682,7 +1684,7 @@ def new_vnf_v02(mydb, tenant_id, vnf_descriptor): # Step 8. Adding the VNF to the NFVO DB vnf_id = mydb.new_vnf_as_a_whole2(tenant_id,vnf_name,vnf_descriptor,VNFCDict) return vnf_id - except (db_base_Exception, vimconn.vimconnException, KeyError) as e: + except (db_base_Exception, vimconn.VimConnException, KeyError) as e: _, message = rollback(mydb, vims, rollback_list) if isinstance(e, db_base_Exception): error_text = "Exception at database" @@ -1811,10 +1813,10 @@ def delete_vnf(mydb,tenant_id,vnf_id,datacenter=None,vim_tenant=None): continue try: myvim.delete_flavor(flavor_vim["vim_id"]) - except vimconn.vimconnNotFoundException: + except vimconn.VimConnNotFoundException: logger.warn("VIM flavor %s not exist at datacenter %s", flavor_vim["vim_id"], flavor_vim["datacenter_vim_id"] ) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: logger.error("Not possible to delete VIM flavor %s from datacenter %s: %s %s", flavor_vim["vim_id"], flavor_vim["datacenter_vim_id"], type(e).__name__, str(e)) undeletedItems.append("flavor {} from VIM {}".format(flavor_vim["vim_id"], @@ -1844,9 +1846,9 @@ def delete_vnf(mydb,tenant_id,vnf_id,datacenter=None,vim_tenant=None): myvim=vims[ image_vim["datacenter_id"] ] try: myvim.delete_image(image_vim["vim_id"]) - except vimconn.vimconnNotFoundException as e: + except vimconn.VimConnNotFoundException as e: logger.warn("VIM image %s not exist at datacenter %s", image_vim["vim_id"], image_vim["datacenter_id"] ) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: logger.error("Not possible to delete VIM image %s from datacenter %s: %s %s", image_vim["vim_id"], image_vim["datacenter_id"], type(e).__name__, str(e)) undeletedItems.append("image {} from VIM {}".format(image_vim["vim_id"], image_vim["datacenter_id"] )) @@ -1908,7 +1910,7 @@ def get_hosts(mydb, nfvo_tenant_id): #print 'datacenters '+ json.dumps(datacenter, indent=4) return datacenter - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: raise NfvoException("Not possible to get_host_list from VIM: {}".format(str(e)), e.http_code) @@ -2873,7 +2875,7 @@ def start_scenario(mydb, tenant_id, scenario_id, instance_scenario_name, instanc instance_id = mydb.new_instance_scenario_as_a_whole(tenant_id,instance_scenario_name, instance_scenario_description, scenarioDict) return mydb.get_instance_scenario(instance_id) - except (db_base_Exception, vimconn.vimconnException) as e: + except (db_base_Exception, vimconn.VimConnException) as e: _, message = rollback(mydb, vims, rollbackList) if isinstance(e, db_base_Exception): error_text = "Exception at database" @@ -2969,6 +2971,7 @@ def unify_cloud_config(cloud_config_preserve, cloud_config): def get_vim_thread(mydb, tenant_id, datacenter_id_name=None, datacenter_tenant_id=None): + global plugins datacenter_id = None datacenter_name = None thread = None @@ -2988,7 +2991,7 @@ def get_vim_thread(mydb, tenant_id, datacenter_id_name=None, datacenter_tenant_i if datacenter_tenant_id: where_["dt.uuid"] = datacenter_tenant_id datacenters = mydb.get_rows( - SELECT=("dt.uuid as datacenter_tenant_id, d.name as datacenter_name",), + SELECT=("dt.uuid as datacenter_tenant_id, d.name as datacenter_name", "d.type as type"), FROM="datacenter_tenants as dt join tenants_datacenters as td on dt.uuid=td.datacenter_tenant_id " "join datacenters as d on d.uuid=dt.datacenter_id", WHERE=where_) @@ -2999,6 +3002,10 @@ def get_vim_thread(mydb, tenant_id, datacenter_id_name=None, datacenter_tenant_i datacenter_name = datacenters[0]["datacenter_name"] thread = vim_threads["running"].get(thread_id) if not thread: + datacenter_type = datacenters[0]["type"] + plugin_name = "rovim_" + datacenter_type + if plugin_name not in plugins: + _load_plugin(plugin_name, type="vim") thread_name = get_non_used_vim_name(datacenter_name, datacenter_id) thread = vim_thread(task_lock, plugins, thread_name, None, thread_id, db=mydb) @@ -3024,13 +3031,14 @@ def get_datacenter_uuid(mydb, tenant_id, datacenter_id_name): " dt on td.datacenter_tenant_id=dt.uuid" else: from_ = 'datacenters as d' - vimaccounts = mydb.get_rows(FROM=from_, SELECT=("d.uuid as uuid, d.name as name",), WHERE=WHERE_dict ) + vimaccounts = mydb.get_rows(FROM=from_, SELECT=("d.uuid as uuid", "d.name as name", "d.type as type"), + WHERE=WHERE_dict) if len(vimaccounts) == 0: raise NfvoException("datacenter '{}' not found".format(str(datacenter_id_name)), httperrors.Not_Found) - elif len(vimaccounts)>1: - #print "nfvo.datacenter_action() error. Several datacenters found" + elif len(vimaccounts) > 1: + # print "nfvo.datacenter_action() error. Several datacenters found" raise NfvoException("More than one datacenters found, try to identify with uuid", httperrors.Conflict) - return vimaccounts[0]["uuid"], vimaccounts[0]["name"] + return vimaccounts[0]["uuid"], vimaccounts[0] def get_datacenter_by_name_uuid(mydb, tenant_id, datacenter_id_name=None, **extra_filter): @@ -3780,21 +3788,40 @@ def create_instance(mydb, tenant_id, instance_dict): returned_instance = mydb.get_instance_scenario(instance_uuid) returned_instance["action_id"] = instance_action_id return returned_instance - except (NfvoException, vimconn.vimconnException, sdnconn.SdnConnectorError, db_base_Exception) as e: - message = rollback(mydb, myvims, rollbackList) + except (NfvoException, vimconn.VimConnException, sdnconn.SdnConnectorError, db_base_Exception) as e: + _, message = rollback(mydb, myvims, rollbackList) if isinstance(e, db_base_Exception): error_text = "database Exception" - elif isinstance(e, vimconn.vimconnException): + elif isinstance(e, vimconn.VimConnException): error_text = "VIM Exception" elif isinstance(e, sdnconn.SdnConnectorError): error_text = "WIM Exception" else: - error_text = "Exception" - error_text += " {} {}. {}".format(type(e).__name__, str(e), message) + error_text = "Exception " + str(type(e).__name__) + error_text += " {}. {}".format(e, message) # logger.error("create_instance: %s", error_text) logger.exception(e) raise NfvoException(error_text, e.http_code) +def increment_ip_mac(ip_mac, vm_index=1): + if not isinstance(ip_mac, str): + return ip_mac + try: + # try with ipv4 look for last dot + i = ip_mac.rfind(".") + if i > 0: + i += 1 + return "{}{}".format(ip_mac[:i], int(ip_mac[i:]) + vm_index) + # try with ipv6 or mac look for last colon. Operate in hex + i = ip_mac.rfind(":") + if i > 0: + i += 1 + # format in hex, len can be 2 for mac or 4 for ipv6 + return ("{}{:0" + str(len(ip_mac) - i) + "x}").format(ip_mac[:i], int(ip_mac[i:], 16) + vm_index) + except: + pass + return None + def instantiate_vnf(mydb, sce_vnf, params, params_out, rollbackList): default_datacenter_id = params["default_datacenter_id"] @@ -4153,16 +4180,11 @@ def instantiate_vnf(mydb, sce_vnf, params, params_out, rollbackList): av_index = None for vm_index in range(0, vm.get('count', 1)): vm_name = myVMDict['name'] + "-" + str(vm_index+1) + vm_networks = deepcopy(myVMDict['networks']) task_params = (vm_name, myVMDict['description'], myVMDict.get('start', None), - myVMDict['imageRef'], myVMDict['flavorRef'], myVMDict['networks'], cloud_config_vm, + myVMDict['imageRef'], myVMDict['flavorRef'], vm_networks, cloud_config_vm, myVMDict['disks'], av_index, vnf_availability_zones) - # put interface uuid back to scenario[vnfs][vms[[interfaces] - for net in myVMDict['networks']: - if "vim_id" in net: - for iface in vm['interfaces']: - if net["name"] == iface["internal_name"]: - iface["vim_id"] = net["vim_id"] - break + vm_uuid = str(uuid4()) uuid_list.append(vm_uuid) db_vm = { @@ -4176,28 +4198,32 @@ def instantiate_vnf(mydb, sce_vnf, params, params_out, rollbackList): } db_instance_vms.append(db_vm) - iface_index = 0 - for db_vm_iface in db_vm_ifaces: + # put interface uuid back to scenario[vnfs][vms[[interfaces] + for net in vm_networks: + if "vim_id" in net: + for iface in vm['interfaces']: + if net["name"] == iface["internal_name"]: + iface["vim_id"] = net["vim_id"] + break + + if vm_index > 0: + if net.get("ip_address"): + net["ip_address"] = increment_ip_mac(net.get("ip_address"), vm_index) + if net.get("mac_address"): + net["mac_address"] = increment_ip_mac(net.get("mac_address"), vm_index) + + for iface_index, db_vm_iface in enumerate(db_vm_ifaces): iface_uuid = str(uuid4()) uuid_list.append(iface_uuid) db_vm_iface_instance = { "uuid": iface_uuid, - "instance_vm_id": vm_uuid + "instance_vm_id": vm_uuid, + "ip_address": vm_networks[iface_index].get("ip_address"), + "mac_address": vm_networks[iface_index].get("mac_address") } db_vm_iface_instance.update(db_vm_iface) - if db_vm_iface_instance.get("ip_address"): # increment ip_address - ip = db_vm_iface_instance.get("ip_address") - try: - i = ip.rfind(".") - if i > 0: - i += 1 - ip = ip[i:] + str(int(ip[:i]) + 1) - db_vm_iface_instance["ip_address"] = ip - except: - db_vm_iface_instance["ip_address"] = None db_instance_interfaces.append(db_vm_iface_instance) - myVMDict['networks'][iface_index]["uuid"] = iface_uuid - iface_index += 1 + vm_networks[iface_index]["uuid"] = iface_uuid db_vim_action = { "instance_action_id": instance_action_id, @@ -4638,7 +4664,7 @@ def refresh_instance(mydb, nfvo_tenant, instanceDict, datacenter=None, vim_tenan # try: # vm_dict.update(myvims[datacenter_key].refresh_vms_status(vm_list[datacenter_key]) ) # failed = False - # except vimconn.vimconnException as e: + # except vimconn.VimConnException as e: # logger.error("VIM exception %s %s", type(e).__name__, str(e)) # failed_message = str(e) # if failed: @@ -4700,7 +4726,7 @@ def refresh_instance(mydb, nfvo_tenant, instanceDict, datacenter=None, vim_tenan # try: # net_dict.update(myvims[datacenter_key].refresh_nets_status(net_list[datacenter_key]) ) # failed = False - # except vimconn.vimconnException as e: + # except vimconn.VimConnException as e: # logger.error("VIM exception %s %s", type(e).__name__, str(e)) # failed_message = str(e) # if failed: @@ -4854,7 +4880,6 @@ def instance_action(mydb,nfvo_tenant,instance_id, action_dict): # TODO do the same for flavor and image when available task_depends_on = [] task_params = extra["params"] - task_params_networks = deepcopy(task_params[5]) for iface in task_params[5]: if iface["net_id"].startswith("TASK-"): if "." not in iface["net_id"]: @@ -4864,8 +4889,6 @@ def instance_action(mydb,nfvo_tenant,instance_id, action_dict): iface["net_id"][5:]) else: task_depends_on.append(iface["net_id"][5:]) - if "mac_address" in iface: - del iface["mac_address"] vm_ifaces_to_clone = mydb.get_rows(FROM="instance_interfaces", WHERE={"instance_vm_id": target_vm["uuid"]}) for index in range(0, vdu_count): @@ -4908,15 +4931,10 @@ def instance_action(mydb,nfvo_tenant,instance_id, action_dict): iface["uuid"] = iface2iface[iface["uuid"]] # increment ip_address if iface.get("ip_address"): - try: - ip = iface["ip_address"] - i = ip.rfind(".") - if i > 0: - i += 1 - ip = ip[i:] + str(int(ip[:i]) + 1) - iface["ip_address"] = ip - except: - iface["ip_address"] = None + iface["ip_address"] = increment_ip_mac(iface.get("ip_address"), index+1) + if iface.get("mac_address"): + iface["mac_address"] = increment_ip_mac(iface.get("mac_address"), index+1) + if vm_name: task_params_copy[0] = vm_name db_vim_action = { @@ -5038,7 +5056,7 @@ def instance_action(mydb,nfvo_tenant,instance_id, action_dict): else: vm_result[ vm['uuid'] ] = {"vim_result": 200, "description": "ok", "name":vm['name']} vm_ok +=1 - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: vm_result[ vm['uuid'] ] = {"vim_result": e.http_code, "name":vm['name'], "description": str(e)} vm_error+=1 @@ -5221,57 +5239,60 @@ def delete_datacenter(mydb, datacenter): def create_vim_account(mydb, nfvo_tenant, datacenter_id, name=None, vim_id=None, vim_tenant=None, vim_tenant_name=None, vim_username=None, vim_password=None, config=None): + global plugins # get datacenter info try: if not datacenter_id: if not vim_id: raise NfvoException("You must provide 'vim_id", http_code=httperrors.Bad_Request) datacenter_id = vim_id - datacenter_id, datacenter_name = get_datacenter_uuid(mydb, None, datacenter_id) + datacenter_id, datacenter = get_datacenter_uuid(mydb, None, datacenter_id) + datacenter_name = datacenter["name"] + datacenter_type = datacenter["type"] create_vim_tenant = True if not vim_tenant and not vim_tenant_name else False # get nfvo_tenant info tenant_dict = mydb.get_table_by_uuid_name('nfvo_tenants', nfvo_tenant) - if vim_tenant_name==None: - vim_tenant_name=tenant_dict['name'] + if vim_tenant_name is None: + vim_tenant_name = tenant_dict['name'] - tenants_datacenter_dict={"nfvo_tenant_id":tenant_dict['uuid'], "datacenter_id":datacenter_id } + tenants_datacenter_dict = {"nfvo_tenant_id": tenant_dict['uuid'], "datacenter_id": datacenter_id} # #check that this association does not exist before # tenants_datacenters = mydb.get_rows(FROM='tenants_datacenters', WHERE=tenants_datacenter_dict) # if len(tenants_datacenters)>0: - # raise NfvoException("datacenter '{}' and tenant'{}' are already attached".format(datacenter_id, tenant_dict['uuid']), httperrors.Conflict) + # raise NfvoException("datacenter '{}' and tenant'{}' are already attached".format( + # datacenter_id, tenant_dict['uuid']), httperrors.Conflict) - vim_tenant_id_exist_atdb=False + vim_tenant_id_exist_atdb = False if not create_vim_tenant: where_={"datacenter_id": datacenter_id} - if vim_tenant!=None: + if vim_tenant is not None: where_["vim_tenant_id"] = vim_tenant - if vim_tenant_name!=None: + if vim_tenant_name is not None: where_["vim_tenant_name"] = vim_tenant_name - #check if vim_tenant_id is already at database + # check if vim_tenant_id is already at database datacenter_tenants_dict = mydb.get_rows(FROM='datacenter_tenants', WHERE=where_) - if len(datacenter_tenants_dict)>=1: + if len(datacenter_tenants_dict) >= 1: datacenter_tenants_dict = datacenter_tenants_dict[0] - vim_tenant_id_exist_atdb=True - #TODO check if a field has changed and edit entry at datacenter_tenants at DB - else: #result=0 + vim_tenant_id_exist_atdb = True + # TODO check if a field has changed and edit entry at datacenter_tenants at DB + else: # result=0 datacenter_tenants_dict = {} - #insert at table datacenter_tenants - else: #if vim_tenant==None: - #create tenant at VIM if not provided + # insert at table datacenter_tenants + else: # if vim_tenant==None: + # create tenant at VIM if not provided try: _, myvim = get_datacenter_by_name_uuid(mydb, None, datacenter_id, vim_user=vim_username, vim_passwd=vim_password) datacenter_name = myvim["name"] vim_tenant = myvim.new_tenant(vim_tenant_name, "created by openmano for datacenter "+datacenter_name) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: raise NfvoException("Not possible to create vim_tenant {} at VIM: {}".format(vim_tenant_name, e), httperrors.Internal_Server_Error) - datacenter_tenants_dict = {} - datacenter_tenants_dict["created"]="true" + datacenter_tenants_dict = {"created": "true"} - #fill datacenter_tenants table + # fill datacenter_tenants table if not vim_tenant_id_exist_atdb: datacenter_tenants_dict["vim_tenant_id"] = vim_tenant datacenter_tenants_dict["vim_tenant_name"] = vim_tenant_name @@ -5287,19 +5308,22 @@ def create_vim_account(mydb, nfvo_tenant, datacenter_id, name=None, vim_id=None, id_ = mydb.new_row('datacenter_tenants', datacenter_tenants_dict, add_uuid=True, confidential_data=True) datacenter_tenants_dict["uuid"] = id_ - #fill tenants_datacenters table + # fill tenants_datacenters table datacenter_tenant_id = datacenter_tenants_dict["uuid"] tenants_datacenter_dict["datacenter_tenant_id"] = datacenter_tenant_id mydb.new_row('tenants_datacenters', tenants_datacenter_dict) - # create thread + # load plugin and create thread + plugin_name = "rovim_" + datacenter_type + if plugin_name not in plugins: + _load_plugin(plugin_name, type="vim") thread_name = get_non_used_vim_name(datacenter_name, datacenter_id) new_thread = vim_thread(task_lock, plugins, thread_name, None, datacenter_tenant_id, db=db) new_thread.start() thread_id = datacenter_tenants_dict["uuid"] vim_threads["running"][thread_id] = new_thread return thread_id - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: raise NfvoException(str(e), httperrors.Bad_Request) @@ -5378,7 +5402,7 @@ def delete_vim_account(mydb, tenant_id, vim_account_id, datacenter=None): try: datacenter_id, myvim = get_datacenter_by_name_uuid(mydb, tenant_id, datacenter) myvim.delete_tenant(vim_tenant_dict['vim_tenant_id']) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: warning = "Not possible to delete vim_tenant_id {} from VIM: {} ".format(vim_tenant_dict['vim_tenant_id'], str(e)) logger.warn(warning) except db_base_Exception as e: @@ -5400,14 +5424,14 @@ def datacenter_action(mydb, tenant_id, datacenter, action_dict): if 'check-connectivity' in action_dict: try: myvim.check_vim_connectivity() - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: #logger.error("nfvo.datacenter_action() Not possible to get_network_list from VIM: %s ", str(e)) raise NfvoException(str(e), e.http_code) elif 'net-update' in action_dict: try: nets = myvim.get_network_list(filter_dict={'shared': True, 'admin_state_up': True, 'status': 'ACTIVE'}) #print content - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: #logger.error("nfvo.datacenter_action() Not possible to get_network_list from VIM: %s ", str(e)) raise NfvoException(str(e), httperrors.Internal_Server_Error) #update nets Change from VIM format to NFVO format @@ -5466,7 +5490,7 @@ def datacenter_new_netmap(mydb, tenant_id, datacenter, action_dict=None): try: vim_nets = myvim.get_network_list(filter_dict=filter_dict) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: #logger.error("nfvo.datacenter_new_netmap() Not possible to get_network_list from VIM: %s ", str(e)) raise NfvoException(str(e), httperrors.Internal_Server_Error) if len(vim_nets)>1 and action_dict: @@ -5507,7 +5531,7 @@ def get_sdn_net_id(mydb, tenant_id, datacenter, network_id): datacenter_id, myvim = get_datacenter_by_name_uuid(mydb, tenant_id, datacenter) network = myvim.get_network_list(filter_dict=filter_dict) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: raise NfvoException("Not possible to get_sdn_net_id from VIM: {}".format(str(e)), e.http_code) # ensure the network is defined @@ -5678,7 +5702,7 @@ def vim_action_get(mydb, tenant_id, datacenter, item, name): datacenter) else: return {item: content} - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: print("vim_action Not possible to get_{}_list from VIM: {} ".format(item, str(e))) raise NfvoException("Not possible to get_{}_list from VIM: {}".format(item, str(e)), e.http_code) @@ -5742,7 +5766,7 @@ def vim_action_delete(mydb, tenant_id, datacenter, item, name): content = myvim.delete_image(item_id) else: raise NfvoException(item + "?", httperrors.Method_Not_Allowed) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: #logger.error( "vim_action Not possible to delete_{} {}from VIM: {} ".format(item, name, str(e))) raise NfvoException("Not possible to delete_{} {} from VIM: {}".format(item, name, str(e)), e.http_code) @@ -5804,7 +5828,7 @@ def vim_action_create(mydb, tenant_id, datacenter, item, descriptor): content = myvim.new_tenant(tenant["name"], tenant.get("description")) else: raise NfvoException(item + "?", httperrors.Method_Not_Allowed) - except vimconn.vimconnException as e: + except vimconn.VimConnException as e: raise NfvoException("Not possible to create {} at VIM: {}".format(item, str(e)), e.http_code) return vim_action_get(mydb, tenant_id, datacenter, item, content)