diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 17:52:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 17:52:37 +0000 |
| commit | 34f5515a329d7bdd9b945e256729cd4c97595201 (patch) | |
| tree | 27a08c2a735e8d432319a9ebcd664c3191520689 /openstackclient/identity | |
| parent | fc7a69e410f217a436f7dae97b35314019a48b1b (diff) | |
| parent | 2a1a1740862c419e08284e50103d52e029f0e61e (diff) | |
| download | python-openstackclient-34f5515a329d7bdd9b945e256729cd4c97595201.tar.gz | |
Merge "Gate-unbreaking combo review"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/identity_provider.py | 9 | ||||
| -rw-r--r-- | openstackclient/identity/v3/service_provider.py | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/openstackclient/identity/v3/identity_provider.py b/openstackclient/identity/v3/identity_provider.py index 0453e888..b6b03188 100644 --- a/openstackclient/identity/v3/identity_provider.py +++ b/openstackclient/identity/v3/identity_provider.py @@ -204,11 +204,10 @@ class SetIdentityProvider(command.Command): if parsed_args.remote_id_file or parsed_args.remote_id: kwargs['remote_ids'] = remote_ids - identity_provider = federation_client.identity_providers.update( - parsed_args.identity_provider, **kwargs) - - identity_provider._info.pop('links', None) - return zip(*sorted(six.iteritems(identity_provider._info))) + federation_client.identity_providers.update( + parsed_args.identity_provider, + **kwargs + ) class ShowIdentityProvider(command.ShowOne): diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py index 440eba40..8548ae1f 100644 --- a/openstackclient/identity/v3/service_provider.py +++ b/openstackclient/identity/v3/service_provider.py @@ -182,12 +182,13 @@ class SetServiceProvider(command.Command): elif parsed_args.disable is True: enabled = False - service_provider = federation_client.service_providers.update( - parsed_args.service_provider, enabled=enabled, + federation_client.service_providers.update( + parsed_args.service_provider, + enabled=enabled, description=parsed_args.description, auth_url=parsed_args.auth_url, - sp_url=parsed_args.service_provider_url) - return zip(*sorted(six.iteritems(service_provider._info))) + sp_url=parsed_args.service_provider_url, + ) class ShowServiceProvider(command.ShowOne): |