diff options
Diffstat (limited to 'glance')
| -rw-r--r-- | glance/tests/functional/__init__.py | 96 | ||||
| -rw-r--r-- | glance/tests/integration/v2/base.py | 30 | ||||
| -rw-r--r-- | glance/tests/unit/common/test_config.py | 8 |
3 files changed, 101 insertions, 33 deletions
diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index a18090b3f..5244f22ca 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -468,23 +468,35 @@ default_store = %(default_store)s [import_filtering_opts] allowed_ports = [] """ - self.paste_conf_base = """[pipeline:glance-api] + self.paste_conf_base = """[composite:glance-api] +paste.composite_factory = glance.api:root_app_factory +/: api +/healthcheck: healthcheck + +[pipeline:api] pipeline = cors - healthcheck versionnegotiation gzip unauthenticated-context rootapp -[pipeline:glance-api-caching] -pipeline = cors healthcheck versionnegotiation gzip context - cache rootapp +[composite:glance-api-caching] +paste.composite_factory = glance.api:root_app_factory +/: api-caching +/healthcheck: healthcheck + +[pipeline:api-caching] +pipeline = cors versionnegotiation gzip context cache rootapp + +[composite:glance-api-cachemanagement] +paste.composite_factory = glance.api:root_app_factory +/: api-cachemanagement +/healthcheck: healthcheck -[pipeline:glance-api-cachemanagement] +[pipeline:api-cachemanagement] pipeline = cors - healthcheck versionnegotiation gzip unauthenticated-context @@ -492,11 +504,21 @@ pipeline = cache_manage rootapp -[pipeline:glance-api-fakeauth] -pipeline = cors healthcheck versionnegotiation gzip fakeauth context rootapp +[composite:glance-api-fakeauth] +paste.composite_factory = glance.api:root_app_factory +/: api-fakeauth +/healthcheck: healthcheck + +[pipeline:api-fakeauth] +pipeline = cors versionnegotiation gzip fakeauth context rootapp + +[composite:glance-api-noauth] +paste.composite_factory = glance.api:root_app_factory +/: api-noauth +/healthcheck: healthcheck -[pipeline:glance-api-noauth] -pipeline = cors healthcheck versionnegotiation gzip context rootapp +[pipeline:api-noauth] +pipeline = cors versionnegotiation gzip context rootapp [composite:rootapp] paste.composite_factory = glance.api:root_app_factory @@ -509,8 +531,8 @@ paste.app_factory = glance.api.versions:create_resource [app:apiv2app] paste.app_factory = glance.api.v2.router:API.factory -[filter:healthcheck] -paste.filter_factory = oslo_middleware:Healthcheck.factory +[app:healthcheck] +paste.app_factory = oslo_middleware:Healthcheck.app_factory backends = disable_by_file disable_by_file_path = %(disable_path)s @@ -643,23 +665,35 @@ allowed_ports = [] [os_glance_staging_store] filesystem_store_datadir=%(staging_dir)s """ - self.paste_conf_base = """[pipeline:glance-api] + self.paste_conf_base = """[composite:glance-api] +paste.composite_factory = glance.api:root_app_factory +/: api +/healthcheck: healthcheck + +[pipeline:api] pipeline = cors - healthcheck versionnegotiation gzip unauthenticated-context rootapp -[pipeline:glance-api-caching] -pipeline = cors healthcheck versionnegotiation gzip unauthenticated-context - cache rootapp +[composite:glance-api-caching] +paste.composite_factory = glance.api:root_app_factory +/: api-caching +/healthcheck: healthcheck + +[pipeline:api-caching] +pipeline = cors versionnegotiation gzip unauthenticated-context cache rootapp + +[composite:glance-api-cachemanagement] +paste.composite_factory = glance.api:root_app_factory +/: api-cachemanagement +/healthcheck: healthcheck -[pipeline:glance-api-cachemanagement] +[pipeline:api-cachemanagement] pipeline = cors - healthcheck versionnegotiation gzip unauthenticated-context @@ -667,11 +701,21 @@ pipeline = cache_manage rootapp -[pipeline:glance-api-fakeauth] -pipeline = cors healthcheck versionnegotiation gzip fakeauth context rootapp +[composite:glance-api-fakeauth] +paste.composite_factory = glance.api:root_app_factory +/: api-fakeauth +/healthcheck: healthcheck + +[pipeline:api-fakeauth] +pipeline = cors versionnegotiation gzip fakeauth context rootapp + +[composite:glance-api-noauth] +paste.composite_factory = glance.api:root_app_factory +/: api-noauth +/healthcheck: healthcheck -[pipeline:glance-api-noauth] -pipeline = cors healthcheck versionnegotiation gzip context rootapp +[pipeline:api-noauth] +pipeline = cors versionnegotiation gzip context rootapp [composite:rootapp] paste.composite_factory = glance.api:root_app_factory @@ -684,8 +728,8 @@ paste.app_factory = glance.api.versions:create_resource [app:apiv2app] paste.app_factory = glance.api.v2.router:API.factory -[filter:healthcheck] -paste.filter_factory = oslo_middleware:Healthcheck.factory +[app:healthcheck] +paste.app_factory = oslo_middleware:Healthcheck.app_factory backends = disable_by_file disable_by_file_path = %(disable_path)s diff --git a/glance/tests/integration/v2/base.py b/glance/tests/integration/v2/base.py index b9580c05a..ff0349fb1 100644 --- a/glance/tests/integration/v2/base.py +++ b/glance/tests/integration/v2/base.py @@ -31,13 +31,25 @@ from glance.tests import utils as test_utils TESTING_API_PASTE_CONF = """ -[pipeline:glance-api] +[composite:glance-api] +paste.composite_factory = glance.api:root_app_factory +/: api + +[pipeline: api] pipeline = versionnegotiation gzip unauthenticated-context rootapp -[pipeline:glance-api-caching] +[composite:glance-api-caching] +paste.composite_factory = glance.api:root_app_factory +/: api-caching + +[pipeline: api-caching] pipeline = versionnegotiation gzip unauthenticated-context cache rootapp -[pipeline:glance-api-cachemanagement] +[composite:glance-api-cachemanagement] +paste.composite_factory = glance.api:root_app_factory +/: api-cachemanagement + +[pipeline: api-cachemanagement] pipeline = versionnegotiation gzip @@ -46,10 +58,18 @@ pipeline = cache_manage rootapp -[pipeline:glance-api-fakeauth] +[composite:glance-api-fakeauth] +paste.composite_factory = glance.api:root_app_factory +/: api-fakeauth + +[pipeline: api-fakeauth] pipeline = versionnegotiation gzip fakeauth context rootapp -[pipeline:glance-api-noauth] +[composite:glance-api-noauth] +paste.composite_factory = glance.api:root_app_factory +/: api-noauth + +[pipeline: api-noauth] pipeline = versionnegotiation gzip context rootapp [composite:rootapp] diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py index 84138f7eb..f52b21e26 100644 --- a/glance/tests/unit/common/test_config.py +++ b/glance/tests/unit/common/test_config.py @@ -66,7 +66,7 @@ class TestPasteApp(test_utils.BaseTestCase): app = config.load_paste_app('glance-api') - self.assertIsInstance(app, expected_app_type) + self.assertIsInstance(app['/'], expected_app_type) def test_load_paste_app(self): expected_middleware = oslo_middleware.CORS @@ -78,7 +78,11 @@ class TestPasteApp(test_utils.BaseTestCase): expected_middleware, make_paste_file=False) def test_load_paste_app_with_paste_flavor(self): - pipeline = ('[pipeline:glance-api-incomplete]\n' + pipeline = ('[composite:glance-api-incomplete]\n' + 'paste.composite_factory = glance.api:root_app_factory\n' + '/: api-incomplete\n' + '/healthcheck: healthcheck\n' + '[pipeline:api-incomplete]\n' 'pipeline = context rootapp') expected_middleware = context.ContextMiddleware self._do_test_load_paste_app(expected_middleware, |