From 505fa14cd68e13d066a5770a229ba0d7fa88d2a9 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 27 Feb 2015 09:19:12 -0600
Subject: Fix auth-required for help command

When we got picky with the auth arguments we broke using help without
any auth config supplied.  This rearranges things a bit to do the argument
checking when the deferred auth request to Identity occurs so commands
that do not need auth have a chance to live short but useful lives.

Closes-Bug: #1399588
Change-Id: I8ceac491cf65e25eddb62ab2713f471fe686756d
---
 openstackclient/tests/common/test_clientmanager.py | 61 ++++++++++++++--------
 1 file changed, 40 insertions(+), 21 deletions(-)

(limited to 'openstackclient/tests/common/test_clientmanager.py')

diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py
index 3b2b976b..f3826ca3 100644
--- a/openstackclient/tests/common/test_clientmanager.py
+++ b/openstackclient/tests/common/test_clientmanager.py
@@ -80,12 +80,16 @@ class TestClientManager(utils.TestCase):
     def test_client_manager_token_endpoint(self):
 
         client_manager = clientmanager.ClientManager(
-            auth_options=FakeOptions(os_token=fakes.AUTH_TOKEN,
-                                     os_url=fakes.AUTH_URL,
-                                     os_auth_type='token_endpoint'),
+            cli_options=FakeOptions(
+                os_token=fakes.AUTH_TOKEN,
+                os_url=fakes.AUTH_URL,
+                os_auth_type='token_endpoint',
+            ),
             api_version=API_VERSION,
             verify=True
         )
+        client_manager.setup_auth()
+
         self.assertEqual(
             fakes.AUTH_URL,
             client_manager._url,
@@ -104,12 +108,15 @@ class TestClientManager(utils.TestCase):
     def test_client_manager_token(self):
 
         client_manager = clientmanager.ClientManager(
-            auth_options=FakeOptions(os_token=fakes.AUTH_TOKEN,
-                                     os_auth_url=fakes.AUTH_URL,
-                                     os_auth_type='v2token'),
+            cli_options=FakeOptions(
+                os_token=fakes.AUTH_TOKEN,
+                os_auth_url=fakes.AUTH_URL,
+                os_auth_type='v2token',
+            ),
             api_version=API_VERSION,
             verify=True
         )
+        client_manager.setup_auth()
 
         self.assertEqual(
             fakes.AUTH_URL,
@@ -125,13 +132,16 @@ class TestClientManager(utils.TestCase):
     def test_client_manager_password(self):
 
         client_manager = clientmanager.ClientManager(
-            auth_options=FakeOptions(os_auth_url=fakes.AUTH_URL,
-                                     os_username=fakes.USERNAME,
-                                     os_password=fakes.PASSWORD,
-                                     os_project_name=fakes.PROJECT_NAME),
+            cli_options=FakeOptions(
+                os_auth_url=fakes.AUTH_URL,
+                os_username=fakes.USERNAME,
+                os_password=fakes.PASSWORD,
+                os_project_name=fakes.PROJECT_NAME,
+            ),
             api_version=API_VERSION,
             verify=False,
         )
+        client_manager.setup_auth()
 
         self.assertEqual(
             fakes.AUTH_URL,
@@ -182,14 +192,17 @@ class TestClientManager(utils.TestCase):
     def test_client_manager_password_verify_ca(self):
 
         client_manager = clientmanager.ClientManager(
-            auth_options=FakeOptions(os_auth_url=fakes.AUTH_URL,
-                                     os_username=fakes.USERNAME,
-                                     os_password=fakes.PASSWORD,
-                                     os_project_name=fakes.PROJECT_NAME,
-                                     os_auth_type='v2password'),
+            cli_options=FakeOptions(
+                os_auth_url=fakes.AUTH_URL,
+                os_username=fakes.USERNAME,
+                os_password=fakes.PASSWORD,
+                os_project_name=fakes.PROJECT_NAME,
+                os_auth_type='v2password',
+            ),
             api_version=API_VERSION,
             verify='cafile',
         )
+        client_manager.setup_auth()
 
         self.assertFalse(client_manager._insecure)
         self.assertTrue(client_manager._verify)
@@ -199,10 +212,12 @@ class TestClientManager(utils.TestCase):
         auth_params['os_auth_type'] = auth_plugin_name
         auth_params['os_identity_api_version'] = api_version
         client_manager = clientmanager.ClientManager(
-            auth_options=FakeOptions(**auth_params),
+            cli_options=FakeOptions(**auth_params),
             api_version=API_VERSION,
             verify=True
         )
+        client_manager.setup_auth()
+
         self.assertEqual(
             auth_plugin_name,
             client_manager.auth_plugin_name,
@@ -228,8 +243,12 @@ class TestClientManager(utils.TestCase):
         self._select_auth_plugin(params, 'XXX', 'password')
 
     def test_client_manager_select_auth_plugin_failure(self):
-        self.assertRaises(exc.CommandError,
-                          clientmanager.ClientManager,
-                          auth_options=FakeOptions(os_auth_plugin=''),
-                          api_version=API_VERSION,
-                          verify=True)
+        client_manager = clientmanager.ClientManager(
+            cli_options=FakeOptions(os_auth_plugin=''),
+            api_version=API_VERSION,
+            verify=True,
+        )
+        self.assertRaises(
+            exc.CommandError,
+            client_manager.setup_auth,
+        )
-- 
cgit v1.2.1