Merge "Search by user defined ID for service providers"

Jenkins · openstack-gerrit · commit f97fa2e6d2ca · 2016-05-25T02:44:56.000Z
diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py
@@ -192,7 +192,8 @@ def take_action(self, parsed_args):
         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
@@ -408,6 +408,7 @@ def test_service_provider_show(self):
 
         self.service_providers_mock.get.assert_called_with(
             service_fakes.sp_id,
+            id='BETA'
         )
 
         collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,7 @@ def test_service_provider_show(self):`
`408`	`408`
`409`	`409`	`self.service_providers_mock.get.assert_called_with(`
`410`	`410`	`service_fakes.sp_id,`
	`411`	`+ id='BETA'`
`411`	`412`	`)`
`412`	`413`
`413`	`414`	`collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')`