openstack
/
nova
Code Issues Proposed changes

Merge "Remove 'Retry-After' in server create and resize"

This commit is contained in:
Jenkins 2015-11-17 20:10:45 +00:00 committed by Gerrit Code Review
parent 1b3fbfb087 6bc930e9eb
commit 243f6a03d6
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/legacy_v2/servers.py
View File

@ -639,8 +639,7 @@ class Controller(wsgi.Controller):
except (exception.QuotaError,
exception.PortLimitExceeded) as error:
raise exc.HTTPForbidden(
explanation=error.format_message(),
headers={'Retry-After': 0})
explanation=error.format_message())
except messaging.RemoteError as err:
msg = "%(err_type)s: %(err_msg)s" % {'err_type': err.exc_type,
'err_msg': err.value}
@ -806,8 +805,7 @@ class Controller(wsgi.Controller):
self.compute_api.resize(context, instance, flavor_id, **kwargs)
except exception.QuotaError as error:
raise exc.HTTPForbidden(
explanation=error.format_message(),
headers={'Retry-After': 0})
explanation=error.format_message())
except exception.FlavorNotFound:
msg = _("Unable to locate requested flavor.")
raise exc.HTTPBadRequest(explanation=msg)

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

@ -603,8 +603,7 @@ class ServersController(wsgi.Controller):
except (exception.QuotaError,
exception.PortLimitExceeded) as error:
raise exc.HTTPForbidden(
explanation=error.format_message(),
headers={'Retry-After': 0})
explanation=error.format_message())
except exception.ImageNotFound:
msg = _("Can not find requested image")
raise exc.HTTPBadRequest(explanation=msg)
@ -867,8 +866,7 @@ class ServersController(wsgi.Controller):
raise exc.HTTPNotFound(explanation=e.format_message())
except exception.QuotaError as error:
raise exc.HTTPForbidden(
explanation=error.format_message(),
headers={'Retry-After': 0})
explanation=error.format_message())
except exception.FlavorNotFound:
msg = _("Unable to locate requested flavor.")
raise exc.HTTPBadRequest(explanation=msg)

1
nova/exception.py
View File

@ -1331,7 +1331,6 @@ class QuotaError(NovaException):
# The error status code for out of quota for the nova api should be
# 403 Forbidden.
code = 413
headers = {'Retry-After': 0}
safe = True

6
nova/tests/unit/api/openstack/compute/test_image_metadata.py
View File

@ -272,8 +272,7 @@ class ImageMetaDataTestV21(test.NoDBTestCase):
self.controller.delete, req, '100', 'key1')
@mock.patch(CHK_QUOTA_STR,
side_effect=webob.exc.HTTPForbidden(
explanation='', headers={'Retry-After': 0}))
side_effect=webob.exc.HTTPForbidden(explanation=''))
@mock.patch('nova.image.api.API.update')
@mock.patch('nova.image.api.API.get', return_value=get_image_123())
def test_too_many_metadata_items_on_create(self, _get_mocked,
@ -289,8 +288,7 @@ class ImageMetaDataTestV21(test.NoDBTestCase):
self.assertFalse(update_mocked.called)
@mock.patch(CHK_QUOTA_STR,
side_effect=webob.exc.HTTPForbidden(
explanation='', headers={'Retry-After': 0}))
side_effect=webob.exc.HTTPForbidden(explanation=''))
@mock.patch('nova.image.api.API.update')
@mock.patch('nova.image.api.API.get', return_value=get_image_123())
def test_too_many_metadata_items_on_put(self, _get_mocked,