summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-14 12:02:15 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-14 12:02:15 -0400
commit9806dacb03023d1db22e9cf833845ba8498657a3 (patch)
tree4b6e172ade4855129c1b759e295f54d3e25527d2 /nova/api
parenta3ddb45464204464c93b1deb692414c44ce99376 (diff)
downloadnova-9806dacb03023d1db22e9cf833845ba8498657a3.tar.gz
nova-9806dacb03023d1db22e9cf833845ba8498657a3.tar.xz
nova-9806dacb03023d1db22e9cf833845ba8498657a3.zip
Added faults wrapper
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 7f17471c4..affc781dc 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -5,6 +5,7 @@ from xml.dom import minidom
from xml.parsers.expat import ExpatError
from nova import exception
+import faults
from nova import log as logging
from nova import utils
from nova import wsgi
@@ -362,7 +363,9 @@ class Resource(wsgi.Application):
except exception.InvalidContentType:
return webob.exc.HTTPBadRequest(_("Unsupported Content-Type"))
except exception.MalformedRequestBody:
- return webob.exc.HTTPBadRequest(_("Malformed request"))
+ explanation = _("Malformed request")
+ return faults.Fault(webob.exc.HTTPBadRequest(
+ explanation=explanation))
action_result = self.dispatch(request, action, action_args)