Merge "Pass kwargs to exception to get better format of error message"
This commit is contained in:
commit
926e584136
|
@ -47,7 +47,7 @@ def block_db_access(service_name):
|
||||||
LOG.error('No db access allowed in %(service_name)s: '
|
LOG.error('No db access allowed in %(service_name)s: '
|
||||||
'%(stacktrace)s',
|
'%(stacktrace)s',
|
||||||
dict(service_name=service_name, stacktrace=stacktrace))
|
dict(service_name=service_name, stacktrace=stacktrace))
|
||||||
raise exception.DBNotAllowed(service_name)
|
raise exception.DBNotAllowed(binary=service_name)
|
||||||
|
|
||||||
nova.db.api.IMPL = NoDB()
|
nova.db.api.IMPL = NoDB()
|
||||||
|
|
||||||
|
|
|
@ -1788,7 +1788,7 @@ def instance_destroy(context, instance_uuid, constraint=None):
|
||||||
if uuidutils.is_uuid_like(instance_uuid):
|
if uuidutils.is_uuid_like(instance_uuid):
|
||||||
instance_ref = _instance_get_by_uuid(context, instance_uuid)
|
instance_ref = _instance_get_by_uuid(context, instance_uuid)
|
||||||
else:
|
else:
|
||||||
raise exception.InvalidUUID(instance_uuid)
|
raise exception.InvalidUUID(uuid=instance_uuid)
|
||||||
|
|
||||||
query = model_query(context, models.Instance).\
|
query = model_query(context, models.Instance).\
|
||||||
filter_by(uuid=instance_uuid)
|
filter_by(uuid=instance_uuid)
|
||||||
|
@ -2772,7 +2772,7 @@ def _instance_metadata_update_in_place(context, instance, metadata_type, model,
|
||||||
|
|
||||||
def _instance_update(context, instance_uuid, values, expected, original=None):
|
def _instance_update(context, instance_uuid, values, expected, original=None):
|
||||||
if not uuidutils.is_uuid_like(instance_uuid):
|
if not uuidutils.is_uuid_like(instance_uuid):
|
||||||
raise exception.InvalidUUID(instance_uuid)
|
raise exception.InvalidUUID(uuid=instance_uuid)
|
||||||
|
|
||||||
if expected is None:
|
if expected is None:
|
||||||
expected = {}
|
expected = {}
|
||||||
|
|
Loading…
Reference in New Issue