openstack/nova
Code Issues Proposed changes

Don't overwrite MarkerNotFound error message

Browse Source 
Several places raising MarkerNotFound were overwriting the
error message with the marker key. This fixes that by passing
the marker as a kwarg so the message is formatted properly.

Change-Id: I6d5c7048a5636e2cef15a6dab0d568c89e713a87
This commit is contained in:
Matt Riedemann 2016-07-11 15:24:51 -04:00
parent 2ddba44614
commit 146876c4c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/db/sqlalchemy/api.py
View File

@ -586,7 +586,7 @@ def _compute_node_select(context, filters=None, limit=None, marker=None):
try:
compute_node_get(context, marker)
except exception.ComputeHostNotFound:
raise exception.MarkerNotFound(marker)
raise exception.MarkerNotFound(marker=marker)
select = select.where(cn_tbl.c.id > marker)
if limit is not None:
select = select.limit(limit)
@ -2197,7 +2197,7 @@ def instance_get_all_by_filters_sort(context, filters, limit=None, marker=None,
marker = _instance_get_by_uuid(
context.elevated(read_deleted='yes'), marker)
except exception.InstanceNotFound:
raise exception.MarkerNotFound(marker)
raise exception.MarkerNotFound(marker=marker)
try:
query_prefix = sqlalchemyutils.paginate_query(query_prefix,
models.Instance, limit,
@ -4987,7 +4987,7 @@ def flavor_get_all(context, inactive=False, filters=None,
filter_by(flavorid=marker).\
first()
if not marker_row:
raise exception.MarkerNotFound(marker)
raise exception.MarkerNotFound(marker=marker)
query = sqlalchemyutils.paginate_query(query, models.InstanceTypes, limit,
[sort_key, 'id'],

2
nova/objects/flavor.py
View File

@ -629,7 +629,7 @@ def _flavor_get_all_from_db(context, inactive, filters, sort_key, sort_dir,
filter_by(flavorid=marker).\
first()
if not marker_row:
raise exception.MarkerNotFound(marker)
raise exception.MarkerNotFound(marker=marker)
query = sqlalchemyutils.paginate_query(query, api_models.Flavors,
limit,