From 0de67016c7daa1712b568cb2e49728fac3eb57ad Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 17 Oct 2014 22:26:57 -0500 Subject: Remove now-unnecessary client creation hacks Clients that can use ksc Session don't need the old junk to fake auth anymore: * compute * volume Clients that still need to be fed credentials can pick directly from the auth object in clientmanager. The _token attribute is removed, the token can be retrieved from the auth object: openstackclient/tests/common/test_clientmanager.py This change will break any plugin that relies on getting a token from instance._token. They should be updated to use the above, or preferable, to use keystoneclient.session.Session to create its HTTP interface object. Change-Id: I877a29de97a42f85f12a14c274fc003e6fba5135 --- openstackclient/tests/common/test_clientmanager.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'openstackclient/tests') diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index d0738c79..24adfa0e 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -89,10 +89,9 @@ class TestClientManager(utils.TestCase): fakes.AUTH_URL, client_manager._url, ) - self.assertEqual( fakes.AUTH_TOKEN, - client_manager._token, + client_manager.auth.get_token(None), ) self.assertIsInstance( client_manager.auth, @@ -111,10 +110,6 @@ class TestClientManager(utils.TestCase): verify=True ) - self.assertEqual( - fakes.AUTH_TOKEN, - client_manager._token, - ) self.assertEqual( fakes.AUTH_URL, client_manager._auth_url, @@ -160,10 +155,6 @@ class TestClientManager(utils.TestCase): AUTH_REF, client_manager.auth_ref, ) - self.assertEqual( - fakes.AUTH_TOKEN, - client_manager._token, - ) self.assertEqual( dir(SERVICE_CATALOG), dir(client_manager._service_catalog), -- cgit v1.2.1