diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 23:13:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 23:13:47 +0000 |
| commit | 1d8af7541495f460d573dbb245aed8750c4bcbb2 (patch) | |
| tree | 0aba1aa72a34e667d13190db01a28e626a45e08c /nova | |
| parent | e23230daef3b7fff3f60207c48507ae18d8018c6 (diff) | |
| parent | e06d8bc8cd2b9cc98b0105d036479cb3773b30ac (diff) | |
| download | nova-1d8af7541495f460d573dbb245aed8750c4bcbb2.tar.gz nova-1d8af7541495f460d573dbb245aed8750c4bcbb2.tar.xz nova-1d8af7541495f460d573dbb245aed8750c4bcbb2.zip | |
Merge "Makes key_name show in details view of servers"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/compute/contrib/keypairs.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_keypairs.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py index ab264f9da..dc0c74b11 100644 --- a/nova/api/openstack/compute/contrib/keypairs.py +++ b/nova/api/openstack/compute/contrib/keypairs.py @@ -175,7 +175,7 @@ class Controller(servers.Controller): @wsgi.extends def detail(self, req, resp_obj): context = req.environ['nova.context'] - if 'servers' in resp_obj.obj and authorize(context): + if 'servers' in resp_obj.obj and soft_authorize(context): resp_obj.attach(xml=ServersKeyNameTemplate()) servers = resp_obj.obj['servers'] self._add_key_name(req, servers) diff --git a/nova/tests/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/api/openstack/compute/contrib/test_keypairs.py index 0019f757b..a14a64da5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/api/openstack/compute/contrib/test_keypairs.py @@ -284,14 +284,15 @@ class KeypairsTest(test.TestCase): self.assertEquals(res_dict['server']['key_name'], '') def test_detail_servers(self): - self.stubs.Set(db, 'instance_get', - fakes.fake_instance_get()) + self.stubs.Set(db, 'instance_get_all_by_filters', + fakes.fake_instance_get_all_by_filters()) req = fakes.HTTPRequest.blank('/v2/fake/servers/detail') res = req.get_response(fakes.wsgi_app()) server_dicts = jsonutils.loads(res.body)['servers'] + self.assertEquals(len(server_dicts), 5) for server_dict in server_dicts: - self.asserTrue('key_name' in server_dict) + self.assertTrue('key_name' in server_dict) self.assertEquals(server_dict['key_name'], '') |