openstack/python-openstackclient
Code Issues Proposed changes

Fix issue token for v3

Browse Source 
Currently the code is broken as it references a part of
keystoneclient that does not exist.

Change-Id: I7fbc754537fbb4acffb166b5854840acfaef1fb8
Closes-Bug: #1379871
This commit is contained in:
Steve Martinelli 2014-10-10 14:17:11 -04:00
parent 0c77a9fe8b
commit 1b3c7ec122
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functional/tests/test_identity.py
View File

@ -76,6 +76,7 @@ class IdentityV3Tests(test.TestCase):
DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name', 'links'] DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name', 'links']
GROUP_FIELDS = ['description', 'domain_id', 'id', 'name', 'links'] GROUP_FIELDS = ['description', 'domain_id', 'id', 'name', 'links']
TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id']
def _create_dummy_group(self): def _create_dummy_group(self):
name = uuid.uuid4().hex name = uuid.uuid4().hex
@ -139,3 +140,8 @@ class IdentityV3Tests(test.TestCase):
raw_output = self.openstack('domain show ' + name) raw_output = self.openstack('domain show ' + name)
items = self.parse_show(raw_output) items = self.parse_show(raw_output)
self.assert_show_fields(items, self.DOMAIN_FIELDS) self.assert_show_fields(items, self.DOMAIN_FIELDS)
def test_token_issue(self):
raw_output = self.openstack('token issue')
items = self.parse_show(raw_output)
self.assert_show_fields(items, self.TOKEN_FIELDS)

4
openstackclient/identity/v3/token.py
View File

@ -159,9 +159,9 @@ class IssueToken(show.ShowOne):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)', 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: if 'tenant_id' in token:
token['project_id'] = token.pop('tenant_id') token['project_id'] = token.pop('tenant_id')
return zip(*sorted(six.iteritems(token))) return zip(*sorted(six.iteritems(token)))

4
openstackclient/tests/identity/v3/fakes.py
View File

@ -292,7 +292,9 @@ class FakeIdentityv3Client(object):
self.roles.resource_class = fakes.FakeResource(None, {}) self.roles.resource_class = fakes.FakeResource(None, {})
self.services = mock.Mock() self.services = mock.Mock()
self.services.resource_class = fakes.FakeResource(None, {}) 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 = mock.Mock()
self.users.resource_class = fakes.FakeResource(None, {}) self.users.resource_class = fakes.FakeResource(None, {})
self.role_assignments = mock.Mock() self.role_assignments = mock.Mock()

3
openstackclient/tests/identity/v3/test_token.py
View File

@ -23,7 +23,8 @@ class TestToken(identity_fakes.TestIdentityv3):
super(TestToken, self).setUp() super(TestToken, self).setUp()
# Get a shortcut to the Service Catalog Mock # 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() self.sc_mock.reset_mock()