From 27a7e8f3b0731354fd8a4d0e7b8bf937dae7148c Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 22 Apr 2015 09:46:15 -0400
Subject: Remove "OPTIONAL:" from optional argument help text (v2)

All arguments starting with '--' are optional and listed
under the 'Optional arguments:' header by argparse.  Remove
the extra note shown for each argument.

This mirrors the previous change which cleaned this up for v1:
811af8f Remove "OPTIONAL:" from optional argument help text

Change-Id: Ie8e9544c1544ff5403f1c29e83d528d896957899
---
 cinderclient/v2/shell.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cinderclient')

diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index f9efb7f..b85bbfc 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -153,30 +153,30 @@ def _extract_metadata(args):
 @utils.arg('--name',
            metavar='<name>',
            default=None,
-           help='Filters results by a name. OPTIONAL: Default=None.')
+           help='Filters results by a name. Default=None.')
 @utils.arg('--display-name',
            help=argparse.SUPPRESS)
 @utils.arg('--status',
            metavar='<status>',
            default=None,
-           help='Filters results by a status. OPTIONAL: Default=None.')
+           help='Filters results by a status. Default=None.')
 @utils.arg('--metadata',
            type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
            help='Filters results by a metadata key and value pair. '
-                'OPTIONAL: Default=None.')
+                'Default=None.')
 @utils.arg('--marker',
            metavar='<marker>',
            default=None,
            help='Begin returning volumes that appear later in the volume '
                 'list than that represented by this volume id. '
-                'OPTIONAL: Default=None.')
+                'Default=None.')
 @utils.arg('--limit',
            metavar='<limit>',
            default=None,
-           help='Maximum number of volumes to return. OPTIONAL: Default=None.')
+           help='Maximum number of volumes to return. Default=None.')
 @utils.arg('--sort_key',
            metavar='<sort_key>',
            default=None,
@@ -190,7 +190,7 @@ def _extract_metadata(args):
            default=None,
            help=(('Comma-separated list of sort keys and directions in the '
                   'form of <key>[:<asc|desc>]. '
-                  'Valid keys: %s. OPTIONAL: '
+                  'Valid keys: %s. '
                   'Default=None.') % ', '.join(volumes.SORT_KEY_VALUES)))
 @utils.arg('--tenant',
            type=str,
-- 
cgit v1.2.1