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
This commit is contained in:
Qiu Yu 2014-01-15 17:03:59 +08:00
parent a53ed797b7
commit 4848d3ca3a
4 changed files with 107 additions and 0 deletions

View File

@ -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)))

View File

@ -70,11 +70,22 @@ USER = {
'enabled': True, '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): class FakeIdentityv2Client(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.roles = mock.Mock() self.roles = mock.Mock()
self.roles.resource_class = fakes.FakeResource(None, {}) self.roles.resource_class = fakes.FakeResource(None, {})
self.service_catalog = mock.Mock()
self.services = mock.Mock() self.services = mock.Mock()
self.services.resource_class = fakes.FakeResource(None, {}) self.services.resource_class = fakes.FakeResource(None, {})
self.tenants = mock.Mock() self.tenants = mock.Mock()

View File

@ -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)

View File

@ -151,6 +151,8 @@ openstack.identity.v2_0 =
service_list =openstackclient.identity.v2_0.service:ListService service_list =openstackclient.identity.v2_0.service:ListService
service_show =openstackclient.identity.v2_0.service:ShowService service_show =openstackclient.identity.v2_0.service:ShowService
token_create =openstackclient.identity.v2_0.token:CreateToken
user_role_list = openstackclient.identity.v2_0.role:ListUserRole user_role_list = openstackclient.identity.v2_0.role:ListUserRole
user_create = openstackclient.identity.v2_0.user:CreateUser user_create = openstackclient.identity.v2_0.user:CreateUser