openstack
/
nova
Code Issues Proposed changes

Merge "Use 400 instead of 422 for invalid input in v3 servers core"

This commit is contained in:
Jenkins 2013-12-06 07:59:55 +00:00 committed by Gerrit Code Review
parent 4582d091e5 3cdc0799fd
commit 164d0b06a9
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,7 +729,7 @@ class ServersController(wsgi.Controller):
def create(self, req, body): def create(self, req, body):
"""Creates a new server for a given user.""" """Creates a new server for a given user."""
if not self.is_valid_body(body, 'server'): if not self.is_valid_body(body, 'server'):
raise exc.HTTPUnprocessableEntity() raise exc.HTTPBadRequest(_("The request body is invalid"))
context = req.environ['nova.context'] context = req.environ['nova.context']
server_dict = body['server'] server_dict = body['server']
@ -899,7 +899,7 @@ class ServersController(wsgi.Controller):
def update(self, req, id, body): def update(self, req, id, body):
"""Update server then pass on to version-specific controller.""" """Update server then pass on to version-specific controller."""
if not self.is_valid_body(body, 'server'): if not self.is_valid_body(body, 'server'):
raise exc.HTTPUnprocessableEntity() raise exc.HTTPBadRequest(_("The request body is invalid"))
ctxt = req.environ['nova.context'] ctxt = req.environ['nova.context']
update_dict = {} update_dict = {}

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

@ -4207,7 +4207,7 @@ class ServersAllExtensionsTestCase(test.TestCase):
req.body = jsonutils.dumps(body) req.body = jsonutils.dumps(body)
res = req.get_response(self.app) res = req.get_response(self.app)
self.assertEqual(422, res.status_int) self.assertEqual(400, res.status_int)
def test_update_missing_server(self): def test_update_missing_server(self):
# Test create with malformed body. # Test create with malformed body.
@ -4224,54 +4224,54 @@ class ServersAllExtensionsTestCase(test.TestCase):
req.body = jsonutils.dumps(body) req.body = jsonutils.dumps(body)
res = req.get_response(self.app) res = req.get_response(self.app)
self.assertEqual(422, res.status_int) self.assertEqual(400, res.status_int)
class ServersUnprocessableEntityTestCase(test.TestCase): class ServersInvalidRequestTestCase(test.TestCase):
""" """
Tests of places we throw 422 Unprocessable Entity from Tests of places we throw 400 Bad Request from
""" """
def setUp(self): def setUp(self):
super(ServersUnprocessableEntityTestCase, self).setUp() super(ServersInvalidRequestTestCase, self).setUp()
ext_info = plugins.LoadedExtensionInfo() ext_info = plugins.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info) self.controller = servers.ServersController(extension_info=ext_info)
def _unprocessable_server_create(self, body): def _invalid_server_create(self, body):
req = fakes.HTTPRequestV3.blank('/servers') req = fakes.HTTPRequestV3.blank('/servers')
req.method = 'POST' req.method = 'POST'
self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.create, req, body) self.controller.create, req, body)
def test_create_server_no_body(self): def test_create_server_no_body(self):
self._unprocessable_server_create(body=None) self._invalid_server_create(body=None)
def test_create_server_missing_server(self): def test_create_server_missing_server(self):
body = {'foo': {'a': 'b'}} body = {'foo': {'a': 'b'}}
self._unprocessable_server_create(body=body) self._invalid_server_create(body=body)
def test_create_server_malformed_entity(self): def test_create_server_malformed_entity(self):
body = {'server': 'string'} body = {'server': 'string'}
self._unprocessable_server_create(body=body) self._invalid_server_create(body=body)
def _unprocessable_server_update(self, body): def _unprocessable_server_update(self, body):
req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID) req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
req.method = 'PUT' req.method = 'PUT'
self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, FAKE_UUID, body) self.controller.update, req, FAKE_UUID, body)
def test_update_server_no_body(self): def test_update_server_no_body(self):
self._unprocessable_server_update(body=None) self._invalid_server_create(body=None)
def test_update_server_missing_server(self): def test_update_server_missing_server(self):
body = {'foo': {'a': 'b'}} body = {'foo': {'a': 'b'}}
self._unprocessable_server_update(body=body) self._invalid_server_create(body=body)
def test_create_update_malformed_entity(self): def test_create_update_malformed_entity(self):
body = {'server': 'string'} body = {'server': 'string'}
self._unprocessable_server_update(body=body) self._invalid_server_create(body=body)
class TestServerRebuildXMLDeserializer(test.NoDBTestCase): class TestServerRebuildXMLDeserializer(test.NoDBTestCase):