X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimconn_openstack.py;h=e0a3aa31dc0cf4e94d8321515cff887df29fd06f;hb=1f3a67138592443a8bd68ab936e071cb5bccda55;hp=242acb7590b69a4308e2413c2c3333d467cee620;hpb=c78233e1750d5d231e99ffedb5ba81014f84e6fe;p=osm%2FRO.git diff --git a/vimconn_openstack.py b/vimconn_openstack.py index 242acb75..e0a3aa31 100644 --- a/vimconn_openstack.py +++ b/vimconn_openstack.py @@ -30,6 +30,8 @@ __date__ ="$22-jun-2014 11:19:29$" import vimconn import json import yaml +import logging +import netaddr from novaclient import client as nClient, exceptions as nvExceptions import keystoneclient.v2_0.client as ksClient @@ -54,12 +56,12 @@ netStatus2manoFormat={'ACTIVE':'ACTIVE','PAUSED':'PAUSED','INACTIVE':'INACTIVE', } class vimconnector(vimconn.vimconnector): - def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, debug=True, config={}): + def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level=None, config={}): '''using common constructor parameters. In this case 'url' is the keystone authorization url, 'url_admin' is not use ''' - vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, debug, config) + vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level, config) self.k_creds={} self.n_creds={} @@ -80,6 +82,9 @@ class vimconnector(vimconn.vimconnector): self.k_creds['password'] = passwd self.n_creds['api_key'] = passwd self.reload_client = True + self.logger = logging.getLogger('openmano.vim.openstack') + if log_level: + self.logger.setLevel( getattr(logging, log_level) ) def __setitem__(self,index, value): '''Set individuals parameters @@ -148,109 +153,7 @@ class vimconnector(vimconn.vimconnector): self.ne_endpoint=self.keystone.service_catalog.url_for(service_type='network', endpoint_type='publicURL') self.neutron = neClient.Client('2.0', endpoint_url=self.ne_endpoint, token=self.keystone.auth_token, **self.k_creds) self.reload_client = False - - def new_external_port(self, port_data): - #TODO openstack if needed - '''Adds a external port to VIM''' - '''Returns the port identifier''' - return -vimconn.HTTP_Internal_Server_Error, "osconnector.new_external_port() not implemented" - def connect_port_network(self, port_id, network_id, admin=False): - #TODO openstack if needed - '''Connects a external port to a network''' - '''Returns status code of the VIM response''' - return -vimconn.HTTP_Internal_Server_Error, "osconnector.connect_port_network() not implemented" - - def new_user(self, user_name, user_passwd, tenant_id=None): - '''Adds a new user to openstack VIM''' - '''Returns the user identifier''' - if self.debug: - print "osconnector: Adding a new user to VIM" - try: - self._reload_connection() - user=self.keystone.users.create(user_name, user_passwd, tenant_id=tenant_id) - #self.keystone.tenants.add_user(self.k_creds["username"], #role) - return 1, user.id - except ksExceptions.ConnectionError as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except ksExceptions.ClientException as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "new_tenant " + error_text - return error_value, error_text - - def delete_user(self, user_id): - '''Delete a user from openstack VIM''' - '''Returns the user identifier''' - if self.debug: - print "osconnector: Deleting a user from VIM" - try: - self._reload_connection() - self.keystone.users.delete(user_id) - return 1, user_id - except ksExceptions.ConnectionError as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except ksExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except ksExceptions.ClientException as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "delete_tenant " + error_text - return error_value, error_text - - def new_tenant(self,tenant_name,tenant_description): - '''Adds a new tenant to openstack VIM''' - '''Returns the tenant identifier''' - if self.debug: - print "osconnector: Adding a new tenant to VIM" - try: - self._reload_connection() - tenant=self.keystone.tenants.create(tenant_name, tenant_description) - #self.keystone.tenants.add_user(self.k_creds["username"], #role) - return 1, tenant.id - except ksExceptions.ConnectionError as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except ksExceptions.ClientException as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "new_tenant " + error_text - return error_value, error_text - - def delete_tenant(self,tenant_id): - '''Delete a tenant from openstack VIM''' - '''Returns the tenant identifier''' - if self.debug: - print "osconnector: Deleting a tenant from VIM" - try: - self._reload_connection() - self.keystone.tenants.delete(tenant_id) - #self.keystone.tenants.add_user(self.k_creds["username"], #role) - return 1, tenant_id - except ksExceptions.ConnectionError as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except ksExceptions.ClientException as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "delete_tenant " + error_text - return error_value, error_text - def __net_os2mano(self, net_list_dict): '''Transform the net openstack format to mano format net_list_dict can be a list of dict or a single dict''' @@ -265,47 +168,121 @@ class vimconnector(vimconn.vimconnector): net['type']='data' else: net['type']='bridge' + + + + def _format_exception(self, exception): + '''Transform a keystone, nova, neutron exception into a vimconn exception''' + if isinstance(exception, (HTTPException, gl1Exceptions.HTTPException, gl1Exceptions.CommunicationError, + ConnectionError, ksExceptions.ConnectionError, neExceptions.ConnectionFailed + )): + raise vimconn.vimconnConnectionException(type(exception).__name__ + ": " + str(exception)) + elif isinstance(exception, (nvExceptions.ClientException, ksExceptions.ClientException, + neExceptions.NeutronException, nvExceptions.BadRequest)): + raise vimconn.vimconnUnexpectedResponse(type(exception).__name__ + ": " + str(exception)) + elif isinstance(exception, (neExceptions.NetworkNotFoundClient, nvExceptions.NotFound)): + raise vimconn.vimconnNotFoundException(type(exception).__name__ + ": " + str(exception)) + elif isinstance(exception, nvExceptions.Conflict): + raise vimconn.vimconnConflictException(type(exception).__name__ + ": " + str(exception)) + else: # () + raise vimconn.vimconnConnectionException(type(exception).__name__ + ": " + str(exception)) + + def get_tenant_list(self, filter_dict={}): + '''Obtain tenants of VIM + filter_dict can contain the following keys: + name: filter by tenant name + id: filter by tenant uuid/id + + Returns the tenant list of dictionaries: [{'name':', 'id':', ...}, ...] + ''' + self.logger.debug("Getting tenant from VIM filter: '%s'", str(filter_dict)) + try: + self._reload_connection() + tenant_class_list=self.keystone.tenants.findall(**filter_dict) + tenant_list=[] + for tenant in tenant_class_list: + tenant_list.append(tenant.to_dict()) + return tenant_list + except (ksExceptions.ConnectionError, ksExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) + + def new_tenant(self, tenant_name, tenant_description): + '''Adds a new tenant to openstack VIM. Returns the tenant identifier''' + self.logger.debug("Adding a new tenant name: %s", tenant_name) + try: + self._reload_connection() + tenant=self.keystone.tenants.create(tenant_name, tenant_description) + return tenant.id + except (ksExceptions.ConnectionError, ksExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) + + def delete_tenant(self, tenant_id): + '''Delete a tenant from openstack VIM. Returns the old tenant identifier''' + self.logger.debug("Deleting tenant %s from VIM", tenant_id) + try: + self._reload_connection() + self.keystone.tenants.delete(tenant_id) + return tenant_id + except (ksExceptions.ConnectionError, ksExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) - def new_tenant_network(self,net_name,net_type,public=False,cidr=None,vlan=None): - '''Adds a tenant network to VIM''' - '''Returns the network identifier''' - if self.debug: - print "osconnector: Adding a new tenant network to VIM (tenant: " + str(self.tenant_name) + ", type: " + net_type + "): "+ net_name + def new_network(self,net_name, net_type, ip_profile=None, shared=False, vlan=None): + '''Adds a tenant network to VIM. Returns the network identifier''' + self.logger.debug("Adding a new network to VIM name '%s', type '%s'", net_name, net_type) + #self.logger.debug(">>>>>>>>>>>>>>>>>> IP profile %s", str(ip_profile)) try: + new_net = None self._reload_connection() network_dict = {'name': net_name, 'admin_state_up': True} if net_type=="data" or net_type=="ptp": if self.config.get('dataplane_physical_net') == None: - return -vimconn.HTTP_Bad_Request, "You must provide a 'dataplane_physical_net' at config value before creating sriov network " - + raise vimconn.vimconnConflictException("You must provide a 'dataplane_physical_net' at config value before creating sriov network") network_dict["provider:physical_network"] = self.config['dataplane_physical_net'] #"physnet_sriov" #TODO physical network_dict["provider:network_type"] = "vlan" if vlan!=None: network_dict["provider:network_type"] = vlan - network_dict["shared"]=public + network_dict["shared"]=shared new_net=self.neutron.create_network({'network':network_dict}) #print new_net - #create fake subnetwork - if not cidr: - cidr="192.168.111.0/24" + #create subnetwork, even if there is no profile + if not ip_profile: + ip_profile = {} + if 'subnet_address' not in ip_profile: + #Fake subnet is required + ip_profile['subnet_address'] = "192.168.111.0/24" + if 'ip_version' not in ip_profile: + ip_profile['ip_version'] = "IPv4" subnet={"name":net_name+"-subnet", "network_id": new_net["network"]["id"], - "ip_version": 4, - "cidr": cidr + "ip_version": 4 if ip_profile['ip_version']=="IPv4" else 6, + "cidr": ip_profile['subnet_address'] } + if 'gateway_address' in ip_profile: + subnet['gateway_ip'] = ip_profile['gateway_address'] + if ip_profile.get('dns_address'): + #TODO: manage dns_address as a list of addresses separated by commas + subnet['dns_nameservers'] = [] + subnet['dns_nameservers'].append(ip_profile['dns_address']) + if 'dhcp_enabled' in ip_profile: + subnet['enable_dhcp'] = False if ip_profile['dhcp_enabled']=="false" else True + if 'dhcp_start_address' in ip_profile: + subnet['allocation_pools']=[] + subnet['allocation_pools'].append(dict()) + subnet['allocation_pools'][0]['start'] = ip_profile['dhcp_start_address'] + if 'dhcp_count' in ip_profile: + #parts = ip_profile['dhcp_start_address'].split('.') + #ip_int = (int(parts[0]) << 24) + (int(parts[1]) << 16) + (int(parts[2]) << 8) + int(parts[3]) + ip_int = int(netaddr.IPAddress(ip_profile['dhcp_start_address'])) + ip_int += ip_profile['dhcp_count'] - 1 + ip_str = str(netaddr.IPAddress(ip_int)) + subnet['allocation_pools'][0]['end'] = ip_str + #self.logger.debug(">>>>>>>>>>>>>>>>>> Subnet: %s", str(subnet)) self.neutron.create_subnet({"subnet": subnet} ) - return 1, new_net["network"]["id"] - except neExceptions.ConnectionFailed as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except (ksExceptions.ClientException, neExceptions.NeutronException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "new_tenant_network " + error_text - return error_value, error_text + return new_net["network"]["id"] + except (neExceptions.ConnectionFailed, ksExceptions.ClientException, neExceptions.NeutronException, ConnectionError) as e: + if new_net: + self.neutron.delete_network(new_net['network']['id']) + self._format_exception(e) def get_network_list(self, filter_dict={}): '''Obtain tenant networks of VIM @@ -318,60 +295,41 @@ class vimconnector(vimconn.vimconnector): status: 'ACTIVE' Returns the network list of dictionaries ''' - if self.debug: - print "osconnector.get_network_list(): Getting network from VIM (filter: " + str(filter_dict) + "): " + self.logger.debug("Getting network from VIM filter: '%s'", str(filter_dict)) try: self._reload_connection() net_dict=self.neutron.list_networks(**filter_dict) net_list=net_dict["networks"] self.__net_os2mano(net_list) - return 1, net_list - except neClient.exceptions.ConnectionFailed as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except (ksExceptions.ClientException, neExceptions.NeutronException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "get_network_list " + error_text - return error_value, error_text + return net_list + except (neExceptions.ConnectionFailed, ksExceptions.ClientException, neExceptions.NeutronException, ConnectionError) as e: + self._format_exception(e) - def get_tenant_network(self, net_id, tenant_id=None): - '''Obtain tenant networks of VIM''' - '''Returns the network information from a network id''' - if self.debug: - print "osconnector.get_tenant_network(): Getting tenant network %s from VIM" % net_id + def get_network(self, net_id): + '''Obtain details of network from VIM + Returns the network information from a network id''' + self.logger.debug(" Getting tenant network %s from VIM", net_id) filter_dict={"id": net_id} - if tenant_id: - filter_dict["tenant_id"] = tenant_id - r, net_list = self.get_network_list(filter_dict) - if r<0: - return r, net_list + net_list = self.get_network_list(filter_dict) if len(net_list)==0: - return -vimconn.HTTP_Not_Found, "Network '%s' not found" % net_id + raise vimconn.vimconnNotFoundException("Network '{}' not found".format(net_id)) elif len(net_list)>1: - return -vimconn.HTTP_Conflict, "Found more than one network with this criteria" + raise vimconn.vimconnConflictException("Found more than one network with this criteria") net = net_list[0] subnets=[] for subnet_id in net.get("subnets", () ): try: subnet = self.neutron.show_subnet(subnet_id) except Exception as e: - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - print "osconnector.get_tenant_network(): Error getting subnet %s %s" % (net_id, error_text) - subnet = {"id": subnet_id, "fault": error_text} + self.logger.error("osconnector.get_network(): Error getting subnet %s %s" % (net_id, str(e))) + subnet = {"id": subnet_id, "fault": str(e)} subnets.append(subnet) net["subnets"] = subnets - return 1, net + return net - - def delete_tenant_network(self, net_id): - '''Deletes a tenant network from VIM''' - '''Returns the network identifier''' - if self.debug: - print "osconnector: Deleting a new tenant network from VIM tenant: " + str(self.tenant_name) + ", id: " + net_id + def delete_network(self, net_id): + '''Deletes a tenant network from VIM. Returns the old network identifier''' + self.logger.debug("Deleting network '%s' from VIM", net_id) try: self._reload_connection() #delete VM ports attached to this networks before the network @@ -380,55 +338,82 @@ class vimconnector(vimconn.vimconnector): try: self.neutron.delete_port(p["id"]) except Exception as e: - print "Error deleting port: " + type(e).__name__ + ": "+ str(e) + self.logger.error("Error deleting port %s: %s", p["id"], str(e)) self.neutron.delete_network(net_id) - return 1, net_id - except neClient.exceptions.ConnectionFailed as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except neExceptions.NetworkNotFoundClient as e: - error_value=-vimconn.HTTP_Not_Found - error_text= type(e).__name__ + ": "+ str(e.args[0]) - except (ksExceptions.ClientException, neExceptions.NeutronException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "delete_tenant_network " + error_text - return error_value, error_text + return net_id + except (neExceptions.ConnectionFailed, neExceptions.NetworkNotFoundClient, neExceptions.NeutronException, + ksExceptions.ClientException, neExceptions.NeutronException, ConnectionError) as e: + self._format_exception(e) - def get_tenant_flavor(self, flavor_id): - '''Obtain flavor details from the VIM - Returns the flavor dict details - ''' - print "VIMConnector: Getting flavor from VIM" + def refresh_nets_status(self, net_list): + '''Get the status of the networks + Params: the list of network identifiers + Returns a dictionary with: + net_id: #VIM id of this network + status: #Mandatory. Text with one of: + # DELETED (not found at vim) + # VIM_ERROR (Cannot connect to VIM, VIM response error, ...) + # OTHER (Vim reported other status not understood) + # ERROR (VIM indicates an ERROR status) + # ACTIVE, INACTIVE, DOWN (admin down), + # BUILD (on building process) + # + error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR + vim_info: #Text with plain information obtained from vim (yaml.safe_dump) + + ''' + net_dict={} + for net_id in net_list: + net = {} + try: + net_vim = self.get_network(net_id) + if net_vim['status'] in netStatus2manoFormat: + net["status"] = netStatus2manoFormat[ net_vim['status'] ] + else: + net["status"] = "OTHER" + net["error_msg"] = "VIM status reported " + net_vim['status'] + + if net['status'] == "ACTIVE" and not net_vim['admin_state_up']: + net['status'] = 'DOWN' + try: + net['vim_info'] = yaml.safe_dump(net_vim, default_flow_style=True, width=256) + except yaml.representer.RepresenterError: + net['vim_info'] = str(net_vim) + if net_vim.get('fault'): #TODO + net['error_msg'] = str(net_vim['fault']) + except vimconn.vimconnNotFoundException as e: + self.logger.error("Exception getting net status: %s", str(e)) + net['status'] = "DELETED" + net['error_msg'] = str(e) + except vimconn.vimconnException as e: + self.logger.error("Exception getting net status: %s", str(e)) + net['status'] = "VIM_ERROR" + net['error_msg'] = str(e) + net_dict[net_id] = net + return net_dict + + def get_flavor(self, flavor_id): + '''Obtain flavor details from the VIM. Returns the flavor dict details''' + self.logger.debug("Getting flavor '%s'", flavor_id) try: self._reload_connection() flavor = self.nova.flavors.find(id=flavor_id) #TODO parse input and translate to VIM format (openmano_schemas.new_vminstance_response_schema) - return 1, {"flavor": flavor.to_dict()} - except nvExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= "flavor instance %s not found" % flavor_id - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "get_tenant_flavor " + error_text - return error_value, error_text + return flavor.to_dict() + except (nvExceptions.NotFound, nvExceptions.ClientException, ksExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) - def new_tenant_flavor(self, flavor_dict, change_name_if_used=True): + def new_flavor(self, flavor_data, change_name_if_used=True): '''Adds a tenant flavor to openstack VIM - if change_name_if_used is True, it will change name in case of conflict + if change_name_if_used is True, it will change name in case of conflict, because it is not supported name repetition Returns the flavor identifier ''' + self.logger.debug("Adding flavor '%s'", str(flavor_data)) retry=0 + max_retries=3 name_suffix = 0 - name=flavor_dict['name'] - while retry<2: + name=flavor_data['name'] + while retry0,id if ok; or <0,error_text if error + def delete_flavor(self,flavor_id): + '''Deletes a tenant flavor from openstack VIM. Returns the old flavor_id ''' - retry=0 - while retry<2: - retry+=1 - try: - self._reload_connection() - self.nova.flavors.delete(flavor_id) - return 1, flavor_id - except nvExceptions.NotFound as e: - error_value = -vimconn.HTTP_Not_Found - error_text = "flavor '%s' not found" % flavor_id - break - #except nvExceptions.BadRequest as e: - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - break - if self.debug: - print "delete_tenant_flavor " + error_text - #if reaching here is because an exception - return error_value, error_text + try: + self._reload_connection() + self.nova.flavors.delete(flavor_id) + return flavor_id + #except nvExceptions.BadRequest as e: + except (nvExceptions.NotFound, ksExceptions.ClientException, nvExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) - def new_tenant_image(self,image_dict): + def new_image(self,image_dict): ''' - Adds a tenant image to VIM - if change_name_if_used is True, it will change name in case of conflict - Returns: - >1, image-id if the image is created - <0, message if there is an error + Adds a tenant image to VIM. imge_dict is a dictionary with: + name: name + disk_format: qcow2, vhd, vmdk, raw (by default), ... + location: path or URI + public: "yes" or "no" + metadata: metadata of the image + Returns the image_id ''' - retry=0 #using version 1 of glance client glancev1 = gl1Client.Client('1',self.glance_endpoint, token=self.keystone.auth_token, **self.k_creds) #TODO check k_creds vs n_creds - while retry<2: + retry=0 + max_retries=3 + while retry0,id if ok; or <0,error_text if error + def delete_image(self, image_id): + '''Deletes a tenant image from openstack VIM. Returns the old id ''' - retry=0 - while retry<2: - retry+=1 - try: - self._reload_connection() - self.nova.images.delete(image_id) - return 1, image_id - except nvExceptions.NotFound as e: - error_value = -vimconn.HTTP_Not_Found - error_text = "flavor '%s' not found" % image_id - break - #except nvExceptions.BadRequest as e: - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - break - if self.debug: - print "delete_tenant_image " + error_text - #if reaching here is because an exception - return error_value, error_text + try: + self._reload_connection() + self.nova.images.delete(image_id) + return image_id + except (nvExceptions.NotFound, ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e: #TODO remove + self._format_exception(e) + + def get_image_id_from_path(self, path): + '''Get the image id from image path in the VIM database. Returns the image_id''' + try: + self._reload_connection() + images = self.nova.images.list() + for image in images: + if image.metadata.get("location")==path: + return image.id + raise vimconn.vimconnNotFoundException("image with location '{}' not found".format( path)) + except (ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e: + self._format_exception(e) - def new_tenant_vminstance(self,name,description,start,image_id,flavor_id,net_list): + def get_image_list(self, filter_dict={}): + '''Obtain tenant images from VIM + Filter_dict can be: + id: image id + name: image name + checksum: image checksum + Returns the image list of dictionaries: + [{}, ...] + List can be empty + ''' + self.logger.debug("Getting image list from VIM filter: '%s'", str(filter_dict)) + try: + self._reload_connection() + filter_dict_os=filter_dict.copy() + #First we filter by the available filter fields: name, id. The others are removed. + filter_dict_os.pop('checksum',None) + image_list=self.nova.images.findall(**filter_dict_os) + if len(image_list)==0: + return [] + #Then we filter by the rest of filter fields: checksum + filtered_list = [] + for image in image_list: + image_dict=self.glance.images.get(image.id) + if image_dict['checksum']==filter_dict.get('checksum'): + filtered_list.append(image) + return filtered_list + except (ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e: + self._format_exception(e) + + def new_vminstance(self,name,description,start,image_id,flavor_id,net_list,cloud_config=None): '''Adds a VM instance to VIM Params: start: indicates if VM must start or boot in pause mode. Ignored @@ -645,17 +622,14 @@ class vimconnector(vimconn.vimconnector): type: 'virtual', 'PF', 'VF', 'VFnotShared' vim_id: filled/added by this function #TODO ip, security groups - Returns >=0, the instance identifier - <0, error_text + Returns the instance identifier ''' - if self.debug: - print "osconnector: Creating VM into VIM" - print " image %s flavor %s nics=%s" %(image_id, flavor_id,net_list) + self.logger.debug("Creating VM image '%s' flavor '%s' nics='%s'",image_id, flavor_id,str(net_list)) try: - metadata=[] + metadata={} net_list_vim=[] self._reload_connection() - metadata_vpci={} + metadata_vpci={} #For a specific neutron plugin for net in net_list: if not net.get("net_id"): #skip non connected iface continue @@ -664,7 +638,7 @@ class vimconnector(vimconn.vimconnector): if "vpci" in net: metadata_vpci[ net["net_id"] ] = [[ net["vpci"], "" ]] elif net["type"]=="PF": - print "new_tenant_vminstance: Warning, can not connect a passthrough interface " + self.logger.warn("new_vminstance: Warning, can not connect a passthrough interface ") #TODO insert this when openstack consider passthrough ports as openstack neutron ports else: #VF if "vpci" in net: @@ -691,21 +665,48 @@ class vimconnector(vimconn.vimconnector): net_list_vim.append({"port-id": new_port["port"]["id"]}) if metadata_vpci: metadata = {"pci_assignement": json.dumps(metadata_vpci)} + if len(metadata["pci_assignement"]) >255: + #limit the metadata size + #metadata["pci_assignement"] = metadata["pci_assignement"][0:255] + self.logger.warn("Metadata deleted since it exceeds the expected length (255) ") + metadata = {} - print "name '%s' image_id '%s'flavor_id '%s' net_list_vim '%s' description '%s' metadata %s"\ - % (name, image_id, flavor_id, str(net_list_vim), description, str(metadata)) + self.logger.debug("name '%s' image_id '%s'flavor_id '%s' net_list_vim '%s' description '%s' metadata %s", + name, image_id, flavor_id, str(net_list_vim), description, str(metadata)) security_groups = self.config.get('security_groups') if type(security_groups) is str: security_groups = ( security_groups, ) + if isinstance(cloud_config, dict): + userdata="#cloud-config\nusers:\n" + #default user + if "key-pairs" in cloud_config: + userdata += " - default:\n ssh-authorized-keys:\n" + for key in cloud_config["key-pairs"]: + userdata += " - '{key}'\n".format(key=key) + for user in cloud_config.get("users",[]): + userdata += " - name: {name}\n sudo: ALL=(ALL) NOPASSWD:ALL\n".format(name=user["name"]) + if "user-info" in user: + userdata += " gecos: {}'\n".format(user["user-info"]) + if user.get("key-pairs"): + userdata += " ssh-authorized-keys:\n" + for key in user["key-pairs"]: + userdata += " - '{key}'\n".format(key=key) + self.logger.debug("userdata: %s", userdata) + elif isinstance(cloud_config, str): + userdata = cloud_config + else: + userdata=None + server = self.nova.servers.create(name, image_id, flavor_id, nics=net_list_vim, meta=metadata, security_groups = security_groups, availability_zone = self.config.get('availability_zone'), key_name = self.config.get('keypair'), + userdata=userdata ) #, description=description) - print "DONE :-)", server + #print "DONE :-)", server # #TODO server.add_floating_ip("10.95.87.209") # #To look for a free floating_ip @@ -718,44 +719,28 @@ class vimconnector(vimconn.vimconnector): # server.add_floating_ip(free_floating_ip) - return 1, server.id + return server.id # except nvExceptions.NotFound as e: # error_value=-vimconn.HTTP_Not_Found # error_text= "vm instance %s not found" % vm_id - except (ksExceptions.ClientException, nvExceptions.ClientException, ConnectionError, TypeError) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - except neClient.exceptions.ConnectionFailed as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "new_tenant_vminstance Exception",e, error_text - return error_value, error_text + except (ksExceptions.ClientException, nvExceptions.ClientException, ConnectionError + ) as e: + self._format_exception(e) + except TypeError as e: + raise vimconn.vimconnException(type(e).__name__ + ": "+ str(e), http_code=vimconn.HTTP_Bad_Request) - def get_tenant_vminstance(self,vm_id): + def get_vminstance(self,vm_id): '''Returns the VM instance information from VIM''' - if self.debug: - print "osconnector: Getting VM from VIM" + #self.logger.debug("Getting VM from VIM") try: self._reload_connection() server = self.nova.servers.find(id=vm_id) #TODO parse input and translate to VIM format (openmano_schemas.new_vminstance_response_schema) - return 1, {"server": server.to_dict()} - except nvExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= "vm instance %s not found" % vm_id - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "get_tenant_vminstance " + error_text - return error_value, error_text - - def get_tenant_vminstance_console(self,vm_id, console_type="vnc"): + return server.to_dict() + except (ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.NotFound, ConnectionError) as e: + self._format_exception(e) + + def get_vminstance_console(self,vm_id, console_type="vnc"): ''' Get a console for the virtual machine Params: @@ -763,11 +748,13 @@ class vimconnector(vimconn.vimconnector): console_type, can be: "novnc" (by default), "xvpvnc" for VNC types, "rdp-html5" for RDP types, "spice-html5" for SPICE types - Returns <0, text on error, for example not available - 1, URL/text with the console parameters + Returns dict with the console parameters: + protocol: ssh, ftp, http, https, ... + server: usually ip address + port: the http, ssh, ... port + suffix: extra text, e.g. the http path and query string ''' - if self.debug: - print "osconnector: Getting VM CONSOLE from VIM" + self.logger.debug("Getting VM CONSOLE from VIM") try: self._reload_connection() server = self.nova.servers.find(id=vm_id) @@ -780,7 +767,7 @@ class vimconnector(vimconn.vimconnector): elif console_type == "spice-html5": console_dict = server.get_spice_console(console_type) else: - return -vimconn.HTTP_Bad_Request, "console type '%s' not allowed" % console_type + raise vimconn.vimconnException("console type '{}' not allowed".format(console_type), http_code=vimconn.HTTP_Bad_Request) console_dict1 = console_dict.get("console") if console_dict1: @@ -798,31 +785,16 @@ class vimconnector(vimconn.vimconnector): "suffix": console_url[suffix_index+1:] } protocol_index += 2 - return 1, console_dict - return -vimconn.HTTP_Internal_Server_Error, "Unexpected response from VIM" + return console_dict + raise vimconn.vimconnUnexpectedResponse("Unexpected response from VIM") - #TODO parse input and translate to VIM format (openmano_schemas.new_vminstance_response_schema) - return 1, {"server": server.to_dict()} - except nvExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= "vm instance %s not found" % vm_id - except (ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.BadRequest) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - #TODO insert exception vimconn.HTTP_Unauthorized - #if reaching here is because an exception - if self.debug: - print "get_tenant_vminstance " + error_text - return error_value, error_text - + except (nvExceptions.NotFound, ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.BadRequest, ConnectionError) as e: + self._format_exception(e) - def delete_tenant_vminstance(self, vm_id): - '''Removes a VM instance from VIM - Returns >0, the instance identifier - <0, error_text + def delete_vminstance(self, vm_id): + '''Removes a VM instance from VIM. Returns the old identifier ''' - if self.debug: - print "osconnector: Getting VM from VIM" + #print "osconnector: Getting VM from VIM" try: self._reload_connection() #delete VM ports attached to this networks before the virtual machine @@ -831,125 +803,95 @@ class vimconnector(vimconn.vimconnector): try: self.neutron.delete_port(p["id"]) except Exception as e: - print "Error deleting port: " + type(e).__name__ + ": "+ str(e) + self.logger.error("Error deleting port: " + type(e).__name__ + ": "+ str(e)) self.nova.servers.delete(vm_id) - return 1, vm_id - except nvExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= (str(e) if len(e.args)==0 else str(e.args[0])) - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) + return vm_id + except (nvExceptions.NotFound, ksExceptions.ClientException, nvExceptions.ClientException, ConnectionError) as e: + self._format_exception(e) #TODO insert exception vimconn.HTTP_Unauthorized #if reaching here is because an exception - if self.debug: - print "get_tenant_vminstance " + error_text - return error_value, error_text - def refresh_tenant_vms_and_nets(self, vmDict, netDict): - '''Refreshes the status of the dictionaries of VM instances and nets passed as arguments. It modifies the dictionaries - Returns: - - result: 0 if all elements could be refreshed (even if its status didn't change) - n>0, the number of elements that couldn't be refreshed, - <0 if error (foreseen) - - error_msg: text with reference to possible errors + def refresh_vms_status(self, vm_list): + '''Get the status of the virtual machines and their interfaces/ports + Params: the list of VM identifiers + Returns a dictionary with: + vm_id: #VIM id of this Virtual Machine + status: #Mandatory. Text with one of: + # DELETED (not found at vim) + # VIM_ERROR (Cannot connect to VIM, VIM response error, ...) + # OTHER (Vim reported other status not understood) + # ERROR (VIM indicates an ERROR status) + # ACTIVE, PAUSED, SUSPENDED, INACTIVE (not running), + # CREATING (on building process), ERROR + # ACTIVE:NoMgmtIP (Active but any of its interface has an IP address + # + error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR + vim_info: #Text with plain information obtained from vim (yaml.safe_dump) + interfaces: + - vim_info: #Text with plain information obtained from vim (yaml.safe_dump) + mac_address: #Text format XX:XX:XX:XX:XX:XX + vim_net_id: #network id where this interface is connected + vim_interface_id: #interface/port VIM id + ip_address: #null, or text with IPv4, IPv6 address ''' - #vms_refreshed = [] - #nets_refreshed = [] - vms_unrefreshed = [] - nets_unrefreshed = [] - if self.debug: - print "osconnector refresh_tenant_vms and nets: Getting tenant VM instance information from VIM" - for vm_id in vmDict: - vmDict[vm_id] = {'error_msg':None, 'vim_info':None} - r,c = self.get_tenant_vminstance(vm_id) - if r<0: - print "osconnector refresh_tenant_vm. Error getting vm_id '%s' status: %s" % (vm_id, c) - if r==-vimconn.HTTP_Not_Found: - vmDict[vm_id]['status'] = "DELETED" + vm_dict={} + self.logger.debug("refresh_vms status: Getting tenant VM instance information from VIM") + for vm_id in vm_list: + vm={} + try: + vm_vim = self.get_vminstance(vm_id) + if vm_vim['status'] in vmStatus2manoFormat: + vm['status'] = vmStatus2manoFormat[ vm_vim['status'] ] else: - vmDict[vm_id]['status'] = "VIM_ERROR" - vmDict[vm_id]['error_msg'] = c - vms_unrefreshed.append(vm_id) - else: + vm['status'] = "OTHER" + vm['error_msg'] = "VIM status reported " + vm_vim['status'] try: - vmDict[vm_id]['status'] = vmStatus2manoFormat[ c['server']['status'] ] - vmDict[vm_id]['vim_info'] = yaml.safe_dump(c['server']) - vmDict[vm_id]["interfaces"] = [] - if c['server'].get('fault'): - vmDict[vm_id]['error_msg'] = str(c['server']['fault']) - #get interfaces - try: - self._reload_connection() - port_dict=self.neutron.list_ports(device_id=vm_id) - for port in port_dict["ports"]: - interface={} - interface['vim_info'] = yaml.safe_dump(port) - interface["mac_address"] = port.get("mac_address") - interface["vim_net_id"] = port["network_id"] - interface["vim_interface_id"] = port["id"] - ips=[] - #look for floating ip address - floating_ip_dict = self.neutron.list_floatingips(port_id=port["id"]) - if floating_ip_dict.get("floatingips"): - ips.append(floating_ip_dict["floatingips"][0].get("floating_ip_address") ) - - for subnet in port["fixed_ips"]: - ips.append(subnet["ip_address"]) - interface["ip_address"] = ";".join(ips) - vmDict[vm_id]["interfaces"].append(interface) - except Exception as e: - print type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - - - #error message at server.fault["message"] - except KeyError as e: - print "osconnector refresh_tenant_elements KeyError %s getting vm_id '%s' status %s" % (str(e), vm_id, c['server']['status']) - vmDict[vm_id]['status'] = "VIM_ERROR" - vmDict[vm_id]['error_msg'] = str(e) - vms_unrefreshed.append(vm_id) - - #print "VMs refreshed: %s" % str(vms_refreshed) - for net_id in netDict: - netDict[net_id]={'error_msg':None, 'vim_info':None} - r,c = self.get_tenant_network(net_id) - if r<0: - print "osconnector refresh_tenant_network. Error getting net_id '%s' status: %s" % (net_id, c) - if r==-vimconn.HTTP_Not_Found: - netDict[net_id]['status'] = "DELETED" #TODO check exit status - else: - netDict[vm_id]['status'] = "VIM_ERROR" - netDict[vm_id]['error_msg'] = c - nets_unrefreshed.append(net_id) - else: + vm['vim_info'] = yaml.safe_dump(vm_vim, default_flow_style=True, width=256) + except yaml.representer.RepresenterError: + vm['vim_info'] = str(vm_vim) + vm["interfaces"] = [] + if vm_vim.get('fault'): + vm['error_msg'] = str(vm_vim['fault']) + #get interfaces try: - netDict[net_id]['status'] = netStatus2manoFormat[ c['status'] ] - if c['status'] == "ACIVE" and not c['admin_state_up']: - netDict[net_id]['status'] = 'DOWN' - netDict[net_id]['vim_info'] = yaml.safe_dump(c) - if c.get('fault'): #TODO - netDict[net_id]['error_msg'] = str(c['fault']) - except KeyError as e: - print "osconnector refresh_tenant_elements KeyError %s getting vm_id '%s' status %s" % (str(e), vm_id, c['network']['status']) - netDict[net_id]['status'] = "VIM_ERROR" - netDict[net_id]['error_msg'] = str(e) - nets_unrefreshed.append(net_id) + self._reload_connection() + port_dict=self.neutron.list_ports(device_id=vm_id) + for port in port_dict["ports"]: + interface={} + try: + interface['vim_info'] = yaml.safe_dump(port, default_flow_style=True, width=256) + except yaml.representer.RepresenterError: + interface['vim_info'] = str(port) + interface["mac_address"] = port.get("mac_address") + interface["vim_net_id"] = port["network_id"] + interface["vim_interface_id"] = port["id"] + ips=[] + #look for floating ip address + floating_ip_dict = self.neutron.list_floatingips(port_id=port["id"]) + if floating_ip_dict.get("floatingips"): + ips.append(floating_ip_dict["floatingips"][0].get("floating_ip_address") ) - #print "Nets refreshed: %s" % str(nets_refreshed) - - error_msg="" - if len(vms_unrefreshed)+len(nets_unrefreshed)>0: - error_msg += "VMs unrefreshed: " + str(vms_unrefreshed) + "; nets unrefreshed: " + str(nets_unrefreshed) - print error_msg - - #return len(vms_unrefreshed)+len(nets_unrefreshed), error_msg, vms_refreshed, nets_refreshed - return len(vms_unrefreshed)+len(nets_unrefreshed), error_msg + for subnet in port["fixed_ips"]: + ips.append(subnet["ip_address"]) + interface["ip_address"] = ";".join(ips) + vm["interfaces"].append(interface) + except Exception as e: + self.logger.error("Error getting vm interface information " + type(e).__name__ + ": "+ str(e)) + except vimconn.vimconnNotFoundException as e: + self.logger.error("Exception getting vm status: %s", str(e)) + vm['status'] = "DELETED" + vm['error_msg'] = str(e) + except vimconn.vimconnException as e: + self.logger.error("Exception getting vm status: %s", str(e)) + vm['status'] = "VIM_ERROR" + vm['error_msg'] = str(e) + vm_dict[vm_id] = vm + return vm_dict - def action_tenant_vminstance(self, vm_id, action_dict): + def action_vminstance(self, vm_id, action_dict): '''Send and action over a VM instance from VIM - Returns the status''' - if self.debug: - print "osconnector: Action over VM instance from VIM " + vm_id + Returns the vm_id if the action was successfully sent to the VIM''' + self.logger.debug("Action over VM '%s': %s", vm_id, str(action_dict)) try: self._reload_connection() server = self.nova.servers.find(id=vm_id) @@ -996,8 +938,8 @@ class vimconnector(vimconn.vimconnector): elif console_type == "spice-html5": console_dict = server.get_spice_console(console_type) else: - return -vimconn.HTTP_Bad_Request, "console type '%s' not allowed" % console_type - + raise vimconn.vimconnException("console type '{}' not allowed".format(console_type), + http_code=vimconn.HTTP_Bad_Request) try: console_url = console_dict["console"]["url"] #parse console_url @@ -1005,32 +947,80 @@ class vimconnector(vimconn.vimconnector): suffix_index = console_url[protocol_index+2:].find("/") + protocol_index+2 port_index = console_url[protocol_index+2:suffix_index].find(":") + protocol_index+2 if protocol_index < 0 or port_index<0 or suffix_index<0: - print "action_tenant_vminstance, console: response", str(console_dict) - return -vimconn.HTTP_Internal_Server_Error, "Unexpected response from VIM" + raise vimconn.vimconnException("Unexpected response from VIM " + str(console_dict)) console_dict2={"protocol": console_url[0:protocol_index], "server": console_url[protocol_index+2 : port_index], "port": int(console_url[port_index+1 : suffix_index]), "suffix": console_url[suffix_index+1:] } - protocol_index += 2 - return 1, console_dict2 - except: - print "action_tenant_vminstance, console: response", str(console_dict) - return -vimconn.HTTP_Internal_Server_Error, "Unexpected response from VIM" + return console_dict2 + except Exception as e: + raise vimconn.vimconnException("Unexpected response from VIM " + str(console_dict)) - return 1, vm_id - except nvExceptions.NotFound as e: - error_value=-vimconn.HTTP_Not_Found - error_text= (str(e) if len(e.args)==0 else str(e.args[0])) - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: + return vm_id + except (ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.NotFound, ConnectionError) as e: + self._format_exception(e) + #TODO insert exception vimconn.HTTP_Unauthorized + +#NOT USED FUNCTIONS + + def new_external_port(self, port_data): + #TODO openstack if needed + '''Adds a external port to VIM''' + '''Returns the port identifier''' + return -vimconn.HTTP_Internal_Server_Error, "osconnector.new_external_port() not implemented" + + def connect_port_network(self, port_id, network_id, admin=False): + #TODO openstack if needed + '''Connects a external port to a network''' + '''Returns status code of the VIM response''' + return -vimconn.HTTP_Internal_Server_Error, "osconnector.connect_port_network() not implemented" + + def new_user(self, user_name, user_passwd, tenant_id=None): + '''Adds a new user to openstack VIM''' + '''Returns the user identifier''' + self.logger.debug("osconnector: Adding a new user to VIM") + try: + self._reload_connection() + user=self.keystone.users.create(user_name, user_passwd, tenant_id=tenant_id) + #self.keystone.tenants.add_user(self.k_creds["username"], #role) + return user.id + except ksExceptions.ConnectionError as e: + error_value=-vimconn.HTTP_Bad_Request + error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) + except ksExceptions.ClientException as e: #TODO remove error_value=-vimconn.HTTP_Bad_Request error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) #TODO insert exception vimconn.HTTP_Unauthorized #if reaching here is because an exception if self.debug: - print "action_tenant_vminstance " + error_text + self.logger.debug("new_user " + error_text) return error_value, error_text - + + def delete_user(self, user_id): + '''Delete a user from openstack VIM''' + '''Returns the user identifier''' + if self.debug: + print "osconnector: Deleting a user from VIM" + try: + self._reload_connection() + self.keystone.users.delete(user_id) + return 1, user_id + except ksExceptions.ConnectionError as e: + error_value=-vimconn.HTTP_Bad_Request + error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) + except ksExceptions.NotFound as e: + error_value=-vimconn.HTTP_Not_Found + error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) + except ksExceptions.ClientException as e: #TODO remove + error_value=-vimconn.HTTP_Bad_Request + error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) + #TODO insert exception vimconn.HTTP_Unauthorized + #if reaching here is because an exception + if self.debug: + print "delete_tenant " + error_text + return error_value, error_text + def get_hosts_info(self): '''Get the information of deployed hosts Returns the hosts content''' @@ -1084,26 +1074,4 @@ class vimconnector(vimconn.vimconnector): print "get_hosts " + error_text return error_value, error_text - def get_image_id_from_path(self, path): - '''Get the image id from image path in the VIM database''' - '''Returns: - 0,"Image not found" if there are no images with that path - 1,image-id if there is one image with that path - <0,message if there was an error (Image not found, error contacting VIM, more than 1 image with that path, etc.) - ''' - try: - self._reload_connection() - images = self.nova.images.list() - for image in images: - if image.metadata.get("location")==path: - return 1, image.id - return 0, "image with location '%s' not found" % path - except (ksExceptions.ClientException, nvExceptions.ClientException) as e: #TODO remove - error_value=-vimconn.HTTP_Bad_Request - error_text= type(e).__name__ + ": "+ (str(e) if len(e.args)==0 else str(e.args[0])) - if self.debug: - print "get_image_id_from_path " + error_text - #if reaching here is because an exception - return error_value, error_text -