diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-12 07:11:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-12 07:11:20 +0000 |
| commit | c39867f9800f163134a3097b5315f3c048c08128 (patch) | |
| tree | a654f2bb4235acd97219e40b85189e3affd69242 /openstackclient | |
| parent | f0c57e17c9a4b5bbe2f072a4eacefce3bcf30d45 (diff) | |
| parent | 1b3c7ec122504a41dc35aaf3f0693c9e20015df8 (diff) | |
| download | python-openstackclient-c39867f9800f163134a3097b5315f3c048c08128.tar.gz | |
Merge "Fix issue token for v3"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/token.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v3/fakes.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v3/test_token.py | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py index 52ed439f..aca5c669 100644 --- a/openstackclient/identity/v3/token.py +++ b/openstackclient/identity/v3/token.py @@ -159,9 +159,9 @@ class IssueToken(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)', parsed_args) - identity_client = self.app.client_manager.identity + session = self.app.client_manager.identity.session - token = identity_client.service_catalog.get_token() + token = session.auth.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 b0df16f0..1ca1c55d 100644 --- a/openstackclient/tests/identity/v3/fakes.py +++ b/openstackclient/tests/identity/v3/fakes.py @@ -292,7 +292,9 @@ class FakeIdentityv3Client(object): self.roles.resource_class = fakes.FakeResource(None, {}) self.services = mock.Mock() self.services.resource_class = fakes.FakeResource(None, {}) - self.service_catalog = mock.Mock() + self.session = mock.Mock() + self.session.auth.auth_ref.service_catalog.resource_class = \ + fakes.FakeResource(None, {}) self.users = mock.Mock() self.users.resource_class = fakes.FakeResource(None, {}) self.role_assignments = mock.Mock() diff --git a/openstackclient/tests/identity/v3/test_token.py b/openstackclient/tests/identity/v3/test_token.py index 8888b931..dbe85555 100644 --- a/openstackclient/tests/identity/v3/test_token.py +++ b/openstackclient/tests/identity/v3/test_token.py @@ -23,7 +23,8 @@ class TestToken(identity_fakes.TestIdentityv3): super(TestToken, self).setUp() # Get a shortcut to the Service Catalog Mock - self.sc_mock = self.app.client_manager.identity.service_catalog + session = self.app.client_manager.identity.session + self.sc_mock = session.auth.auth_ref.service_catalog self.sc_mock.reset_mock() |