From 146876c4c58317a1550bea47343b4aea4eac6f84 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 11 Jul 2016 15:24:51 -0400 Subject: [PATCH] Don't overwrite MarkerNotFound error message 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 --- nova/db/sqlalchemy/api.py | 6 +++--- nova/objects/flavor.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index a97c28d62f48..1ab4190233a6 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -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'], diff --git a/nova/objects/flavor.py b/nova/objects/flavor.py index 0007b2099e98..d8bcaebe1a0f 100644 --- a/nova/objects/flavor.py +++ b/nova/objects/flavor.py @@ -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,