From 58094bff80584ba9afac0073aea545a96a170bff Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Fri, 11 Mar 2016 04:06:18 -0500 Subject: [PATCH] Search by user defined ID for service providers IDs for service providers can be user defined (like, Bob). This causes issues with the usual get by ID method. Keystone server side has implemented changes to search by ID when listing, which should resolve the issue with minimal changes to the client side. Change-Id: Ic705806e4bc7bb24f946a1fce803a0a0a4d788c1 Closes-Bug: 1555830 --- openstackclient/identity/v3/service_provider.py | 3 ++- openstackclient/tests/identity/v3/test_service_provider.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py index e3a22ebb1a..8b433b4d66 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 80d60c5a4e..99ea1f75ce 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')