openstack/nova
Code Issues Proposed changes

Merge "Change exception type from HTTPBadRequest to HTTPForbidden"

Browse Source
This commit is contained in:
Jenkins
2014-03-28 13:44:53 +00:00
committed by Gerrit Code Review
parent cd1423cef7 544745f9da
commit d9e95744f0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/plugins/v3/servers.py
View File

@@ -233,7 +233,7 @@ class ServersController(wsgi.Controller):
search_opts['deleted'] = True search_opts['deleted'] = True
else: else:
msg = _("Only administrators may list deleted instances") msg = _("Only administrators may list deleted instances")
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPForbidden(explanation=msg)
# If tenant_id is passed as a search parameter this should # If tenant_id is passed as a search parameter this should
# imply that all_tenants is also enabled unless explicitly # imply that all_tenants is also enabled unless explicitly

2
nova/api/openstack/compute/servers.py
View File

@@ -569,7 +569,7 @@ class Controller(wsgi.Controller):
search_opts['deleted'] = True search_opts['deleted'] = True
else: else:
msg = _("Only administrators may list deleted instances") msg = _("Only administrators may list deleted instances")
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPForbidden(explanation=msg)
# If all tenants is passed with 0 or false as the value # If all tenants is passed with 0 or false as the value
# then remove it from the search options. Nothing passed as # then remove it from the search options. Nothing passed as

2
nova/tests/api/openstack/compute/plugins/v3/test_servers.py
View File

@@ -1012,7 +1012,7 @@ class ServersControllerTest(ControllerTest):
def test_get_servers_deleted_status_as_user(self): def test_get_servers_deleted_status_as_user(self):
req = fakes.HTTPRequestV3.blank('/servers?status=deleted', req = fakes.HTTPRequestV3.blank('/servers?status=deleted',
use_admin_context=False) use_admin_context=False)
self.assertRaises(webob.exc.HTTPBadRequest, self.assertRaises(webob.exc.HTTPForbidden,
self.controller.detail, req) self.controller.detail, req)
def test_get_servers_deleted_status_as_admin(self): def test_get_servers_deleted_status_as_admin(self):

2
nova/tests/api/openstack/compute/test_servers.py
View File

@@ -932,7 +932,7 @@ class ServersControllerTest(ControllerTest):
def test_get_servers_deleted_status_as_user(self): def test_get_servers_deleted_status_as_user(self):
req = fakes.HTTPRequest.blank('/fake/servers?status=deleted', req = fakes.HTTPRequest.blank('/fake/servers?status=deleted',
use_admin_context=False) use_admin_context=False)
self.assertRaises(webob.exc.HTTPBadRequest, self.assertRaises(webob.exc.HTTPForbidden,
self.controller.detail, req) self.controller.detail, req)
def test_get_servers_deleted_status_as_admin(self): def test_get_servers_deleted_status_as_admin(self):