openstack
/
glance
Code Issues Proposed changes

Merge "Correct text in error response"

This commit is contained in:
Jenkins 2015-06-23 13:25:07 +00:00 committed by Gerrit Code Review
parent cdf8f5f7aa 73eff83763
commit 5edf7e8f5a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/api/v2/image_members.py
View File

@ -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):
"""

1
glance/tests/functional/v2/test_images.py
View File

@ -3182,6 +3182,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