openstack/blazar
Code Issues Proposed changes

Pass kwargs to exception to get better format of error message

Browse Source 
If we do not pass kwargs to exception, the parameter will be deemed
as message and will be displayed directly. This is to pass kwargs to
MultipleHostsFound and UnsupportedResourceType, to get better format
of error message.

Change-Id: Ib40ee68249b34f3e83100c5da8d30e13ff820dfa
This commit is contained in:
zhufl
2019-04-18 10:22:42 +08:00
parent c36dc9b652
commit 985876e9a8
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
blazar/db/sqlalchemy/utils.py
View File

@@ -126,7 +126,8 @@ def get_plugin_reservation(resource_type, resource_id):
elif resource_type == instance_plugin.RESOURCE_TYPE:
return api.instance_reservation_get(resource_id)
else:
raise mgr_exceptions.UnsupportedResourceType(resource_type)
raise mgr_exceptions.UnsupportedResourceType(
resource_type=resource_type)
def get_free_periods(resource_id, start_date, end_date, duration,

6
blazar/manager/service.py
View File

@@ -597,7 +597,8 @@ class ManagerService(service_utils.RPCServer):
def _create_reservation(self, values):
resource_type = values['resource_type']
if resource_type not in self.plugins:
raise exceptions.UnsupportedResourceType(resource_type)
raise exceptions.UnsupportedResourceType(
resource_type=resource_type)
reservation_values = {
'lease_id': values['lease_id'],
'resource_type': resource_type,
@@ -677,7 +678,8 @@ class ManagerService(service_utils.RPCServer):
except KeyError:
LOG.error("Plugin with resource type %s not found",
resource_type)
raise exceptions.UnsupportedResourceType(resource_type)
raise exceptions.UnsupportedResourceType(
resource_type=resource_type)
except AttributeError:
LOG.error("Plugin %s doesn't include method %s",
self.plugins[resource_type], method)

4
blazar/utils/openstack/nova.py
View File

@@ -480,7 +480,7 @@ class NovaInventory(NovaClientWrapper):
except nova_exception.NotFound:
raise manager_exceptions.HostNotFound(host=host)
if len(hypervisors_list) > 1:
raise manager_exceptions.MultipleHostsFound(host)
raise manager_exceptions.MultipleHostsFound(host=host)
else:
hypervisor_id = hypervisors_list[0].id
# NOTE(sbauza): No need to catch the exception as we're sure
@@ -523,7 +523,7 @@ class NovaInventory(NovaClientWrapper):
except nova_exception.NotFound:
raise manager_exceptions.HostNotFound(host=host)
if len(hypervisors_list) > 1:
raise manager_exceptions.MultipleHostsFound(host)
raise manager_exceptions.MultipleHostsFound(host=host)
else:
try:
return hypervisors_list[0].servers