Convert Retry-After header parameter value to string
Cinder doesn't work under Apache well with enabled debug. In Python 2.x all header values should be a string. Change-Id: Ie15b5f6836a60a6135ed2808380fa12c3281d5dd Closes-Bug: #1502881
This commit is contained in:
parent
a992336d07
commit
045c26dd6c
@ -317,10 +317,10 @@ class BackupsController(wsgi.Controller):
|
||||
raise exc.HTTPNotFound(explanation=error.msg)
|
||||
except exception.VolumeSizeExceedsAvailableQuota as error:
|
||||
raise exc.HTTPRequestEntityTooLarge(
|
||||
explanation=error.msg, headers={'Retry-After': 0})
|
||||
explanation=error.msg, headers={'Retry-After': '0'})
|
||||
except exception.VolumeLimitExceeded as error:
|
||||
raise exc.HTTPRequestEntityTooLarge(
|
||||
explanation=error.msg, headers={'Retry-After': 0})
|
||||
explanation=error.msg, headers={'Retry-After': '0'})
|
||||
|
||||
retval = self._view_builder.restore_summary(
|
||||
req, dict(new_restore))
|
||||
|
@ -208,7 +208,7 @@ class VolumeTransferController(wsgi.Controller):
|
||||
auth_key)
|
||||
except exception.VolumeSizeExceedsAvailableQuota as error:
|
||||
raise exc.HTTPRequestEntityTooLarge(
|
||||
explanation=error.msg, headers={'Retry-After': 0})
|
||||
explanation=error.msg, headers={'Retry-After': '0'})
|
||||
except exception.InvalidVolume as error:
|
||||
raise exc.HTTPBadRequest(explanation=error.msg)
|
||||
|
||||
|
@ -441,7 +441,7 @@ class NoMoreTargets(CinderException):
|
||||
class QuotaError(CinderException):
|
||||
message = _("Quota exceeded: code=%(code)s")
|
||||
code = 413
|
||||
headers = {'Retry-After': 0}
|
||||
headers = {'Retry-After': '0'}
|
||||
safe = True
|
||||
|
||||
|
||||
|
@ -72,14 +72,14 @@ class TestFaults(test.TestCase):
|
||||
for request in requests:
|
||||
exc = webob.exc.HTTPRequestEntityTooLarge
|
||||
fault = wsgi.Fault(exc(explanation='sorry',
|
||||
headers={'Retry-After': 4}))
|
||||
headers={'Retry-After': '4'}))
|
||||
response = request.get_response(fault)
|
||||
|
||||
expected = {
|
||||
"overLimit": {
|
||||
"message": "sorry",
|
||||
"code": 413,
|
||||
"retryAfter": 4,
|
||||
"retryAfter": "4",
|
||||
},
|
||||
}
|
||||
actual = jsonutils.loads(response.body)
|
||||
|
Loading…
Reference in New Issue
Block a user