From adbccac10a362d7464bb30f9ae923d0446833a21 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 5 Mar 2013 10:13:44 -0500 Subject: Don't traceback in the API on invalid keypair. When trying to get a keypair that did not exist, a traceback would end up in the nova-api log. Handle this exception in the API extension so that it doesn't make a mess of the log. Also add a unit test for this particular scenario. Fix bug 1145545. Change-Id: Id1647d4ac56629c2931099320d271e34fc2f99b9 --- nova/api/openstack/compute/contrib/keypairs.py | 5 ++++- nova/tests/api/openstack/compute/contrib/test_keypairs.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py index 4f6ad6b18..a79b39aae 100644 --- a/nova/api/openstack/compute/contrib/keypairs.py +++ b/nova/api/openstack/compute/contrib/keypairs.py @@ -119,7 +119,10 @@ class KeypairController(object): context = req.environ['nova.context'] authorize(context) - keypair = self.api.get_key_pair(context, context.user_id, id) + try: + keypair = self.api.get_key_pair(context, context.user_id, id) + except exception.KeypairNotFound: + raise webob.exc.HTTPNotFound() return {'keypair': keypair} @wsgi.serializers(xml=KeypairsTemplate) diff --git a/nova/tests/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/api/openstack/compute/contrib/test_keypairs.py index 06454b123..025845637 100644 --- a/nova/tests/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/api/openstack/compute/contrib/test_keypairs.py @@ -236,6 +236,11 @@ class KeypairsTest(test.TestCase): res = req.get_response(self.app) self.assertEqual(res.status_int, 202) + def test_keypair_get_keypair_not_found(self): + req = webob.Request.blank('/v2/fake/os-keypairs/DOESNOTEXIST') + res = req.get_response(self.app) + self.assertEqual(res.status_int, 404) + def test_keypair_delete_not_found(self): def db_key_pair_get_not_found(context, user_id, name): -- cgit