Merge "Fix identity_providers docstring"

This commit is contained in:
Jenkins
2016-04-28 21:52:47 +00:00
committed by Gerrit Code Review

View File

@@ -47,6 +47,10 @@ class IdentityProviderManager(base.CrudManager):
PUT /OS-FEDERATION/identity_providers/$identity_provider
:param id: unique id of the identity provider.
:param kwargs: optional attributes: description (str), enabled
(boolean) and remote_ids (list).
:returns: an IdentityProvider resource object.
:rtype: :py:class:`keystoneclient.v3.federation.IdentityProvider`
"""
return self._build_url_and_put(identity_provider_id=id,
@@ -60,6 +64,8 @@ class IdentityProviderManager(base.CrudManager):
:param identity_provider: an object with identity_provider_id
stored inside.
:returns: an IdentityProvider resource object.
:rtype: :py:class:`keystoneclient.v3.federation.IdentityProvider`
"""
return super(IdentityProviderManager, self).get(
@@ -71,6 +77,9 @@ class IdentityProviderManager(base.CrudManager):
Utilize Keystone URI:
GET /OS-FEDERATION/identity_providers
:returns: a list of IdentityProvider resource objects.
:rtype: list
"""
return super(IdentityProviderManager, self).list(**kwargs)
@@ -82,6 +91,8 @@ class IdentityProviderManager(base.CrudManager):
:param identity_provider: an object with identity_provider_id
stored inside.
:returns: an IdentityProvider resource object.
:rtype: :py:class:`keystoneclient.v3.federation.IdentityProvider`
"""
return super(IdentityProviderManager, self).update(
@@ -93,8 +104,8 @@ class IdentityProviderManager(base.CrudManager):
Utilize Keystone URI:
DELETE /OS-FEDERATION/identity_providers/$identity_provider
:param identity_provider: an object with identity_provider_id
stored inside.
:param identity_provider: the Identity Provider ID itself or an object
with it stored inside.
"""
return super(IdentityProviderManager, self).delete(