openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Fix help strings"

This commit is contained in:
Jenkins 2016-01-04 13:32:43 +00:00 committed by Gerrit Code Review
parent 2d96c2c9bb 8f320313f3
commit 86a9cc8371
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/shell.py
View File

@ -645,12 +645,12 @@ class OpenStackComputeShell(object):
if not os_username and not os_user_id:
raise exc.CommandError(
_("You must provide a username "
"or user id via --os-username, --os-user-id, "
"or user ID via --os-username, --os-user-id, "
"env[OS_USERNAME] or env[OS_USER_ID]"))
if not any([os_project_name, os_project_id]):
raise exc.CommandError(_("You must provide a project name or"
" project id via --os-project-name,"
" project ID via --os-project-name,"
" --os-project-id, env[OS_PROJECT_ID]"
" or env[OS_PROJECT_NAME]. You may"
" use os-project and os-tenant"

6
novaclient/tests/unit/test_shell.py
View File

@ -104,7 +104,7 @@ class ParserTest(utils.TestCase):
class ShellTest(utils.TestCase):
_msg_no_tenant_project = ("You must provide a project name or project"
" id via --os-project-name, --os-project-id,"
" ID via --os-project-name, --os-project-id,"
" env[OS_PROJECT_ID] or env[OS_PROJECT_NAME]."
" You may use os-project and os-tenant"
" interchangeably.")
@ -218,7 +218,7 @@ class ShellTest(utils.TestCase):
matchers.MatchesRegex(r, re.DOTALL | re.MULTILINE))
def test_no_username(self):
required = ('You must provide a username or user id'
required = ('You must provide a username or user ID'
' via --os-username, --os-user-id,'
' env[OS_USERNAME] or env[OS_USER_ID]')
self.make_env(exclude='OS_USERNAME')
@ -230,7 +230,7 @@ class ShellTest(utils.TestCase):
self.fail('CommandError not raised')
def test_no_user_id(self):
required = ('You must provide a username or user id'
required = ('You must provide a username or user ID'
' via --os-username, --os-user-id,'
' env[OS_USERNAME] or env[OS_USER_ID]')
self.make_env(exclude='OS_USER_ID', fake_env=FAKE_ENV2)

2
novaclient/v2/contrib/tenant_networks.py
View File

@ -44,7 +44,7 @@ class TenantNetworkManager(base.ManagerWithFind):
@cliutils.arg('network_id', metavar='<network_id>', help='ID of network')
def do_net(cs, args):
"""
DEPRECATED, Use tenant-network-show instead.
DEPRECATED, use tenant-network-show instead.
"""
do_tenant_network_show(cs, args)

20
novaclient/v2/shell.py
View File

@ -525,13 +525,13 @@ def _boot(cs, args):
dest='access_ip_v4',
metavar='<value>',
default=None,
help=_('Alternative access ip v4 of the instance.'))
help=_('Alternative access IPv4 of the instance.'))
@cliutils.arg(
'--access-ip-v6',
dest='access_ip_v6',
metavar='<value>',
default=None,
help=_('Alternative access ip v6 of the instance.'))
help=_('Alternative access IPv6 of the instance.'))
def do_boot(cs, args):
"""Boot a new server."""
boot_args, boot_kwargs = _boot(cs, args)
@ -1190,7 +1190,7 @@ def do_image_list(cs, _args):
help=_('Metadata to add/update or delete (only key is necessary on '
'delete).'))
def do_image_meta(cs, args):
"""Set or Delete metadata on an image."""
"""Set or delete metadata on an image."""
image = _find_image(cs, args.image)
metadata = _extract_metadata(args)
@ -1935,7 +1935,7 @@ def do_backup(cs, args):
default=[],
help=_('Metadata to set or delete (only key is necessary on delete).'))
def do_meta(cs, args):
"""Set or Delete metadata on a server."""
"""Set or delete metadata on a server."""
server = _find_server(cs, args.server)
metadata = _extract_metadata(args)
@ -2159,14 +2159,14 @@ def do_volume_show(cs, args):
'--snapshot-id',
metavar='<snapshot-id>',
default=None,
help=_('Optional snapshot id to create the volume from. (Default=None)'))
help=_('Optional snapshot ID to create the volume from. (Default=None)'))
@cliutils.arg(
'--snapshot_id',
help=argparse.SUPPRESS)
@cliutils.arg(
'--image-id',
metavar='<image-id>',
help=_('Optional image id to create the volume from. (Default=None)'),
help=_('Optional image ID to create the volume from. (Default=None)'),
default=None)
@cliutils.arg(
'--display-name',
@ -2286,7 +2286,7 @@ def do_volume_detach(cs, args):
metavar='<server>',
help=_('Name or ID of server.'))
def do_volume_attachments(cs, args):
"""List all the volumes attached to a server"""
"""List all the volumes attached to a server."""
volumes = cs.volumes.get_server_volumes(_find_server(cs, args.server).id)
_translate_volume_attachments_keys(volumes)
utils.print_list(volumes, ['ID', 'DEVICE', 'SERVER ID', 'VOLUME ID'])
@ -3096,7 +3096,7 @@ def do_keypair_delete(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('Id of key-pair owner (Admin only).'))
help=_('ID of key-pair owner (Admin only).'))
def do_keypair_delete(cs, args):
"""Delete keypair given by its name."""
cs.keypairs.delete(args.name, args.user)
@ -3125,7 +3125,7 @@ def do_keypair_list(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('List key-pairs of specified user id (Admin only).'))
help=_('List key-pairs of specified user ID (Admin only).'))
def do_keypair_list(cs, args):
"""Print a list of keypairs for a user"""
keypairs = cs.keypairs.list(args.user)
@ -3160,7 +3160,7 @@ def do_keypair_show(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('Id of key-pair owner (Admin only).'))
help=_('ID of key-pair owner (Admin only).'))
def do_keypair_show(cs, args):
"""Show details about the given keypair."""
keypair = cs.keypairs.get(args.keypair, args.user)