Merge "Remove EndpointFilterCatalog"

keystone/contrib/endpoint_filter/backends/catalog_sql.py

@@ -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)

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 = (

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.

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