diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-20 02:13:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-20 02:13:30 +0000 |
| commit | c2ff9c998ab848aa015d257fe02f2429faf752d6 (patch) | |
| tree | 86a0a260a55ebf6f0a0c062528ff2ba97fdc602b /nova/api | |
| parent | 13079fbd8c56ff374cdb989274c23bd02e46a137 (diff) | |
| parent | 09b903ed5e3306cf200328f41ce6df371923d03d (diff) | |
Merge "Fix marker pagination for /servers"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 18161b830..53fb6517d 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -496,9 +496,14 @@ class Controller(wsgi.Controller): search_opts['user_id'] = context.user_id limit, marker = common.get_limit_and_marker(req) - instance_list = self.compute_api.get_all(context, - search_opts=search_opts, - limit=limit, marker=marker) + try: + instance_list = self.compute_api.get_all(context, + search_opts=search_opts, + limit=limit, + marker=marker) + except exception.MarkerNotFound as e: + msg = _('marker [%s] not found') % marker + raise webob.exc.HTTPBadRequest(explanation=msg) if is_detail: self._add_instance_faults(context, instance_list) |