diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 22:35:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 22:35:29 +0000 |
| commit | fe739ce459ba6fbfab991baa0e295d76d05a40e0 (patch) | |
| tree | 0145c77b7fbd5cdd984e6d584f9e64c89bcf8a02 /nova | |
| parent | 86b91474d16fb9842bb75dc7ebd1af364cc8a058 (diff) | |
| parent | e142d21b47e8895a013c468936e69ba0e7e66041 (diff) | |
Merge "Return empty list when listing servers with bad status value"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 5 |
2 files changed, 4 insertions, 4 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: diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 58b81bf0c..34b09b185 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -811,9 +811,10 @@ class ServersControllerTest(test.TestCase): def test_get_servers_invalid_status(self): """Test getting servers by invalid status""" - req = fakes.HTTPRequest.blank('/v2/fake/servers?status=unknown', + req = fakes.HTTPRequest.blank('/v2/fake/servers?status=baloney', use_admin_context=False) - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.index, req) + servers = self.controller.index(req)['servers'] + self.assertEqual(len(servers), 0) def test_get_servers_deleted_status_as_user(self): req = fakes.HTTPRequest.blank('/v2/fake/servers?status=deleted', |