remove keystone-moon

Change-Id: I80d7c9b669f19d5f6607e162de8e0e55c2f80fdd
Signed-off-by: RHE <rebirthmonkey@gmail.com>

13 files changed, 0 insertions, 834 deletions

diff --git a/keystone-moon/keystone/contrib/endpoint_filter/__init__.py b/keystone-moon/keystone/contrib/endpoint_filter/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/__init__.py
+++ /dev/null
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/backends/__init__.py b/keystone-moon/keystone/contrib/endpoint_filter/backends/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/backends/__init__.py
+++ /dev/null
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/backends/catalog_sql.py b/keystone-moon/keystone/contrib/endpoint_filter/backends/catalog_sql.py
deleted file mode 100644
index ad39d045..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/backends/catalog_sql.py
+++ /dev/null
@@ -1,77 +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_config import cfg
-
-from keystone.catalog.backends import sql
-from keystone.catalog import core as catalog_core
-from keystone.common import dependency
-
-
-CONF = cfg.CONF
-
-
-@dependency.requires('catalog_api')
-class EndpointFilterCatalog(sql.Catalog):
-    def get_v3_catalog(self, user_id, project_id):
-        substitutions = dict(CONF.items())
-        substitutions.update({
-            'tenant_id': project_id,
-            'project_id': project_id,
-            'user_id': user_id,
-        })
-
-        services = {}
-
-        dict_of_endpoint_refs = (self.catalog_api.
-                                 list_endpoints_for_project(project_id))
-
-        if (not dict_of_endpoint_refs and
-                CONF.endpoint_filter.return_all_endpoints_if_no_filter):
-            return super(EndpointFilterCatalog, self).get_v3_catalog(
-                user_id, project_id)
-
-        for endpoint_id, endpoint in dict_of_endpoint_refs.items():
-            if not endpoint['enabled']:
-                # Skip disabled endpoints.
-                continue
-            service_id = endpoint['service_id']
-            services.setdefault(
-                service_id,
-                self.get_service(service_id))
-            service = services[service_id]
-            del endpoint['service_id']
-            del endpoint['enabled']
-            del endpoint['legacy_endpoint_id']
-            # Include deprecated region for backwards compatibility
-            endpoint['region'] = endpoint['region_id']
-            endpoint['url'] = catalog_core.format_url(
-                endpoint['url'], substitutions)
-            # populate filtered endpoints
-            if 'endpoints' in services[service_id]:
-                service['endpoints'].append(endpoint)
-            else:
-                service['endpoints'] = [endpoint]
-
-        # format catalog
-        catalog = []
-        for service_id, service in services.items():
-            formatted_service = {}
-            formatted_service['id'] = service['id']
-            formatted_service['type'] = service['type']
-            formatted_service['name'] = service['name']
-            formatted_service['endpoints'] = service['endpoints']
-            catalog.append(formatted_service)
-
-        return catalog
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/backends/sql.py b/keystone-moon/keystone/contrib/endpoint_filter/backends/sql.py
deleted file mode 100644
index 484934bb..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/backends/sql.py
+++ /dev/null
@@ -1,30 +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
-
-_OLD = 'keystone.contrib.endpoint_filter.backends.sql.EndpointFilter'
-_NEW = 'sql'
-
-
-class EndpointFilter(sql.Catalog):
-    @versionutils.deprecated(
-        as_of=versionutils.deprecated.MITAKA,
-        in_favor_of=_NEW,
-        what=_OLD,
-        remove_in=2)
-    def __init__(self, *args, **kwargs):
-        super(EndpointFilter, self).__init__(*args, **kwargs)
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/controllers.py b/keystone-moon/keystone/contrib/endpoint_filter/controllers.py
deleted file mode 100644
index eb627c6b..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/controllers.py
+++ /dev/null
@@ -1,300 +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.
-
-import six
-
-from keystone.catalog import controllers as catalog_controllers
-from keystone.common import controller
-from keystone.common import dependency
-from keystone.common import validation
-from keystone.contrib.endpoint_filter import schema
-from keystone import exception
-from keystone import notifications
-from keystone import resource
-
-
-@dependency.requires('catalog_api', 'endpoint_filter_api', 'resource_api')
-class _ControllerBase(controller.V3Controller):
-    """Base behaviors for endpoint filter controllers."""
-
-    def _get_endpoint_groups_for_project(self, project_id):
-        # recover the project endpoint group memberships and for each
-        # membership recover the endpoint group
-        self.resource_api.get_project(project_id)
-        try:
-            refs = self.endpoint_filter_api.list_endpoint_groups_for_project(
-                project_id)
-            endpoint_groups = [self.endpoint_filter_api.get_endpoint_group(
-                ref['endpoint_group_id']) for ref in refs]
-            return endpoint_groups
-        except exception.EndpointGroupNotFound:
-            return []
-
-    def _get_endpoints_filtered_by_endpoint_group(self, endpoint_group_id):
-        endpoints = self.catalog_api.list_endpoints()
-        filters = self.endpoint_filter_api.get_endpoint_group(
-            endpoint_group_id)['filters']
-        filtered_endpoints = []
-
-        for endpoint in endpoints:
-            is_candidate = True
-            for key, value in filters.items():
-                if endpoint[key] != value:
-                    is_candidate = False
-                    break
-            if is_candidate:
-                filtered_endpoints.append(endpoint)
-        return filtered_endpoints
-
-
-class EndpointFilterV3Controller(_ControllerBase):
-
-    def __init__(self):
-        super(EndpointFilterV3Controller, self).__init__()
-        notifications.register_event_callback(
-            notifications.ACTIONS.deleted, 'project',
-            self._on_project_or_endpoint_delete)
-        notifications.register_event_callback(
-            notifications.ACTIONS.deleted, 'endpoint',
-            self._on_project_or_endpoint_delete)
-
-    def _on_project_or_endpoint_delete(self, service, resource_type, operation,
-                                       payload):
-        project_or_endpoint_id = payload['resource_info']
-        if resource_type == 'project':
-            self.endpoint_filter_api.delete_association_by_project(
-                project_or_endpoint_id)
-        else:
-            self.endpoint_filter_api.delete_association_by_endpoint(
-                project_or_endpoint_id)
-
-    @controller.protected()
-    def add_endpoint_to_project(self, context, project_id, endpoint_id):
-        """Establishes an association between an endpoint and a project."""
-        # NOTE(gyee): we just need to make sure endpoint and project exist
-        # first. We don't really care whether if project is disabled.
-        # The relationship can still be established even with a disabled
-        # project as there are no security implications.
-        self.catalog_api.get_endpoint(endpoint_id)
-        self.resource_api.get_project(project_id)
-        self.endpoint_filter_api.add_endpoint_to_project(endpoint_id,
-                                                         project_id)
-
-    @controller.protected()
-    def check_endpoint_in_project(self, context, project_id, endpoint_id):
-        """Verifies endpoint is currently associated with given project."""
-        self.catalog_api.get_endpoint(endpoint_id)
-        self.resource_api.get_project(project_id)
-        self.endpoint_filter_api.check_endpoint_in_project(endpoint_id,
-                                                           project_id)
-
-    @controller.protected()
-    def list_endpoints_for_project(self, context, project_id):
-        """List all endpoints currently associated with a given project."""
-        self.resource_api.get_project(project_id)
-        refs = self.endpoint_filter_api.list_endpoints_for_project(project_id)
-        filtered_endpoints = {ref['endpoint_id']:
-                              self.catalog_api.get_endpoint(ref['endpoint_id'])
-                              for ref in refs}
-
-        # need to recover endpoint_groups associated with project
-        # then for each endpoint group return the endpoints.
-        endpoint_groups = self._get_endpoint_groups_for_project(project_id)
-        for endpoint_group in endpoint_groups:
-            endpoint_refs = self._get_endpoints_filtered_by_endpoint_group(
-                endpoint_group['id'])
-            # now check if any endpoints for current endpoint group are not
-            # contained in the list of filtered endpoints
-            for endpoint_ref in endpoint_refs:
-                if endpoint_ref['id'] not in filtered_endpoints:
-                    filtered_endpoints[endpoint_ref['id']] = endpoint_ref
-
-        return catalog_controllers.EndpointV3.wrap_collection(
-            context, [v for v in six.itervalues(filtered_endpoints)])
-
-    @controller.protected()
-    def remove_endpoint_from_project(self, context, project_id, endpoint_id):
-        """Remove the endpoint from the association with given project."""
-        self.endpoint_filter_api.remove_endpoint_from_project(endpoint_id,
-                                                              project_id)
-
-    @controller.protected()
-    def list_projects_for_endpoint(self, context, endpoint_id):
-        """Return a list of projects associated with the endpoint."""
-        self.catalog_api.get_endpoint(endpoint_id)
-        refs = self.endpoint_filter_api.list_projects_for_endpoint(endpoint_id)
-
-        projects = [self.resource_api.get_project(
-            ref['project_id']) for ref in refs]
-        return resource.controllers.ProjectV3.wrap_collection(context,
-                                                              projects)
-
-
-class EndpointGroupV3Controller(_ControllerBase):
-    collection_name = 'endpoint_groups'
-    member_name = 'endpoint_group'
-
-    VALID_FILTER_KEYS = ['service_id', 'region_id', 'interface']
-
-    def __init__(self):
-        super(EndpointGroupV3Controller, self).__init__()
-
-    @classmethod
-    def base_url(cls, context, path=None):
-        """Construct a path and pass it to V3Controller.base_url method."""
-
-        path = '/OS-EP-FILTER/' + cls.collection_name
-        return super(EndpointGroupV3Controller, cls).base_url(context,
-                                                              path=path)
-
-    @controller.protected()
-    @validation.validated(schema.endpoint_group_create, 'endpoint_group')
-    def create_endpoint_group(self, context, endpoint_group):
-        """Creates an Endpoint Group with the associated filters."""
-        ref = self._assign_unique_id(self._normalize_dict(endpoint_group))
-        self._require_attribute(ref, 'filters')
-        self._require_valid_filter(ref)
-        ref = self.endpoint_filter_api.create_endpoint_group(ref['id'], ref)
-        return EndpointGroupV3Controller.wrap_member(context, ref)
-
-    def _require_valid_filter(self, endpoint_group):
-        filters = endpoint_group.get('filters')
-        for key in six.iterkeys(filters):
-            if key not in self.VALID_FILTER_KEYS:
-                raise exception.ValidationError(
-                    attribute=self._valid_filter_keys(),
-                    target='endpoint_group')
-
-    def _valid_filter_keys(self):
-        return ' or '.join(self.VALID_FILTER_KEYS)
-
-    @controller.protected()
-    def get_endpoint_group(self, context, endpoint_group_id):
-        """Retrieve the endpoint group associated with the id if exists."""
-        ref = self.endpoint_filter_api.get_endpoint_group(endpoint_group_id)
-        return EndpointGroupV3Controller.wrap_member(
-            context, ref)
-
-    @controller.protected()
-    @validation.validated(schema.endpoint_group_update, 'endpoint_group')
-    def update_endpoint_group(self, context, endpoint_group_id,
-                              endpoint_group):
-        """Update fixed values and/or extend the filters."""
-        if 'filters' in endpoint_group:
-            self._require_valid_filter(endpoint_group)
-        ref = self.endpoint_filter_api.update_endpoint_group(endpoint_group_id,
-                                                             endpoint_group)
-        return EndpointGroupV3Controller.wrap_member(
-            context, ref)
-
-    @controller.protected()
-    def delete_endpoint_group(self, context, endpoint_group_id):
-        """Delete endpoint_group."""
-        self.endpoint_filter_api.delete_endpoint_group(endpoint_group_id)
-
-    @controller.protected()
-    def list_endpoint_groups(self, context):
-        """List all endpoint groups."""
-        refs = self.endpoint_filter_api.list_endpoint_groups()
-        return EndpointGroupV3Controller.wrap_collection(
-            context, refs)
-
-    @controller.protected()
-    def list_endpoint_groups_for_project(self, context, project_id):
-        """List all endpoint groups associated with a given project."""
-        return EndpointGroupV3Controller.wrap_collection(
-            context, self._get_endpoint_groups_for_project(project_id))
-
-    @controller.protected()
-    def list_projects_associated_with_endpoint_group(self,
-                                                     context,
-                                                     endpoint_group_id):
-        """List all projects associated with endpoint group."""
-        endpoint_group_refs = (self.endpoint_filter_api.
-                               list_projects_associated_with_endpoint_group(
-                                   endpoint_group_id))
-        projects = []
-        for endpoint_group_ref in endpoint_group_refs:
-            project = self.resource_api.get_project(
-                endpoint_group_ref['project_id'])
-            if project:
-                projects.append(project)
-        return resource.controllers.ProjectV3.wrap_collection(context,
-                                                              projects)
-
-    @controller.protected()
-    def list_endpoints_associated_with_endpoint_group(self,
-                                                      context,
-                                                      endpoint_group_id):
-        """List all the endpoints filtered by a specific endpoint group."""
-        filtered_endpoints = self._get_endpoints_filtered_by_endpoint_group(
-            endpoint_group_id)
-        return catalog_controllers.EndpointV3.wrap_collection(
-            context, filtered_endpoints)
-
-
-class ProjectEndpointGroupV3Controller(_ControllerBase):
-    collection_name = 'project_endpoint_groups'
-    member_name = 'project_endpoint_group'
-
-    def __init__(self):
-        super(ProjectEndpointGroupV3Controller, self).__init__()
-        notifications.register_event_callback(
-            notifications.ACTIONS.deleted, 'project',
-            self._on_project_delete)
-
-    def _on_project_delete(self, service, resource_type,
-                           operation, payload):
-        project_id = payload['resource_info']
-        (self.endpoint_filter_api.
-            delete_endpoint_group_association_by_project(
-                project_id))
-
-    @controller.protected()
-    def get_endpoint_group_in_project(self, context, endpoint_group_id,
-                                      project_id):
-        """Retrieve the endpoint group associated with the id if exists."""
-        self.resource_api.get_project(project_id)
-        self.endpoint_filter_api.get_endpoint_group(endpoint_group_id)
-        ref = self.endpoint_filter_api.get_endpoint_group_in_project(
-            endpoint_group_id, project_id)
-        return ProjectEndpointGroupV3Controller.wrap_member(
-            context, ref)
-
-    @controller.protected()
-    def add_endpoint_group_to_project(self, context, endpoint_group_id,
-                                      project_id):
-        """Creates an association between an endpoint group and project."""
-        self.resource_api.get_project(project_id)
-        self.endpoint_filter_api.get_endpoint_group(endpoint_group_id)
-        self.endpoint_filter_api.add_endpoint_group_to_project(
-            endpoint_group_id, project_id)
-
-    @controller.protected()
-    def remove_endpoint_group_from_project(self, context, endpoint_group_id,
-                                           project_id):
-        """Remove the endpoint group from associated project."""
-        self.resource_api.get_project(project_id)
-        self.endpoint_filter_api.get_endpoint_group(endpoint_group_id)
-        self.endpoint_filter_api.remove_endpoint_group_from_project(
-            endpoint_group_id, project_id)
-
-    @classmethod
-    def _add_self_referential_link(cls, context, ref):
-        url = ('/OS-EP-FILTER/endpoint_groups/%(endpoint_group_id)s'
-               '/projects/%(project_id)s' % {
-                   'endpoint_group_id': ref['endpoint_group_id'],
-                   'project_id': ref['project_id']})
-        ref.setdefault('links', {})
-        ref['links']['self'] = url
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/core.py b/keystone-moon/keystone/contrib/endpoint_filter/core.py
deleted file mode 100644
index b66465ea..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/core.py
+++ /dev/null
@@ -1,296 +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.
-
-"""Main entry point into the Endpoint Filter service."""
-
-import abc
-
-from oslo_config import cfg
-from oslo_log import log
-import six
-
-from keystone.common import dependency
-from keystone.common import extension
-from keystone.common import manager
-from keystone import exception
-
-
-CONF = cfg.CONF
-LOG = log.getLogger(__name__)
-
-extension_data = {
-    'name': 'OpenStack Keystone Endpoint Filter API',
-    'namespace': 'http://docs.openstack.org/identity/api/ext/'
-                 'OS-EP-FILTER/v1.0',
-    'alias': 'OS-EP-FILTER',
-    'updated': '2013-07-23T12:00:0-00:00',
-    'description': 'OpenStack Keystone Endpoint Filter API.',
-    'links': [
-        {
-            'rel': 'describedby',
-            # TODO(ayoung): needs a description
-            'type': 'text/html',
-            'href': 'https://github.com/openstack/identity-api/blob/master'
-                    '/openstack-identity-api/v3/src/markdown/'
-                    'identity-api-v3-os-ep-filter-ext.md',
-        }
-    ]}
-extension.register_admin_extension(extension_data['alias'], extension_data)
-
-
-@dependency.provider('endpoint_filter_api')
-class Manager(manager.Manager):
-    """Default pivot point for the Endpoint Filter backend.
-
-    See :mod:`keystone.common.manager.Manager` for more details on how this
-    dynamically calls the backend.
-
-    """
-
-    driver_namespace = 'keystone.endpoint_filter'
-
-    def __init__(self):
-        super(Manager, self).__init__(CONF.endpoint_filter.driver)
-
-
-@six.add_metaclass(abc.ABCMeta)
-class EndpointFilterDriverV8(object):
-    """Interface description for an Endpoint Filter driver."""
-
-    @abc.abstractmethod
-    def add_endpoint_to_project(self, endpoint_id, project_id):
-        """Create an endpoint to project association.
-
-        :param endpoint_id: identity of endpoint to associate
-        :type endpoint_id: string
-        :param project_id: identity of the project to be associated with
-        :type project_id: string
-        :raises: keystone.exception.Conflict,
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def remove_endpoint_from_project(self, endpoint_id, project_id):
-        """Removes an endpoint to project association.
-
-        :param endpoint_id: identity of endpoint to remove
-        :type endpoint_id: string
-        :param project_id: identity of the project associated with
-        :type project_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def check_endpoint_in_project(self, endpoint_id, project_id):
-        """Checks if an endpoint is associated with a project.
-
-        :param endpoint_id: identity of endpoint to check
-        :type endpoint_id: string
-        :param project_id: identity of the project associated with
-        :type project_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def list_endpoints_for_project(self, project_id):
-        """List all endpoints associated with a project.
-
-        :param project_id: identity of the project to check
-        :type project_id: string
-        :returns: a list of identity endpoint ids or an empty list.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def list_projects_for_endpoint(self, endpoint_id):
-        """List all projects associated with an endpoint.
-
-        :param endpoint_id: identity of endpoint to check
-        :type endpoint_id: string
-        :returns: a list of projects or an empty list.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def delete_association_by_endpoint(self, endpoint_id):
-        """Removes all the endpoints to project association with endpoint.
-
-        :param endpoint_id: identity of endpoint to check
-        :type endpoint_id: string
-        :returns: None
-
-        """
-        raise exception.NotImplemented()
-
-    @abc.abstractmethod
-    def delete_association_by_project(self, project_id):
-        """Removes all the endpoints to project association with project.
-
-        :param project_id: identity of the project to check
-        :type project_id: string
-        :returns: None
-
-        """
-        raise exception.NotImplemented()
-
-    @abc.abstractmethod
-    def create_endpoint_group(self, endpoint_group):
-        """Create an endpoint group.
-
-        :param endpoint_group: endpoint group to create
-        :type endpoint_group: dictionary
-        :raises: keystone.exception.Conflict,
-        :returns: an endpoint group representation.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def get_endpoint_group(self, endpoint_group_id):
-        """Get an endpoint group.
-
-        :param endpoint_group_id: identity of endpoint group to retrieve
-        :type endpoint_group_id: string
-        :raises: exception.NotFound
-        :returns: an endpoint group representation.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def update_endpoint_group(self, endpoint_group_id, endpoint_group):
-        """Update an endpoint group.
-
-        :param endpoint_group_id: identity of endpoint group to retrieve
-        :type endpoint_group_id: string
-        :param endpoint_group: A full or partial endpoint_group
-        :type endpoint_group: dictionary
-        :raises: exception.NotFound
-        :returns: an endpoint group representation.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def delete_endpoint_group(self, endpoint_group_id):
-        """Delete an endpoint group.
-
-        :param endpoint_group_id: identity of endpoint group to delete
-        :type endpoint_group_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def add_endpoint_group_to_project(self, endpoint_group_id, project_id):
-        """Adds an endpoint group to project association.
-
-        :param endpoint_group_id: identity of endpoint to associate
-        :type endpoint_group_id: string
-        :param project_id: identity of project to associate
-        :type project_id: string
-        :raises: keystone.exception.Conflict,
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def get_endpoint_group_in_project(self, endpoint_group_id, project_id):
-        """Get endpoint group to project association.
-
-        :param endpoint_group_id: identity of endpoint group to retrieve
-        :type endpoint_group_id: string
-        :param project_id: identity of project to associate
-        :type project_id: string
-        :raises: exception.NotFound
-        :returns: a project endpoint group representation.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def list_endpoint_groups(self):
-        """List all endpoint groups.
-
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def list_endpoint_groups_for_project(self, project_id):
-        """List all endpoint group to project associations for a project.
-
-        :param project_id: identity of project to associate
-        :type project_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def list_projects_associated_with_endpoint_group(self, endpoint_group_id):
-        """List all projects associated with endpoint group.
-
-        :param endpoint_group_id: identity of endpoint to associate
-        :type endpoint_group_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def remove_endpoint_group_from_project(self, endpoint_group_id,
-                                           project_id):
-        """Remove an endpoint to project association.
-
-        :param endpoint_group_id: identity of endpoint to associate
-        :type endpoint_group_id: string
-        :param project_id: identity of project to associate
-        :type project_id: string
-        :raises: exception.NotFound
-        :returns: None.
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-    @abc.abstractmethod
-    def delete_endpoint_group_association_by_project(self, project_id):
-        """Remove endpoint group to project associations.
-
-        :param project_id: identity of the project to check
-        :type project_id: string
-        :returns: None
-
-        """
-        raise exception.NotImplemented()  # pragma: no cover
-
-
-Driver = manager.create_legacy_driver(EndpointFilterDriverV8)
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/__init__.py b/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/__init__.py
+++ /dev/null
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/migrate.cfg b/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/migrate.cfg
deleted file mode 100644
index c7d34785..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/migrate.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[db_settings]
-# Used to identify which repository this database is versioned under.
-# You can use the name of your project.
-repository_id=endpoint_filter
-
-# The name of the database table used to track the schema version.
-# This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to
-# change the table name in each database too.
-version_table=migrate_version
-
-# When committing a change script, Migrate will attempt to generate the
-# sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the
-# commit continues, perhaps ending successfully.
-# Databases in this list MUST compile successfully during a commit, or the
-# entire commit will fail. List the databases your application will actually
-# be using to ensure your updates to that database work properly.
-# This must be a list; example: ['postgres','sqlite']
-required_dbs=[]
-
-# When creating new change scripts, Migrate will stamp the new script with
-# a version number. By default this is latest_version + 1. You can set this
-# to 'true' to tell Migrate to use the UTC timestamp instead.
-use_timestamp_numbering=False
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py b/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py
deleted file mode 100644
index ac0a30cc..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py
+++ /dev/null
@@ -1,19 +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 keystone import exception
-
-
-def upgrade(migrate_engine):
-    raise exception.MigrationMovedFailure(extension='endpoint_filter')
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/002_add_endpoint_groups.py b/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/002_add_endpoint_groups.py
deleted file mode 100644
index ac5aa5b3..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/002_add_endpoint_groups.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2014 Hewlett-Packard Company
-#
-# 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 keystone import exception
-
-
-def upgrade(migrate_engine):
-    raise exception.MigrationMovedFailure(extension='endpoint_filter')
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/__init__.py b/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/migrate_repo/versions/__init__.py
+++ /dev/null
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/routers.py b/keystone-moon/keystone/contrib/endpoint_filter/routers.py
deleted file mode 100644
index f75110f9..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/routers.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 log
-from oslo_log import versionutils
-
-from keystone.common import wsgi
-from keystone.i18n import _
-
-
-LOG = log.getLogger(__name__)
-
-
-class EndpointFilterExtension(wsgi.Middleware):
-
-    def __init__(self, *args, **kwargs):
-        super(EndpointFilterExtension, self).__init__(*args, **kwargs)
-        msg = _("Remove endpoint_filter_extension from the paste pipeline, "
-                "the endpoint filter extension is now always available. "
-                "Update the [pipeline:api_v3] section in keystone-paste.ini "
-                "accordingly as it will be removed in the O release.")
-        versionutils.report_deprecated_feature(LOG, msg)
diff --git a/keystone-moon/keystone/contrib/endpoint_filter/schema.py b/keystone-moon/keystone/contrib/endpoint_filter/schema.py
deleted file mode 100644
index cbe54e36..00000000
--- a/keystone-moon/keystone/contrib/endpoint_filter/schema.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 keystone.common import validation
-from keystone.common.validation import parameter_types
-
-
-_endpoint_group_properties = {
-    'description': validation.nullable(parameter_types.description),
-    'filters': {
-        'type': 'object'
-    },
-    'name': parameter_types.name
-}
-
-endpoint_group_create = {
-    'type': 'object',
-    'properties': _endpoint_group_properties,
-    'required': ['name', 'filters']
-}
-
-endpoint_group_update = {
-    'type': 'object',
-    'properties': _endpoint_group_properties,
-    'minProperties': 1
-}