diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | nova/api/openstack/faults.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_limits.py | 8 |
3 files changed, 6 insertions, 5 deletions
@@ -57,3 +57,4 @@ <reldan@oscloud.ru> <enugaev@griddynamics.com> <kshileev@gmail.com> <kshileev@griddynamics.com> <nsokolov@griddynamics.com> <nsokolov@griddynamics.net> +<troy.toman@rackspace.com> <ttcl@mac.com> diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py index 1ab45d4f1c..d0d078cb5f 100644 --- a/nova/api/openstack/faults.py +++ b/nova/api/openstack/faults.py @@ -87,7 +87,7 @@ class OverLimitFault(webob.exc.HTTPException): """ Initialize new `OverLimitFault` with relevant information. """ - self.wrapped_exc = webob.exc.HTTPForbidden() + self.wrapped_exc = webob.exc.HTTPRequestEntityTooLarge() self.content = { "overLimitFault": { "code": self.wrapped_exc.status_int, diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py index 6f0210c276..af34f26a1c 100644 --- a/nova/tests/api/openstack/test_limits.py +++ b/nova/tests/api/openstack/test_limits.py @@ -439,14 +439,14 @@ class LimitMiddlewareTest(BaseLimitTestSuite): self.assertEqual(200, response.status_int) def test_limited_request_json(self): - """Test a rate-limited (403) GET request through middleware.""" + """Test a rate-limited (413) GET request through middleware.""" request = webob.Request.blank("/") response = request.get_response(self.app) self.assertEqual(200, response.status_int) request = webob.Request.blank("/") response = request.get_response(self.app) - self.assertEqual(response.status_int, 403) + self.assertEqual(response.status_int, 413) body = json.loads(response.body) expected = "Only 1 GET request(s) can be made to * every minute." @@ -454,7 +454,7 @@ class LimitMiddlewareTest(BaseLimitTestSuite): self.assertEqual(value, expected) def test_limited_request_xml(self): - """Test a rate-limited (403) response as XML""" + """Test a rate-limited (413) response as XML""" request = webob.Request.blank("/") response = request.get_response(self.app) self.assertEqual(200, response.status_int) @@ -462,7 +462,7 @@ class LimitMiddlewareTest(BaseLimitTestSuite): request = webob.Request.blank("/") request.accept = "application/xml" response = request.get_response(self.app) - self.assertEqual(response.status_int, 403) + self.assertEqual(response.status_int, 413) root = minidom.parseString(response.body).childNodes[0] expected = "Only 1 GET request(s) can be made to * every minute." |