From 891ef3e71e5df30f3c3e97a806dc116c1677568b Mon Sep 17 00:00:00 2001
From: Michal Dulko <michal.dulko@intel.com>
Date: Thu, 19 Mar 2015 15:27:16 +0100
Subject: [PATCH] Use shared shell arguments provided by Session

The cinderclient implemented it's own version of the CLI arguments that
are now provided by keystoneclient's session object. This changeset
converts cinder over to utilizing the shared argument registration.

Closes-Bug: 1434105
Change-Id: I72b16aab909d72a47097434436093e616667634a
---
 cinderclient/shell.py | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 4041c6473..b08df376c 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -361,18 +361,6 @@ class OpenStackCinderShell(object):
             default=utils.env('OS_PROJECT_DOMAIN_NAME'),
             help='Defaults to env[OS_PROJECT_DOMAIN_NAME].')
 
-        parser.add_argument(
-            '--os-cert',
-            metavar='<certificate>',
-            default=utils.env('OS_CERT'),
-            help='Defaults to env[OS_CERT].')
-
-        parser.add_argument(
-            '--os-key',
-            metavar='<key>',
-            default=utils.env('OS_KEY'),
-            help='Defaults to env[OS_KEY].')
-
         parser.add_argument('--os-region-name',
                             metavar='<region-name>',
                             default=utils.env('OS_REGION_NAME',
@@ -398,19 +386,10 @@ class OpenStackCinderShell(object):
             '--os_url',
             help=argparse.SUPPRESS)
 
-        parser.add_argument(
-            '--os-cacert',
-            metavar='<ca-certificate>',
-            default=utils.env('OS_CACERT', default=None),
-            help=_("Specify a CA bundle file to use in "
-                   "verifying a TLS (https) server certificate. "
-                   "Defaults to env[OS_CACERT]"))
-
-        parser.add_argument('--insecure',
-                            default=utils.env('CINDERCLIENT_INSECURE',
-                                              default=False),
-                            action='store_true',
-                            help=argparse.SUPPRESS)
+        # Register the CLI arguments that have moved to the session object.
+        session.Session.register_cli_options(parser)
+        parser.set_defaults(insecure=utils.env('CINDERCLIENT_INSECURE',
+                                               default=False))
 
     def get_subcommand_parser(self, version):
         parser = self.get_base_parser()