openstack
/
glance
Code Issues Proposed changes

Merge "Return 413 when image_size_cap exceeded"

This commit is contained in:
Jenkins 2013-03-28 18:29:34 +00:00 committed by Gerrit Code Review
parent 73fdb3050b 91f538f53d
commit 49765d9b76
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance/api/v1/images.py
View File

@ -511,8 +511,8 @@ class Controller(controller.BaseController):
% CONF.image_size_cap)
LOG.info(msg)
self._safe_kill(req, image_id)
raise HTTPBadRequest(explanation=msg, request=req,
content_type='text/plain')
raise HTTPRequestEntityTooLarge(explanation=msg, request=req,
content_type='text/plain')
except HTTPError as e:
self._safe_kill(req, image_id)

4
glance/tests/unit/v1/test_api.py
View File

@ -2172,7 +2172,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v
res = req.get_response(self.api)
self.assertEquals(res.status_int, 400)
self.assertEquals(res.status_int, 413)
def test_add_image_size_data_too_big(self):
self.config(image_size_cap=512)
@ -2677,7 +2677,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v
res = req.get_response(self.api)
self.assertEquals(res.status_int, 400)
self.assertEquals(res.status_int, 413)
def test_get_index_sort_name_asc(self):
"""