Merge "Rework shell tests"

Author: Jenkins

examples/object_api.py

@@ -52,8 +52,8 @@ def run(opts):
     # NOTE(dtroyer): This converts from the usual OpenStack way to the single
     #                requests argument and is an app-specific thing because
     #                we want to be like OpenStackClient.
-    if opts.os_cacert:
-        verify = opts.os_cacert
+    if opts.cacert:
+        verify = opts.cacert
     else:
         verify = not opts.insecure
 

examples/osc-lib.py

@@ -62,8 +62,8 @@ def run(opts):
     # NOTE(dtroyer): This converts from the usual OpenStack way to the single
     #                requests argument and is an app-specific thing because
     #                we want to be like OpenStackClient.
-    if opts.os_cacert:
-        verify = opts.os_cacert
+    if opts.cacert:
+        verify = opts.cacert
     else:
         verify = not opts.insecure
 

openstackclient/shell.py

@@ -182,6 +182,7 @@ def build_option_parser(self, description, version):
         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 @@ def build_option_parser(self, description, version):
         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 @@ def initialize_app(self, argv):
             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: