openstack
/
neutron
Code Issues Proposed changes

Apply fix for bug #814012 

Merging lp:~danwent/quantum/bug814012
This commit is contained in:
Salvatore Orlando 2011-07-29 17:39:12 +01:00
parent 2299a05c10 45ee8c0db9
commit 602beba9bb
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/common/wsgi.py
View File

@ -425,7 +425,10 @@ class Serializer(object):
The string must be in the format of a supported MIME type.
"""
return self.get_deserialize_handler(content_type)(datastring)
try:
return self.get_deserialize_handler(content_type)(datastring)
except Exception:
raise webob.exc.HTTPBadRequest("Could not deserialize data")
def get_deserialize_handler(self, content_type):
handlers = {

22
tests/unit/test_api.py
View File

@ -614,6 +614,22 @@ class APITest(unittest.TestCase):
LOG.debug("_test_delete_attachment_portnotfound - " \
"format:%s - END", format)
def _test_unparsable_data(self, format):
LOG.debug("_test_unparsable_data - " \
" format:%s - START", format)
data = "this is not json or xml"
method = 'POST'
content_type = "application/%s" % format
tenant_id = self.tenant_id
path = "/tenants/%(tenant_id)s/networks.%(format)s" % locals()
network_req = testlib.create_request(path, data, content_type, method)
network_res = network_req.get_response(self.api)
self.assertEqual(network_res.status_int, 400)
LOG.debug("_test_unparsable_data - " \
"format:%s - END", format)
def setUp(self):
options = {}
options['plugin_provider'] = 'quantum.plugins.SamplePlugin.FakePlugin'
@ -829,3 +845,9 @@ class APITest(unittest.TestCase):
def test_delete_attachment_portnotfound_json(self):
self._test_delete_attachment_portnotfound('json')
def test_unparsable_data_xml(self):
self._test_unparsable_data('xml')
def test_unparsable_data_json(self):
self._test_unparsable_data('json')