ef6f4e4c8e
The file nova/api/openstack/__init__.py had imported a lot of modules, notably nova.utils. This means that any code which runs within that package, notably the placement service, imports all those modules, even if it is not going to use them. This results in scripts/binaries that are heavier than they need to be and in some cases including modules, like eventlet, that it would feel safe to not have in the stack. Unfortunately we cannot sinply rename nova/api/openstack/__init__.py to another name because it contains FaultWrapper and FaultWrapper is referred to, by package path, from the paste.ini file and that file is out there in config land, and something we prefer not to change. Therefore alternate methods of cleaning up were explored and this has led to some useful changes: Fault wrapper is the only consumer of walk_class_hierarchy so there is no reason for it it to be in nova.utils. nova.wsgi contains a mismash of WSGI middleware and applications, which need only a small number of imports, and Server classes which are more complex and not required by the WSGI wares. Therefore nova.wsgi was split into nova.wsgi and nova.api.wsgi. The name choices may not be ideal, but they were chosen to limit the cascades of changes that are needed across code and tests. Where utils.utf8 was used it has been replaced with the similar (but not exactly equivalient) method from oslo_utils.encodeutils. Change-Id: I297f30aa6eb01fe3b53fd8c9b7853949be31156d Partial-Bug: #1743120
75 lines
2.5 KiB
Python
75 lines
2.5 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# Copyright 2010 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
Test WSGI basics and provide some helper functions for other WSGI tests.
|
|
"""
|
|
|
|
import fixtures
|
|
import routes
|
|
from six.moves import StringIO
|
|
import webob
|
|
|
|
from nova.api import wsgi
|
|
from nova import test
|
|
|
|
|
|
class Test(test.NoDBTestCase):
|
|
|
|
def test_debug(self):
|
|
"""This tests optional middleware we have which dumps
|
|
the requests to stdout.
|
|
"""
|
|
self.output = StringIO()
|
|
self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
|
|
|
|
class Application(wsgi.Application):
|
|
"""Dummy application to test debug."""
|
|
|
|
def __call__(self, environ, start_response):
|
|
start_response("200", [("X-Test", "checking")])
|
|
return [b'Test result']
|
|
|
|
application = wsgi.Debug(Application())
|
|
result = webob.Request.blank('/').get_response(application)
|
|
self.assertEqual(result.body, b"Test result")
|
|
self.assertIn(
|
|
'**************************************** REQUEST ENVIRON',
|
|
self.output.getvalue())
|
|
|
|
def test_router(self):
|
|
|
|
class Application(wsgi.Application):
|
|
"""Test application to call from router."""
|
|
|
|
def __call__(self, environ, start_response):
|
|
start_response("200", [])
|
|
return ['Router result']
|
|
|
|
class Router(wsgi.Router):
|
|
"""Test router."""
|
|
|
|
def __init__(self):
|
|
mapper = routes.Mapper()
|
|
mapper.connect("/test", controller=Application())
|
|
super(Router, self).__init__(mapper)
|
|
|
|
result = webob.Request.blank('/test').get_response(Router())
|
|
self.assertEqual(result.body, "Router result")
|
|
result = webob.Request.blank('/bad').get_response(Router())
|
|
self.assertNotEqual(result.body, "Router result")
|