From 73eff8376310513af98545ad423bd88b5e4593fd Mon Sep 17 00:00:00 2001 From: Ajaya Agrawal Date: Fri, 20 Mar 2015 16:26:18 +0530 Subject: [PATCH] Correct text in error response The text message earlier was not helpful while listing members of a public image. A more helpful message will be given to user after this commit is accepted. Change-Id: Ifa2df37baea50c78c622344847f2c7117c17e3f4 Closes-bug: 1434501 --- glance/api/v2/image_members.py | 6 +++--- glance/tests/functional/v2/test_images.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glance/api/v2/image_members.py b/glance/api/v2/image_members.py index 5f80edcae9..856f34ac60 100644 --- a/glance/api/v2/image_members.py +++ b/glance/api/v2/image_members.py @@ -160,10 +160,10 @@ class ImageMembersController(object): msg = _("Image %s not found.") % image_id LOG.warning(msg) raise webob.exc.HTTPNotFound(explanation=msg) - except exception.Forbidden: + except exception.Forbidden as e: msg = _("Not allowed to list members for image %s.") % image_id - LOG.warning(msg) - raise webob.exc.HTTPForbidden(explanation=msg) + LOG.warning(e.msg or msg) + raise webob.exc.HTTPForbidden(explanation=e.msg or msg) def show(self, req, image_id, member_id): """ diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py index 0a1ab534ee..787a924472 100644 --- a/glance/tests/functional/v2/test_images.py +++ b/glance/tests/functional/v2/test_images.py @@ -3118,6 +3118,7 @@ class TestImageMembers(functional.FunctionalTest): # Image members forbidden for public image path = self._url('/v2/images/%s/members' % image_fixture[0]['id']) response = requests.get(path, headers=get_header('tenant1')) + self.assertIn("Public images do not have members", response.text) self.assertEqual(403, response.status_code) # Image Member Cannot delete Image membership