diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2015-04-29 22:59:02 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2015-06-02 09:49:17 -0500 |
| commit | a05cbf4c998678a3619d82dd49be2b7759373d60 (patch) | |
| tree | ade0c263568a4e9758a2d0d46cc600850b629b6f /openstackclient/shell.py | |
| parent | 9bf24f3ae1f8bbf0003206d2e158b597bffe787f (diff) | |
| download | python-openstackclient-a05cbf4c998678a3619d82dd49be2b7759373d60.tar.gz | |
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
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |