From a05cbf4c998678a3619d82dd49be2b7759373d60 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 29 Apr 2015 22:59:02 -0500
Subject: Rework shell tests

This is the first step in reworking the shell argument handling,
clean up and add tests to ensure functionality doesn't change.

* Rework shell tests to break down global options and auth options.
* Make tests table-driven
* Remove 'os_' from 'cacert' and 'default_domain' internal option names

Change-Id: Icf69c7e84f3f44b366fe64b6bbf4e3fe958eb302
---
 openstackclient/shell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'openstackclient/shell.py')

diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index e6181683..136542dc 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -182,6 +182,7 @@ class OpenStackShell(app.App):
         parser.add_argument(
             '--os-cacert',
             metavar='<ca-bundle-file>',
+            dest='cacert',
             default=utils.env('OS_CACERT'),
             help='CA certificate bundle file (Env: OS_CACERT)')
         verify_group = parser.add_mutually_exclusive_group()
@@ -200,6 +201,7 @@ class OpenStackShell(app.App):
         parser.add_argument(
             '--os-default-domain',
             metavar='<auth-domain>',
+            dest='default_domain',
             default=utils.env(
                 'OS_DEFAULT_DOMAIN',
                 default=DEFAULT_DOMAIN),
@@ -270,7 +272,7 @@ class OpenStackShell(app.App):
             self.verify = self.cloud.config.get('verify', self.verify)
 
         # Save default domain
-        self.default_domain = self.options.os_default_domain
+        self.default_domain = self.options.default_domain
 
         # Loop through extensions to get API versions
         for mod in clientmanager.PLUGIN_MODULES:
-- 
cgit v1.2.1