From 23415e801b3c266575288acf8f98693267822a78 Mon Sep 17 00:00:00 2001
From: Sun Austin <austin.sun@intel.com>
Date: Thu, 6 Dec 2018 13:26:54 +0800
Subject: [PATCH] adjust argparse metavar for command help function

'system help addrpool-add' or 'system help addrpool-modify' does not
take effect and print empty.

simplify metavar and move parameter's grammar to help
addrpool_add,addrpool_modify,cluster_add and cluster_modify function
are modified accordingly.

Closes-Bug: #1807091

Change-Id: I87bfbf46855d257623454a5723a4d843d9f5ec18
Signed-off-by: Sun Austin <austin.sun@intel.com>
---
 .../cgts-client/cgtsclient/v1/address_pool_shell.py    | 10 ++++++----
 .../cgts-client/cgtsclient/v1/cluster_shell.py         | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sysinv/cgts-client/cgts-client/cgtsclient/v1/address_pool_shell.py b/sysinv/cgts-client/cgts-client/cgtsclient/v1/address_pool_shell.py
index 43a60289f3..a05e7160e4 100644
--- a/sysinv/cgts-client/cgts-client/cgtsclient/v1/address_pool_shell.py
+++ b/sysinv/cgts-client/cgts-client/cgtsclient/v1/address_pool_shell.py
@@ -83,8 +83,9 @@ def _get_range_tuples(data):
            metavar='<network prefix>',
            help="Network IP address prefix length [REQUIRED]")
 @utils.arg('--ranges',
-           metavar='<start-end>,[<start-end],...',
-           help="The inclusive range of addresses to allocate")
+           metavar='<ranges>',
+           help="The inclusive range of addresses to allocate "
+           "<startaddr1-endaddr1>[,<startaddr2-endaddr2>,...]")
 @utils.arg('--order',
            metavar='<sequential | random>',
            help="The allocation order within the start/end range")
@@ -116,8 +117,9 @@ def do_addrpool_add(cc, args):
            metavar='<name>',
            help="Name of the Address Pool]")
 @utils.arg('--ranges',
-           metavar='<start-end>,[<start-end],...',
-           help="The inclusive range of addresses to allocate")
+           metavar='<ranges>',
+           help="The inclusive range of addresses to allocate "
+           "<startaddr1-endaddr1>[,<startaddr2-endaddr2>,...]")
 @utils.arg('--order',
            metavar='<sequential | random>',
            help="The allocation order within the start/end range")
diff --git a/sysinv/cgts-client/cgts-client/cgtsclient/v1/cluster_shell.py b/sysinv/cgts-client/cgts-client/cgtsclient/v1/cluster_shell.py
index f156039e87..80714d3559 100644
--- a/sysinv/cgts-client/cgts-client/cgtsclient/v1/cluster_shell.py
+++ b/sysinv/cgts-client/cgts-client/cgtsclient/v1/cluster_shell.py
@@ -86,8 +86,9 @@ if os.path.exists('/var/run/.sysinv_running_in_lab'):
                metavar='<name>',
                help='Name of the Cluster [REQUIRED]')
     @utils.arg('--peers',
-               metavar='<name~status>,[<name~status],...',
-               help='The inclusive range of peers to allocate')
+               metavar='<peers>',
+               help='The inclusive range of peers to allocate '
+               "<name~status>[,<name~status>,...]")
     def do_cluster_add(cc, args):
         """Add Cluster."""
 
@@ -115,8 +116,9 @@ if os.path.exists('/var/run/.sysinv_running_in_lab'):
                metavar='<name>',
                help="Name of the Cluster")
     @utils.arg('--peers',
-               metavar='<name-status>,[<name-status],...',
-               help="The inclusive range of peers to allocate")
+               metavar='<peers>',
+               help="The inclusive range of peers to allocate "
+               "<name~status>[,<name~status>,...]")
     def do_cluster_modify(cc, args):
         """Modify Cluster attributes."""