diff options
| author | Qiu Yu <qiuyu@ebaysf.com> | 2014-01-15 17:03:59 +0800 |
|---|---|---|
| committer | Qiu Yu <qiuyu@ebaysf.com> | 2014-01-17 17:42:01 +0800 |
| commit | 4848d3ca3aff4d148fb1b0aa0aa54e1eb3f3600f (patch) | |
| tree | 3778c708721669439820b1fb4ffb7e6368f115f0 /openstackclient | |
| parent | a53ed797b7778e05e6dfc21305d632fe66618dbf (diff) | |
| download | python-openstackclient-4848d3ca3aff4d148fb1b0aa0aa54e1eb3f3600f.tar.gz | |
Add token create subcommand for identity v2 api
Implements token create subcommand which is an equivalent of keystone
token-get command. Original "wrap" parameter for keystone token-get is
not implemented yet due to cliff Bug #1269299
This is a part of: blueprint add-identity-token-support
Change-Id: I9e4de93306f2f5959717b5219621da03961524d8
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v2_0/token.py | 38 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v2_0/fakes.py | 11 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_token.py | 56 |
3 files changed, 105 insertions, 0 deletions
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py new file mode 100644 index 00000000..a0433c96 --- /dev/null +++ b/openstackclient/identity/v2_0/token.py @@ -0,0 +1,38 @@ +# Copyright 2014 eBay Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +"""Identity v2 Token action implementations""" + +import logging +import six + +from cliff import show + + +class CreateToken(show.ShowOne): + """Create token command""" + + log = logging.getLogger(__name__ + '.CreateToken') + + def get_parser(self, prog_name): + parser = super(CreateToken, self).get_parser(prog_name) + return parser + + def take_action(self, parsed_args): + self.log.debug('take_action(%s)' % parsed_args) + identity_client = self.app.client_manager.identity + token = identity_client.service_catalog.get_token() + token['project_id'] = token.pop('tenant_id') + return zip(*sorted(six.iteritems(token))) diff --git a/openstackclient/tests/identity/v2_0/fakes.py b/openstackclient/tests/identity/v2_0/fakes.py index 80febd29..231fa1a5 100644 --- a/openstackclient/tests/identity/v2_0/fakes.py +++ b/openstackclient/tests/identity/v2_0/fakes.py @@ -70,11 +70,22 @@ USER = { 'enabled': True, } +token_expires = '2014-01-01T00:00:00Z' +token_id = 'tttttttt-tttt-tttt-tttt-tttttttttttt' + +TOKEN = { + 'expires': token_expires, + 'id': token_id, + 'tenant_id': project_id, + 'user_id': user_id, +} + class FakeIdentityv2Client(object): def __init__(self, **kwargs): self.roles = mock.Mock() self.roles.resource_class = fakes.FakeResource(None, {}) + self.service_catalog = mock.Mock() self.services = mock.Mock() self.services.resource_class = fakes.FakeResource(None, {}) self.tenants = mock.Mock() diff --git a/openstackclient/tests/identity/v2_0/test_token.py b/openstackclient/tests/identity/v2_0/test_token.py new file mode 100644 index 00000000..a156cdc6 --- /dev/null +++ b/openstackclient/tests/identity/v2_0/test_token.py @@ -0,0 +1,56 @@ +# Copyright 2014 eBay Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +from openstackclient.identity.v2_0 import token +from openstackclient.tests.identity.v2_0 import fakes as identity_fakes + + +class TestToken(identity_fakes.TestIdentityv2): + + def setUp(self): + super(TestToken, self).setUp() + + # Get a shortcut to the Service Catalog Mock + self.sc_mock = self.app.client_manager.identity.service_catalog + self.sc_mock.reset_mock() + + +class TestTokenCreate(TestToken): + + def setUp(self): + super(TestTokenCreate, self).setUp() + + self.sc_mock.get_token.return_value = identity_fakes.TOKEN + self.cmd = token.CreateToken(self.app, None) + + def test_token_create(self): + arglist = [] + verifylist = [] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + columns, data = self.cmd.take_action(parsed_args) + + self.sc_mock.get_token.assert_called_with() + + collist = ('expires', 'id', 'project_id', 'user_id') + self.assertEqual(columns, collist) + datalist = ( + identity_fakes.token_expires, + identity_fakes.token_id, + identity_fakes.project_id, + identity_fakes.user_id, + ) + self.assertEqual(data, datalist) |
