openstack/python-novaclient
Code Issues Proposed changes

Merge "Fix for "nova help list" command"

Browse Source
This commit is contained in:
Jenkins 2014-05-02 10:05:51 +00:00 committed by Gerrit Code Review
commit 3065815693
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
novaclient/v1_1/shell.py
View File

@ -1013,13 +1013,12 @@ def do_image_delete(cs, args):
dest='ip', dest='ip',
metavar='<ip-regexp>', metavar='<ip-regexp>',
default=None, default=None,
help=_('Search with regular expression match by IP address (Admin only).')) help=_('Search with regular expression match by IP address.'))
@utils.arg('--ip6', @utils.arg('--ip6',
dest='ip6', dest='ip6',
metavar='<ip6-regexp>', metavar='<ip6-regexp>',
default=None, default=None,
help=_('Search with regular expression match by IPv6 address ' help=_('Search with regular expression match by IPv6 address.'))
'(Admin only).'))
@utils.arg('--name', @utils.arg('--name',
dest='name', dest='name',
metavar='<name-regexp>', metavar='<name-regexp>',
@ -1029,8 +1028,7 @@ def do_image_delete(cs, args):
dest='instance_name', dest='instance_name',
metavar='<name-regexp>', metavar='<name-regexp>',
default=None, default=None,
help=_('Search with regular expression match by server name ' help=_('Search with regular expression match by server name.'))
'(Admin only).'))
@utils.arg('--instance_name', @utils.arg('--instance_name',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
@utils.arg('--status', @utils.arg('--status',

6
novaclient/v3/shell.py
View File

@ -865,12 +865,12 @@ def do_image_delete(cs, args):
dest='ip', dest='ip',
metavar='<ip-regexp>', metavar='<ip-regexp>',
default=None, default=None,
help='Search with regular expression match by IP address (Admin only).') help='Search with regular expression match by IP address.')
@utils.arg('--ip6', @utils.arg('--ip6',
dest='ip6', dest='ip6',
metavar='<ip6-regexp>', metavar='<ip6-regexp>',
default=None, default=None,
help='Search with regular expression match by IPv6 address (Admin only).') help='Search with regular expression match by IPv6 address.')
@utils.arg('--name', @utils.arg('--name',
dest='name', dest='name',
metavar='<name-regexp>', metavar='<name-regexp>',
@ -880,7 +880,7 @@ def do_image_delete(cs, args):
dest='instance_name', dest='instance_name',
metavar='<name-regexp>', metavar='<name-regexp>',
default=None, default=None,
help='Search with regular expression match by server name (Admin only).') help='Search with regular expression match by server name.')
@utils.arg('--instance_name', @utils.arg('--instance_name',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
@utils.arg('--status', @utils.arg('--status',