openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Follow up patch for Improve docs for v3 ec2"

Browse Source
This commit is contained in:
Jenkins
2016-08-18 15:14:20 +00:00
committed by Gerrit Code Review
parent d97510cbd5 70f3ee67e4
commit 12ccd0e52a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystoneclient/v3/ec2.py
View File

@@ -20,6 +20,8 @@ class EC2(base.Resource):
* id: a string that identifies the EC2 resource. * id: a string that identifies the EC2 resource.
* user_id: the ID field of a pre-existing user in the backend. * user_id: the ID field of a pre-existing user in the backend.
* project_id: the ID field of a pre-existing project in the backend. * project_id: the ID field of a pre-existing project in the backend.
* access: a string representing access key of the access/secret pair.
* secret: a string representing the secret of the access/secret pair.
""" """
@@ -56,9 +58,8 @@ class EC2Manager(base.ManagerWithFind):
:param user_id: the ID of the user whose access/secret pair will be :param user_id: the ID of the user whose access/secret pair will be
retrieved from the server. retrieved from the server.
:type user_id: str or :class:`keystoneclient.v3.users.User` :type user_id: str or :class:`keystoneclient.v3.users.User`
:param access: the access key whose access/secret pair will be :param str access: the access key whose access/secret pair will be
retrieved from the server. retrieved from the server.
:type access: str or :class:`keystoneclient.v3.ec2.EC2`
:returns: the specified access/secret pair returned from server. :returns: the specified access/secret pair returned from server.
:rtype: :class:`keystoneclient.v3.ec2.EC2` :rtype: :class:`keystoneclient.v3.ec2.EC2`
@@ -86,9 +87,8 @@ class EC2Manager(base.ManagerWithFind):
:param user_id: the ID of the user whose access/secret pair will be :param user_id: the ID of the user whose access/secret pair will be
deleted on the server. deleted on the server.
:type user_id: str or :class:`keystoneclient.v3.users.User` :type user_id: str or :class:`keystoneclient.v3.users.User`
:param access: the access key whose access/secret pair will be deleted :param str access: the access key whose access/secret pair will be
on the server. deleted on the server.
:type access: str or :class:`keystoneclient.v3.ec2.EC2`
:returns: Response object with 204 status. :returns: Response object with 204 status.
:rtype: :class:`requests.models.Response` :rtype: :class:`requests.models.Response`