From d35f36916e109f0d2557bb778424e7aee3bc6b31 Mon Sep 17 00:00:00 2001 From: Kristi Nikolla Date: Sat, 25 Feb 2017 10:30:32 -0500 Subject: [PATCH] Remove EndpointFilterCatalog EndpointFilterCatalog was deprecated in Ocata in favor of sql.Catalog. Implements: bp removed-as-of-pike Change-Id: I7f3eea85d4d8668e9e421b06a65086a736211106 --- keystone/contrib/endpoint_filter/__init__.py | 0 .../endpoint_filter/backends/__init__.py | 0 .../endpoint_filter/backends/catalog_sql.py | 33 ------------------- ...st_associate_project_endpoint_extension.py | 5 --- .../removed-as-of-pike-deadbeefdeadbeef.yaml | 4 +++ setup.cfg | 1 - 6 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 keystone/contrib/endpoint_filter/__init__.py delete mode 100644 keystone/contrib/endpoint_filter/backends/__init__.py delete mode 100644 keystone/contrib/endpoint_filter/backends/catalog_sql.py diff --git a/keystone/contrib/endpoint_filter/__init__.py b/keystone/contrib/endpoint_filter/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keystone/contrib/endpoint_filter/backends/__init__.py b/keystone/contrib/endpoint_filter/backends/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keystone/contrib/endpoint_filter/backends/catalog_sql.py b/keystone/contrib/endpoint_filter/backends/catalog_sql.py deleted file mode 100644 index fb4b3555e7..0000000000 --- a/keystone/contrib/endpoint_filter/backends/catalog_sql.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2013 OpenStack Foundation -# -# 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. - -from oslo_log import versionutils - -from keystone.catalog.backends import sql -import keystone.conf - - -CONF = keystone.conf.CONF - - -@versionutils.deprecated( - what=('keystone.contrib.endpoint_filter.' - 'backends.catalog_sql.EndPointFilterCatalog'), - as_of=versionutils.deprecated.OCATA, - remove_in=+1, - in_favor_of='keystone.catalog.backends.sql.Catalog') -class EndpointFilterCatalog(sql.Catalog): - def get_v3_catalog(self, user_id, project_id): - return super(EndpointFilterCatalog, self).get_v3_catalog( - user_id, project_id) diff --git a/keystone/tests/unit/test_associate_project_endpoint_extension.py b/keystone/tests/unit/test_associate_project_endpoint_extension.py index 115bfb65c7..71046f5b8f 100644 --- a/keystone/tests/unit/test_associate_project_endpoint_extension.py +++ b/keystone/tests/unit/test_associate_project_endpoint_extension.py @@ -24,11 +24,6 @@ from keystone.tests.unit import test_v3 class EndpointFilterTestCase(test_v3.RestfulTestCase): - def config_overrides(self): - super(EndpointFilterTestCase, self).config_overrides() - self.config_fixture.config( - group='catalog', driver='endpoint_filter.sql') - def setUp(self): super(EndpointFilterTestCase, self).setUp() self.default_request_url = ( diff --git a/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml b/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml index aa2f8a2de9..2610fcfbff 100644 --- a/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml +++ b/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml @@ -16,3 +16,7 @@ other: The functionality of the ``ADMIN_TOKEN`` remains, but has been incorporated into the main auth middleware (``keystone.middleware.auth.AuthContextMiddleware``). + - > + The catalog backend ``endpoint_filter.sql`` has been removed. It has been + consolidated with the ``sql`` backend, therefore replace the + ``endpoint_filter.sql`` catalog backend with the ``sql`` backend. diff --git a/setup.cfg b/setup.cfg index f1918e88b3..833283c111 100644 --- a/setup.cfg +++ b/setup.cfg @@ -124,7 +124,6 @@ keystone.auth.mapped = keystone.catalog = sql = keystone.catalog.backends.sql:Catalog templated = keystone.catalog.backends.templated:Catalog - endpoint_filter.sql = keystone.contrib.endpoint_filter.backends.catalog_sql:EndpointFilterCatalog keystone.credential = sql = keystone.credential.backends.sql:Credential