openstack/keystone
Code Issues Proposed changes

Merge "Add entrypoint for mapped auth method"

Browse Source
This commit is contained in:
Jenkins
2016-08-22 23:19:41 +00:00
committed by Gerrit Code Review
parent 861647228b fd2a4fa07e
commit 68e94ff979
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/tests/unit/config_files/test_auth_plugin.conf
View File

@@ -1,4 +1,4 @@
[auth] [auth]
methods = external,password,token,simple_challenge_response,saml2,openid,x509 methods = external,password,token,simple_challenge_response,saml2,openid,x509,mapped
simple_challenge_response = keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse simple_challenge_response = keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse

2
keystone/tests/unit/test_auth_plugin.py
View File

@@ -180,7 +180,7 @@ class TestMapped(unit.TestCase):
self.assertEqual(method_name, auth_payload['protocol']) self.assertEqual(method_name, auth_payload['protocol'])
def test_supporting_multiple_methods(self): def test_supporting_multiple_methods(self):
method_names = ('saml2', 'openid', 'x509') method_names = ('saml2', 'openid', 'x509', 'mapped')
self.useFixture(auth_plugins.LoadAuthPlugins(*method_names)) self.useFixture(auth_plugins.LoadAuthPlugins(*method_names))
for method_name in method_names: for method_name in method_names:
self._test_mapped_invocation_with_method_name(method_name) self._test_mapped_invocation_with_method_name(method_name)

3
setup.cfg
View File

@@ -114,6 +114,9 @@ keystone.auth.totp =
keystone.auth.x509 = keystone.auth.x509 =
default = keystone.auth.plugins.mapped:Mapped default = keystone.auth.plugins.mapped:Mapped
keystone.auth.mapped =
default = keystone.auth.plugins.mapped:Mapped
keystone.catalog = keystone.catalog =
sql = keystone.catalog.backends.sql:Catalog sql = keystone.catalog.backends.sql:Catalog
templated = keystone.catalog.backends.templated:Catalog templated = keystone.catalog.backends.templated:Catalog