diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-09-12 10:37:29 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-09-12 10:38:58 -0700 |
| commit | e06d8bc8cd2b9cc98b0105d036479cb3773b30ac (patch) | |
| tree | c18929402c058e93557b4fce608789f2f62f37b5 | |
| parent | 511807ed248fbe63cb6642c1cff6e0bd4bb8ae5d (diff) | |
| download | nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.tar.gz nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.tar.xz nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.zip | |
Makes key_name show in details view of servers
The wrong authorizor was being used in the details view and the test
for details was broken. This fixes the test and makes sure that
key_name shows up in details like it is supposed to.
Fixes bug 1043584
Change-Id: I4ff01bbd32759f30e7a31ef2eac9f58922843037
| -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'], '') |