summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-24 22:35:29 +0000
committerGerrit Code Review <review@openstack.org>2012-10-24 22:35:29 +0000
commitfe739ce459ba6fbfab991baa0e295d76d05a40e0 (patch)
tree0145c77b7fbd5cdd984e6d584f9e64c89bcf8a02 /nova/api
parent86b91474d16fb9842bb75dc7ebd1af364cc8a058 (diff)
parente142d21b47e8895a013c468936e69ba0e7e66041 (diff)
Merge "Return empty list when listing servers with bad status value"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 8288f0424..c19800a56 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -490,8 +490,7 @@ class Controller(wsgi.Controller):
if status is not None:
state = common.vm_state_from_status(status)
if state is None:
- msg = _('Invalid server status: %(status)s') % locals()
- raise exc.HTTPBadRequest(explanation=msg)
+ return {'servers': []}
search_opts['vm_state'] = state
if 'changes-since' in search_opts: