From ac2a769b1f89a31eb7af28470038aa3b39c12358 Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Mon, 28 Nov 2016 16:31:31 -0500 Subject: [PATCH] Correct copy/paste errors in help The keypair, hypervisor, and flavor CLIs all incorrectly say that they support a special -1 case for the 'limit' parameter. I suspect this was just copied from the servers help text by mistake. Change-Id: I57fb3444d54232f0718424c00c07a28b29473d19 Closes-Bug: #1645489 (cherry picked from commit 83106a4442c2cb2f2617576e2e5539b409130ed3) --- novaclient/v2/shell.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index a823cd4a9..aa4e05e03 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -858,10 +858,9 @@ def _print_flavor_list(flavors, show_extra_specs=False): metavar='', type=int, default=None, - help=_("Maximum number of flavors to display. If limit == -1, all flavors " - "will be displayed. If limit is bigger than 'osapi_max_limit' " - "option of Nova API, limit 'osapi_max_limit' will be used " - "instead.")) + help=_("Maximum number of flavors to display. If limit is bigger than " + "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' " + "will be used instead.")) def do_flavor_list(cs, args): """Print a list of available 'flavors' (sizes of servers).""" if args.all: @@ -3316,8 +3315,7 @@ def do_keypair_list(cs, args): metavar='', type=int, default=None, - help=_("Maximum number of keypairs to display. If limit == -1, all " - "keypairs will be displayed. If limit is bigger than " + help=_("Maximum number of keypairs to display. If limit is bigger than " "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' " "will be used instead.")) def do_keypair_list(cs, args): @@ -4221,8 +4219,7 @@ def do_hypervisor_list(cs, args): metavar='', type=int, default=None, - help=_("Maximum number of hypervisors to display. If limit == -1, all " - "hypervisors will be displayed. If limit is bigger than " + help=_("Maximum number of hypervisors to display. If limit is bigger than " "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' " "will be used instead.")) def do_hypervisor_list(cs, args):