summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-25 02:44:56 +0000
committerGerrit Code Review <review@openstack.org>2016-05-25 02:44:56 +0000
commitf97fa2e6d2cae53e82c4e8d156231c81ada0e19d (patch)
tree3af05408e20cd4f7b4f8052f4855f7703cb5e92a
parente45b1c63f40b4e94e43bec71b44f00e4143fe9af (diff)
parent58094bff80584ba9afac0073aea545a96a170bff (diff)
downloadpython-openstackclient-f97fa2e6d2cae53e82c4e8d156231c81ada0e19d.tar.gz
Merge "Search by user defined ID for service providers"
-rw-r--r--openstackclient/identity/v3/service_provider.py3
-rw-r--r--openstackclient/tests/identity/v3/test_service_provider.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py
index e3a22ebb..8b433b4d 100644
--- a/openstackclient/identity/v3/service_provider.py
+++ b/openstackclient/identity/v3/service_provider.py
@@ -192,7 +192,8 @@ class ShowServiceProvider(command.ShowOne):
service_client = self.app.client_manager.identity
service_provider = utils.find_resource(
service_client.federation.service_providers,
- parsed_args.service_provider)
+ parsed_args.service_provider,
+ id=parsed_args.service_provider)
service_provider._info.pop('links', None)
return zip(*sorted(six.iteritems(service_provider._info)))
diff --git a/openstackclient/tests/identity/v3/test_service_provider.py b/openstackclient/tests/identity/v3/test_service_provider.py
index 80d60c5a..99ea1f75 100644
--- a/openstackclient/tests/identity/v3/test_service_provider.py
+++ b/openstackclient/tests/identity/v3/test_service_provider.py
@@ -408,6 +408,7 @@ class TestServiceProviderShow(TestServiceProvider):
self.service_providers_mock.get.assert_called_with(
service_fakes.sp_id,
+ id='BETA'
)
collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')