Merge lp:~danwent/neutron/bug814012 into lp:neutron/diablo

[dan wendlandt]

proposed fix and unit test for: https://bugs.launchpad.net/quantum/+bug/814012

[Salvatore Orlando (salvatore-orlando)]

Hi Dan,
Thanks for fixing this bug!
Both the fix and the unit test look good.

Just a couple of PEP8 violations to fix:
tests/unit/test_api.py:634:5: E303 too many blank lines (2)
tests/unit/test_api.py:855:1: W391 blank line at end of file

review: Needs Fixing

[lp:~danwent/neutron/bug814012]

27. By dan wendlandt on 2011-07-27

pep8 fixes

[dan wendlandt (danwent)]

ah, good catch. I fixed those and pushed.

[Salvatore Orlando (salvatore-orlando)]

lgtm

review: Approve

[Somik Behera (somikbehera)]

Looks pretty good. Anything that gets us closer to passing unit tests is good :)

review: Approve (netstack-core)

=== modified file 'quantum/common/wsgi.py'
--- quantum/common/wsgi.py	2011-06-30 17:13:01 +0000
+++ quantum/common/wsgi.py	2011-07-27 17:26:27 +0000
@@ -425,7 +425,10 @@
         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 = {

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-07-21 15:34:58 +0000
+++ tests/unit/test_api.py	2011-07-27 17:26:27 +0000
@@ -614,6 +614,22 @@
         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 @@
 
     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')