openstack/deb-murano
Code Issues Proposed changes

Merge "Replace HTTP 415 return code to HTTP 406 when it's correct"

Browse Source
This commit is contained in:
Jenkins 2016-02-10 21:39:50 +00:00 committed by Gerrit Code Review
commit 60c8ec1bde
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/specification/index.rst
View File

@ -43,6 +43,8 @@ General information
* 403 ``Forbidden`` - access denied.
* 404 ``Not Found`` - resource was not found
* 405 ``Method Not Allowed`` - requested method is not supported for resource.
* 406 ``Not Acceptable`` - the requested resource is only capable of generating content not acceptable
according to the Accept headers sent in the request.
* 409 ``Conflict`` - requested method resulted in a conflict with the current state of the resource.
* **Response of POSTs and PUTs**

5
murano/common/exceptions.py
View File

@ -50,6 +50,11 @@ class UnsupportedContentType(OpenstackException):
msg_fmt = "Unsupported content type %(content_type)s"
class NotAcceptableContentType(OpenstackException):
msg_fmt = ("Response with content type %(content_type)s "
"expected but can not be provided")
class MalformedRequestBody(OpenstackException):
msg_fmt = "Malformed message body: %(reason)s"

7
murano/common/wsgi.py
View File

@ -306,7 +306,7 @@ class Request(webob.Request):
"""Determine the requested response content-type.
Based on the query extension then the Accept header.
Raise UnsupportedContentType exception if we don't find a preference
Raise NotAcceptableContentType exception if we don't find a preference
"""
supported_content_types = (supported_content_types or
@ -324,7 +324,7 @@ class Request(webob.Request):
bm = self.accept.best_match(supported_content_types)
if not bm:
raise exceptions.UnsupportedContentType(content_type=self.accept)
raise exceptions.NotAcceptableContentType(content_type=self.accept)
return bm
def get_content_type(self, allowed_content_types=None):
@ -416,6 +416,9 @@ class Resource(object):
except exceptions.UnsupportedContentType:
msg = _("Unsupported Content-Type")
return webob.exc.HTTPUnsupportedMediaType(detail=msg)
except exceptions.NotAcceptableContentType:
msg = _("Acceptable response can not be provided")
return webob.exc.HTTPNotAcceptable(detail=msg)
except exceptions.MalformedRequestBody:
msg = _("Malformed request body")
return webob.exc.HTTPBadRequest(explanation=msg)

15
murano/tests/unit/api/v1/test_catalog.py
View File

@ -414,8 +414,9 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase):
result = req.get_response(self.api)
self.assertEqual(415, result.status_code)
self.assertTrue('Unsupported Content-Type' in result.body)
self.assertEqual(406, result.status_code)
self.assertTrue('Acceptable response can not be provided'
in result.body)
def test_get_ui_definition(self):
self._set_policy_rules(
@ -447,8 +448,9 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase):
result = req.get_response(self.api)
self.assertEqual(415, result.status_code)
self.assertTrue('Unsupported Content-Type' in result.body)
self.assertEqual(406, result.status_code)
self.assertTrue('Acceptable response can not be provided'
in result.body)
def test_get_logo(self):
self._set_policy_rules(
@ -481,8 +483,9 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase):
result = req.get_response(self.api)
self.assertEqual(415, result.status_code)
self.assertTrue('Unsupported Content-Type' in result.body)
self.assertEqual(406, result.status_code)
self.assertTrue('Acceptable response can not be provided'
in result.body)
def test_add_public_unauthorized(self):
self._set_policy_rules({