From e9b8f8ec2fddb07d5d5e8cf1745e8e4720dd78da Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 27 Jun 2012 12:04:01 -0400
Subject: [PATCH] Switch CLI to support underscores and dashes.

Update the glanceclient CLI to support both underscores and dashes.

Dashes are prefered and show up in help.

This will hopefully keep the CLI more consistent with the other
OpenStack client projects like Nova, Swift, Keystone in addition to the
old Glance client which all seem to prefer underscores to dashes.

Fixes LP Bug #1018467.

Change-Id: I80d7a19f94033554f7f639166911726de4a5159f
---
 glanceclient/shell.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index 7c41464..065046e 100644
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -61,46 +61,79 @@ class OpenStackImagesShell(object):
             default=utils.env('OS_USERNAME'),
             help='Defaults to env[OS_USERNAME]')
 
+        parser.add_argument('--os_username',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-password',
             default=utils.env('OS_PASSWORD'),
             help='Defaults to env[OS_PASSWORD]')
 
+        parser.add_argument('--os_password',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-tenant-id',
             default=utils.env('OS_TENANT_ID'),
             help='Defaults to env[OS_TENANT_ID]')
 
+        parser.add_argument('--os_tenant_id',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-tenant-name',
             default=utils.env('OS_TENANT_NAME'),
             help='Defaults to env[OS_TENANT_NAME]')
 
+        parser.add_argument('--os_tenant_name',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-auth-url',
             default=utils.env('OS_AUTH_URL'),
             help='Defaults to env[OS_AUTH_URL]')
 
+        parser.add_argument('--os_auth_url',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-region-name',
             default=utils.env('OS_REGION_NAME'),
             help='Defaults to env[OS_REGION_NAME]')
 
+        parser.add_argument('--os_region_name',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-auth-token',
             default=utils.env('OS_AUTH_TOKEN'),
             help='Defaults to env[OS_AUTH_TOKEN]')
 
+        parser.add_argument('--os_auth_token',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-image-url',
             default=utils.env('OS_IMAGE_URL'),
             help='Defaults to env[OS_IMAGE_URL]')
 
+        parser.add_argument('--os_image_url',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-image-api-version',
             default=utils.env('OS_IMAGE_API_VERSION', default='1'),
             help='Defaults to env[OS_IMAGE_API_VERSION] or 1')
 
+        parser.add_argument('--os_image_api_version',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-service-type',
             default=utils.env('OS_SERVICE_TYPE'),
             help='Defaults to env[OS_SERVICE_TYPE]')
 
+        parser.add_argument('--os_service_type',
+            help=argparse.SUPPRESS)
+
         parser.add_argument('--os-endpoint-type',
             default=utils.env('OS_ENDPOINT_TYPE'),
             help='Defaults to env[OS_ENDPOINT_TYPE]')
 
+        parser.add_argument('--os_endpoint_type',
+            help=argparse.SUPPRESS)
+
         return parser
 
     def get_subcommand_parser(self, version):