From cd368bb81690af5b4e99c0fd71b35fb00c9e0786 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 20 Oct 2014 12:47:39 -0500
Subject: [PATCH] Fix token issue after auth changeup
IssueToken.take_action() was missed in updating the structure of
the ClientManager.
Also, TOKEN_WITH_TENANT_ID in v3 is just wrong...
Closes-Bug: #1383396
Change-Id: If2dd82a26af1d743ee9df73e0c1aebce497bf22e
---
openstackclient/identity/v3/token.py | 4 +---
openstackclient/tests/identity/v3/fakes.py | 4 ++--
openstackclient/tests/identity/v3/test_token.py | 10 ++++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index aca5c66993..5b09b69f61 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -159,9 +159,7 @@ class IssueToken(show.ShowOne):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
- session = self.app.client_manager.identity.session
-
- token = session.auth.auth_ref.service_catalog.get_token()
+ token = self.app.client_manager.auth_ref.service_catalog.get_token()
if 'tenant_id' in token:
token['project_id'] = token.pop('tenant_id')
return zip(*sorted(six.iteritems(token)))
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 69c2590563..5844d160b9 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -176,10 +176,10 @@ USER = {
token_expires = '2014-01-01T00:00:00Z'
token_id = 'tttttttt-tttt-tttt-tttt-tttttttttttt'
-TOKEN_WITH_TENANT_ID = {
+TOKEN_WITH_PROJECT_ID = {
'expires': token_expires,
'id': token_id,
- 'tenant_id': project_id,
+ 'project_id': project_id,
'user_id': user_id,
}
diff --git a/openstackclient/tests/identity/v3/test_token.py b/openstackclient/tests/identity/v3/test_token.py
index dbe855555c..f43b6f5f24 100644
--- a/openstackclient/tests/identity/v3/test_token.py
+++ b/openstackclient/tests/identity/v3/test_token.py
@@ -13,6 +13,8 @@
# under the License.
#
+import mock
+
from openstackclient.identity.v3 import token
from openstackclient.tests.identity.v3 import fakes as identity_fakes
@@ -23,9 +25,9 @@ class TestToken(identity_fakes.TestIdentityv3):
super(TestToken, self).setUp()
# Get a shortcut to the Service Catalog Mock
- session = self.app.client_manager.identity.session
- self.sc_mock = session.auth.auth_ref.service_catalog
- self.sc_mock.reset_mock()
+ self.sc_mock = mock.Mock()
+ self.app.client_manager.auth_ref = mock.Mock()
+ self.app.client_manager.auth_ref.service_catalog = self.sc_mock
class TestTokenIssue(TestToken):
@@ -40,7 +42,7 @@ class TestTokenIssue(TestToken):
verifylist = []
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.sc_mock.get_token.return_value = \
- identity_fakes.TOKEN_WITH_TENANT_ID
+ identity_fakes.TOKEN_WITH_PROJECT_ID
# DisplayCommandBase.take_action() returns two tuples
columns, data = self.cmd.take_action(parsed_args)