Merge "Send a more appropriate error response for 403 in osapi"

2 files changed, 14 insertions, 1 deletions

diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 26c51d8f4..f65425246 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -1022,7 +1022,7 @@ class Fault(webob.exc.HTTPException):
     _fault_names = {
             400: "badRequest",
             401: "unauthorized",
-            403: "resizeNotAllowed",
+            403: "forbidden",
             404: "itemNotFound",
             405: "badMethod",
             409: "conflictingRequest",
diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py
index 96a62017b..3eb2bb8dc 100644
--- a/nova/tests/api/openstack/test_faults.py
+++ b/nova/tests/api/openstack/test_faults.py
@@ -96,6 +96,19 @@ class TestFaults(test.TestCase):
         self.assertEqual(resp.status_int, 404)
         self.assertTrue('whut?' in resp.body)
 
+    def test_raise_403(self):
+        """Ensure the ability to raise :class:`Fault` in WSGI-ified methods."""
+        @webob.dec.wsgify
+        def raiser(req):
+            raise wsgi.Fault(webob.exc.HTTPForbidden(explanation='whut?'))
+
+        req = webob.Request.blank('/.xml')
+        resp = req.get_response(raiser)
+        self.assertEqual(resp.content_type, "application/xml")
+        self.assertEqual(resp.status_int, 403)
+        self.assertTrue('resizeNotAllowed' not in resp.body)
+        self.assertTrue('forbidden' in resp.body)
+
     def test_fault_has_status_int(self):
         """Ensure the status_int is set correctly on faults"""
         fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='what?'))