diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-20 22:18:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-20 22:18:19 +0000 |
| commit | d9b316c18c70e8616578033a9ef353721d5f28c3 (patch) | |
| tree | 8ef5a51f315879de7e40525ca5d9fc41d843b787 | |
| parent | 0365d29262ee8403d36e5ae04e13443241e9d27e (diff) | |
| parent | 37abdd9968ad19fc29abde5783e6e07c9a4637cb (diff) | |
| download | nova-d9b316c18c70e8616578033a9ef353721d5f28c3.tar.gz nova-d9b316c18c70e8616578033a9ef353721d5f28c3.tar.xz nova-d9b316c18c70e8616578033a9ef353721d5f28c3.zip | |
Merge "Added attribute 'ip' to server search options."
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 2df16c886..166c8b10e 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -1392,7 +1392,7 @@ class Controller(wsgi.Controller): def _get_server_search_options(self): """Return server search options allowed by non-admin.""" return ('reservation_id', 'name', 'status', 'image', 'flavor', - 'changes-since', 'all_tenants') + 'ip', 'changes-since', 'all_tenants') def create_resource(ext_mgr): diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 5d2118564..22aecf020 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -935,10 +935,10 @@ class ServersControllerTest(test.TestCase): self.assertNotEqual(search_opts, None) # Allowed by user self.assertTrue('name' in search_opts) + self.assertTrue('ip' in search_opts) # OSAPI converts status to vm_state self.assertTrue('vm_state' in search_opts) # Allowed only by admins with admin API on - self.assertFalse('ip' in search_opts) self.assertFalse('unknown_option' in search_opts) return [fakes.stub_instance(100, uuid=server_uuid)] @@ -981,10 +981,8 @@ class ServersControllerTest(test.TestCase): self.assertEqual(len(servers), 1) self.assertEqual(servers[0]['id'], server_uuid) - def test_get_servers_admin_allows_ip(self): - """Test getting servers by ip with admin_api enabled and - admin context - """ + def test_get_servers_allows_ip(self): + """Test getting servers by ip.""" server_uuid = str(uuid.uuid4()) def fake_get_all(compute_self, context, search_opts=None, @@ -997,8 +995,7 @@ class ServersControllerTest(test.TestCase): self.stubs.Set(compute_api.API, 'get_all', fake_get_all) - req = fakes.HTTPRequest.blank('/v2/fake/servers?ip=10\..*', - use_admin_context=True) + req = fakes.HTTPRequest.blank('/v2/fake/servers?ip=10\..*') servers = self.controller.index(req)['servers'] self.assertEqual(len(servers), 1) |