openstack
/
nova
Code Issues Proposed changes

Merge "Merge ResourceV21 obj into Resource obj"

This commit is contained in:
Zuul 2018-01-27 15:28:50 +00:00 committed by Gerrit Code Review
parent e6d1bf6bdf 51cd59f5fb
commit f8b30aa52f
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/routes.py
View File

@ -108,7 +108,7 @@ def _create_controller(main_controller, controller_list,
same resource will be merged into single one controller.
"""
controller = wsgi.ResourceV21(main_controller())
controller = wsgi.Resource(main_controller())
for ctl in controller_list:
controller.register_extensions(ctl())
for ctl in action_controller_list:

4
nova/api/openstack/compute/versions.py
View File

@ -73,6 +73,10 @@ VERSIONS = {
class Versions(wsgi.Resource):
# The root version API isn't under the microversion control.
support_api_request_version = False
def __init__(self):
super(Versions, self).__init__(None)

6
nova/api/openstack/wsgi.py
View File

@ -436,7 +436,7 @@ class Resource(wsgi.Application):
wrapped in Fault() to provide API friendly error responses.
"""
support_api_request_version = False
support_api_request_version = True
def __init__(self, controller, inherits=None):
""":param controller: object that implement methods created by routes
@ -741,10 +741,6 @@ class Resource(wsgi.Application):
return Fault(webob.exc.HTTPNotFound())
class ResourceV21(Resource):
support_api_request_version = True
def action(name):
"""Mark a function as an action.

9
nova/tests/unit/api/openstack/fakes.py
View File

@ -273,15 +273,6 @@ class TestRouter(wsgi.Router):
super(TestRouter, self).__init__(mapper)
class TestRouterV21(wsgi.Router):
def __init__(self, controller, mapper=None):
if not mapper:
mapper = routes.Mapper()
mapper.resource("test", "tests",
controller=os_wsgi.ResourceV21(controller))
super(TestRouterV21, self).__init__(mapper)
class FakeAuthDatabase(object):
data = {}

6
nova/tests/unit/api/openstack/test_wsgi.py
View File

@ -268,7 +268,7 @@ class ResourceTest(MicroversionedTest):
raise webob.exc.HTTPInternalServerError()
return 'success'
app = fakes.TestRouterV21(Controller())
app = fakes.TestRouter(Controller())
req = webob.Request.blank('/tests')
response = req.get_response(app)
self.assertEqual(b'success', response.body)
@ -286,7 +286,7 @@ class ResourceTest(MicroversionedTest):
raise webob.exc.HTTPInternalServerError()
return 'success'
app = fakes.TestRouterV21(Controller())
app = fakes.TestRouter(Controller())
req = webob.Request.blank('/tests')
req.headers = self._make_microversion_header(version)
response = req.get_response(app)
@ -300,7 +300,7 @@ class ResourceTest(MicroversionedTest):
def index(self, req):
return 'success'
app = fakes.TestRouterV21(Controller())
app = fakes.TestRouter(Controller())
req = webob.Request.blank('/tests')
req.headers = self._make_microversion_header(invalid_version)
response = req.get_response(app)