openstack/keystoneauth
Code Issues Proposed changes

Rename federated.py to federation.py

Browse Source 
Rename the plugins, as we usually use ``federation` instead of
``federated``. Also the stub class was renamed from
``FederatedBaseAuth`` to ``FederationBaseAuth``.

Change-Id: I696c16b9683b42c358c3b17b02e425e0b69014ea
This commit is contained in:
Marek Denis 2015-05-29 15:00:20 +02:00
parent e1872739c6
commit ebb48db1c8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneauth/auth/identity/v3/__init__.py
View File

@ -11,7 +11,7 @@
# under the License.
from keystoneauth.auth.identity.v3.base import * # noqa
from keystoneauth.auth.identity.v3.federated import * # noqa
from keystoneauth.auth.identity.v3.federation import * # noqa
from keystoneauth.auth.identity.v3.password import * # noqa
from keystoneauth.auth.identity.v3.token import * # noqa
@ -21,7 +21,7 @@ __all__ = ['Auth',
'AuthMethod',
'BaseAuth',
'FederatedBaseAuth',
'FederationBaseAuth',
'Password',
'PasswordMethod',

8
keystoneauth/auth/identity/v3/federated.py → keystoneauth/auth/identity/v3/federation.py
View File

@ -18,11 +18,11 @@ import six
from keystoneauth.auth.identity.v3 import base
from keystoneauth.auth.identity.v3 import token
__all__ = ['FederatedBaseAuth']
__all__ = ['FederationBaseAuth']
@six.add_metaclass(abc.ABCMeta)
class FederatedBaseAuth(base.BaseAuth):
class FederationBaseAuth(base.BaseAuth):
rescoping_plugin = token.Token
@ -38,13 +38,13 @@ class FederatedBaseAuth(base.BaseAuth):
:type identity_provider: string
"""
super(FederatedBaseAuth, self).__init__(auth_url=auth_url, **kwargs)
super(FederationBaseAuth, self).__init__(auth_url=auth_url, **kwargs)
self.identity_provider = identity_provider
self.protocol = protocol
@classmethod
def get_options(cls):
options = super(FederatedBaseAuth, cls).get_options()
options = super(FederationBaseAuth, cls).get_options()
options.extend([
cfg.StrOpt('identity-provider',

4
keystoneauth/tests/unit/auth/test_identity_v3_federated.py → keystoneauth/tests/unit/auth/test_identity_v3_federation.py
View File

@ -20,7 +20,7 @@ from keystoneauth import session
from keystoneauth.tests.unit import utils
class TesterFederationPlugin(v3.FederatedBaseAuth):
class TesterFederationPlugin(v3.FederationBaseAuth):
def get_unscoped_auth_ref(self, sess, **kwargs):
# This would go and talk to an idp or something
@ -90,7 +90,7 @@ class V3FederatedPlugin(utils.TestCase):
self.assertTrue(self.scoped_mock.called)
def test_options(self):
opts = [o.name for o in v3.FederatedBaseAuth.get_options()]
opts = [o.name for o in v3.FederationBaseAuth.get_options()]
self.assertIn('protocol', opts)
self.assertIn('identity-provider', opts)