diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-25 20:54:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-25 20:54:25 +0000 |
| commit | 6176e802b3a4125e983eba3805f3f90881622bc4 (patch) | |
| tree | 4a036acde45278cd2c9b22692ab34c220615514d /openstackclient/identity | |
| parent | 43957d602b70ac718f0eab0fa30be5a4f20a5233 (diff) | |
| parent | f49f0fead2933ace4cb85c70bd14d13d0c479e6a (diff) | |
| download | python-openstackclient-6176e802b3a4125e983eba3805f3f90881622bc4.tar.gz | |
Merge "Fixed a bunch of spacing"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/client.py | 3 | ||||
| -rw-r--r-- | openstackclient/identity/v3/role_assignment.py | 2 | ||||
| -rw-r--r-- | openstackclient/identity/v3/unscoped_saml.py | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py index bd882ce8..c166e66a 100644 --- a/openstackclient/identity/client.py +++ b/openstackclient/identity/client.py @@ -53,7 +53,7 @@ def make_client(instance): session=instance.session, region_name=instance._region_name, **kwargs - ) + ) return client @@ -72,6 +72,7 @@ def build_option_parser(parser): class IdentityClientv2(identity_client_v2.Client): """Tweak the earlier client class to deal with some changes""" + def __getattr__(self, name): # Map v3 'projects' back to v2 'tenants' if name == "projects": diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py index e2b0fe1f..a1418a82 100644 --- a/openstackclient/identity/v3/role_assignment.py +++ b/openstackclient/identity/v3/role_assignment.py @@ -134,7 +134,7 @@ class ListRoleAssignment(command.Lister): if 'project' in scope: if include_names: prj = '@'.join([scope['project']['name'], - scope['project']['domain']['name']]) + scope['project']['domain']['name']]) setattr(assignment, 'project', prj) else: setattr(assignment, 'project', scope['project']['id']) diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py index a42637dd..8e2616a6 100644 --- a/openstackclient/identity/v3/unscoped_saml.py +++ b/openstackclient/identity/v3/unscoped_saml.py @@ -27,6 +27,7 @@ UNSCOPED_AUTH_PLUGINS = ['v3unscopedsaml', 'v3unscopedadfs', 'v3oidc'] def auth_with_unscoped_saml(func): """Check the unscoped federated context""" + def _decorated(self, parsed_args): auth_plugin_name = self.app.client_manager.auth_plugin_name if auth_plugin_name in UNSCOPED_AUTH_PLUGINS: |