Always load revocation manager

The revocation manager should be loaded automatically as part of
the ongoing work to replace the concept of extensions.

Closes-Bug: #1427440

Change-Id: Ie9fb779198d30eb3ff81207c977bafdcd4453f5f

keystone/backends.py

@@ -18,6 +18,7 @@ from keystone.contrib import endpoint_filter
 from keystone.contrib import endpoint_policy
 from keystone.contrib import federation
 from keystone.contrib import oauth1
+from keystone.contrib import revoke
 from keystone import credential
 from keystone import identity
 from keystone import policy
@@ -51,6 +52,7 @@ def load_backends():
         oauth_api=oauth1.Manager(),
         policy_api=policy.Manager(),
         resource_api=resource.Manager(),
+        revoke_api=revoke.Manager(),
         role_api=assignment.RoleManager(),
         token_api=token.persistence.Manager(),
         trust_api=trust.Manager(),

keystone/tests/unit/test_auth.py

@@ -25,7 +25,6 @@ from keystone import assignment
 from keystone import auth
 from keystone.common import authorization
 from keystone import config
-from keystone.contrib import revoke
 from keystone import exception
 from keystone.models import token_model
 from keystone.tests import unit as tests
@@ -223,9 +222,6 @@ class AuthBadRequests(AuthTest):
 
 
 class AuthWithToken(AuthTest):
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def test_unscoped_token(self):
         """Verify getting an unscoped token with password creds."""
         body_dict = _build_user_auth(username='FOO',

keystone/tests/unit/test_revoke.py

@@ -18,7 +18,6 @@ import mock
 from oslo_utils import timeutils
 from testtools import matchers
 
-from keystone.contrib import revoke
 from keystone.contrib.revoke import model
 from keystone import exception
 from keystone.tests import unit as tests
@@ -180,9 +179,6 @@ class RevokeTests(object):
 
 
 class SqlRevokeTests(test_backend_sql.SqlTests, RevokeTests):
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def config_overrides(self):
         super(SqlRevokeTests, self).config_overrides()
         self.config_fixture.config(
@@ -195,9 +191,6 @@ class SqlRevokeTests(test_backend_sql.SqlTests, RevokeTests):
 
 
 class KvsRevokeTests(tests.TestCase, RevokeTests):
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def config_overrides(self):
         super(KvsRevokeTests, self).config_overrides()
         self.config_fixture.config(

keystone/tests/unit/test_v2.py

@@ -22,7 +22,6 @@ import six
 from testtools import matchers
 
 from keystone.common import extension as keystone_extension
-from keystone.contrib import revoke
 from keystone.tests.unit import rest
 
 
@@ -1371,10 +1370,6 @@ class V2TestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
 
 
 class RevokeApiTestCase(V2TestCase):
-
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def config_overrides(self):
         super(RevokeApiTestCase, self).config_overrides()
         self.config_fixture.config(

keystone/tests/unit/test_v3_auth.py

@@ -27,7 +27,6 @@ from testtools import matchers
 from testtools import testcase
 
 from keystone import auth
-from keystone.contrib import revoke
 from keystone import exception
 from keystone.policy.backends import rules
 from keystone.tests import unit as tests
@@ -675,9 +674,6 @@ class TestTokenRevokeSelfAndAdmin(test_v3.RestfulTestCase):
 class TestTokenRevokeById(test_v3.RestfulTestCase):
     """Test token revocation on the v3 Identity API."""
 
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def config_overrides(self):
         super(TestTokenRevokeById, self).config_overrides()
         self.config_fixture.config(
@@ -3070,9 +3066,6 @@ class TestTrustAuth(test_v3.RestfulTestCase):
     EXTENSION_NAME = 'revoke'
     EXTENSION_TO_ADD = 'revoke_extension'
 
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def config_overrides(self):
         super(TestTrustAuth, self).config_overrides()
         self.config_fixture.config(

keystone/tests/unit/test_v3_os_revoke.py

@@ -17,7 +17,6 @@ from oslo_utils import timeutils
 import six
 from testtools import matchers
 
-from keystone.contrib import revoke
 from keystone.contrib.revoke import model
 from keystone.tests.unit import test_v3
 from keystone.token import provider
@@ -40,9 +39,6 @@ class OSRevokeTests(test_v3.RestfulTestCase, test_v3.JsonHomeTestMixin):
         },
     }
 
-    def load_extra_backends(self):
-        return {'revoke_api': revoke.Manager()}
-
     def test_get_empty_list(self):
         resp = self.get('/OS-REVOKE/events')
         self.assertEqual([], resp.json_body['events'])