openstack/python-openstackclient
Code Issues Proposed changes

Merge "Clean up ec2 credentials help text"

Browse Source
This commit is contained in:
Jenkins 2015-06-03 23:04:27 +00:00 committed by Gerrit Code Review
commit 0c5f12aec0
3 changed files with 57 additions and 39 deletions
doc/source/command-objects
ec2-credentials.rst
openstackclient/identity
v2_0
ec2creds.py
v3
ec2creds.py

20
doc/source/command-objects/ec2-credentials.rst

@ -20,22 +20,22 @@ Create EC2 credentials
.. option:: --project <project> .. option:: --project <project>
Specify an alternate project (default: current authenticated project) Create credentials in project (name or ID; default: current authenticated project)
.. option:: --user <user> .. option:: --user <user>
Specify an alternate user (default: current authenticated user) Create credentials for user (name or ID; default: current authenticated user)
.. option:: --user-domain <user-domain> .. option:: --user-domain <user-domain>
Domain the user belongs to (name or ID). Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist. This can be used in case collisions between user names exist.
.. versionadded:: 3 .. versionadded:: 3
.. option:: --project-domain <project-domain> .. option:: --project-domain <project-domain>
Domain the project belongs to (name or ID). Select project from a specific domain (name or ID)
This can be used in case collisions between project names exist. This can be used in case collisions between project names exist.
.. versionadded:: 3 .. versionadded:: 3
@ -60,11 +60,11 @@ Delete EC2 credentials
.. option:: --user <user> .. option:: --user <user>
Specify a user Delete credentials for user (name or ID)
.. option:: --user-domain <user-domain> .. option:: --user-domain <user-domain>
Domain the user belongs to (name or ID). Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist. This can be used in case collisions between user names exist.
.. versionadded:: 3 .. versionadded:: 3
@ -92,11 +92,11 @@ List EC2 credentials
.. option:: --user <user> .. option:: --user <user>
Filter list by <user> Filter list by <user> (name or ID)
.. option:: --user-domain <user-domain> .. option:: --user-domain <user-domain>
Domain the user belongs to (name or ID). Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist. This can be used in case collisions between user names exist.
.. versionadded:: 3 .. versionadded:: 3
@ -120,11 +120,11 @@ Display EC2 credentials details
.. option:: --user <user> .. option:: --user <user>
Specify a user Show credentials for user (name or ID)
.. option:: --user-domain <user-domain> .. option:: --user-domain <user-domain>
Domain the user belongs to (name or ID). Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist. This can be used in case collisions between user names exist.
.. versionadded:: 3 .. versionadded:: 3

18
openstackclient/identity/v2_0/ec2creds.py

@ -37,14 +37,18 @@ class CreateEC2Creds(show.ShowOne):
parser.add_argument( parser.add_argument(
'--project', '--project',
metavar='<project>', metavar='<project>',
help=_('Specify an alternate project' help=_(
' (default: current authenticated project)'), 'Create credentials in project '
'(name or ID; default: current authenticated project)'
),
) )
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify an alternate user' help=_(
' (default: current authenticated user)'), 'Create credentials for user '
'(name or ID; default: current authenticated user)'
),
) )
return parser return parser
@ -97,7 +101,7 @@ class DeleteEC2Creds(command.Command):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Delete credentials for user (name or ID)'),
) )
return parser return parser
@ -127,7 +131,7 @@ class ListEC2Creds(lister.Lister):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Filter list by user (name or ID)'),
) )
return parser return parser
@ -170,7 +174,7 @@ class ShowEC2Creds(show.ShowOne):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Show credentials for user (name or ID)'),
) )
return parser return parser

58
openstackclient/identity/v3/ec2creds.py

@ -62,28 +62,36 @@ class CreateEC2Creds(show.ShowOne):
parser.add_argument( parser.add_argument(
'--project', '--project',
metavar='<project>', metavar='<project>',
help=_('Specify an alternate project' help=_(
' (default: current authenticated project)'), 'Create credentials in project '
'(name or ID; default: current authenticated project)'
),
) )
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify an alternate user' help=_(
' (default: current authenticated user)'), 'Create credentials for user '
'(name or ID; default: current authenticated user)'
),
) )
parser.add_argument( parser.add_argument(
'--user-domain', '--user-domain',
metavar='<user-domain>', metavar='<user-domain>',
help=('Domain the user belongs to (name or ID). ' help=(
'This can be used in case collisions between user names ' 'Select user from a specific domain (name or ID); '
'exist.') 'This can be used in case collisions between user names '
'exist.'
),
) )
parser.add_argument( parser.add_argument(
'--project-domain', '--project-domain',
metavar='<project-domain>', metavar='<project-domain>',
help=('Domain the project belongs to (name or ID). ' help=(
'This can be used in case collisions between project names ' 'Select project from a specific domain (name or ID); '
'exist.') 'This can be used in case collisions between project names '
'exist.'
),
) )
return parser return parser
@ -139,14 +147,16 @@ class DeleteEC2Creds(command.Command):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Delete credentials for user (name or ID)'),
) )
parser.add_argument( parser.add_argument(
'--user-domain', '--user-domain',
metavar='<user-domain>', metavar='<user-domain>',
help=('Domain the user belongs to (name or ID). ' help=(
'This can be used in case collisions between user names ' 'Select user from a specific domain (name or ID); '
'exist.') 'This can be used in case collisions between user names '
'exist.'
),
) )
return parser return parser
@ -167,14 +177,16 @@ class ListEC2Creds(lister.Lister):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Filter list by user (name or ID)'),
) )
parser.add_argument( parser.add_argument(
'--user-domain', '--user-domain',
metavar='<user-domain>', metavar='<user-domain>',
help=('Domain the user belongs to (name or ID). ' help=(
'This can be used in case collisions between user names ' 'Select user from a specific domain (name or ID); '
'exist.') 'This can be used in case collisions between user names '
'exist.'
),
) )
return parser return parser
@ -209,14 +221,16 @@ class ShowEC2Creds(show.ShowOne):
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
help=_('Specify a user'), help=_('Show credentials for user (name or ID)'),
) )
parser.add_argument( parser.add_argument(
'--user-domain', '--user-domain',
metavar='<user-domain>', metavar='<user-domain>',
help=('Domain the user belongs to (name or ID). ' help=(
'This can be used in case collisions between user names ' 'Select user from a specific domain (name or ID); '
'exist.') 'This can be used in case collisions between user names '
'exist.'
),
) )
return parser return parser