From a8d828f330119502fc18107c264f2944548a7fb9 Mon Sep 17 00:00:00 2001
From: Qiu Yu <qiuyu@ebaysf.com>
Date: Wed, 29 Jan 2014 15:57:18 +0800
Subject: [PATCH] Add token create subcommand for identity v3 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: I2255021c9d1f10f757686583b1ebe40b5f3a9ecb
---
openstackclient/identity/v3/token.py | 18 +++++
openstackclient/tests/identity/v3/fakes.py | 18 +++++
.../tests/identity/v3/test_token.py | 79 +++++++++++++++++++
setup.cfg | 2 +
4 files changed, 117 insertions(+)
create mode 100644 openstackclient/tests/identity/v3/test_token.py
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index ba667be3b3..68f9ffef47 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -185,6 +185,24 @@ class CreateRequestToken(show.ShowOne):
return zip(*sorted(six.iteritems(request_token)))
+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()
+ if 'tenant_id' in token:
+ token['project_id'] = token.pop('tenant_id')
+ return zip(*sorted(six.iteritems(token)))
+
+
class DeleteAccessToken(command.Command):
"""Delete access token command"""
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 9d40d9dbec..f2696ef8c7 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -88,6 +88,23 @@ USER = {
'domain_id': domain_id,
}
+token_expires = '2014-01-01T00:00:00Z'
+token_id = 'tttttttt-tttt-tttt-tttt-tttttttttttt'
+
+TOKEN_WITH_TENANT_ID = {
+ 'expires': token_expires,
+ 'id': token_id,
+ 'tenant_id': project_id,
+ 'user_id': user_id,
+}
+
+TOKEN_WITH_DOMAIN_ID = {
+ 'expires': token_expires,
+ 'id': token_id,
+ 'domain_id': domain_id,
+ 'user_id': user_id,
+}
+
class FakeIdentityv3Client(object):
def __init__(self, **kwargs):
@@ -101,6 +118,7 @@ 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.users = mock.Mock()
self.users.resource_class = fakes.FakeResource(None, {})
self.auth_token = kwargs['token']
diff --git a/openstackclient/tests/identity/v3/test_token.py b/openstackclient/tests/identity/v3/test_token.py
new file mode 100644
index 0000000000..7e1d1669b9
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_token.py
@@ -0,0 +1,79 @@
+# 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.v3 import token
+from openstackclient.tests.identity.v3 import fakes as identity_fakes
+
+
+class TestToken(identity_fakes.TestIdentityv3):
+
+ 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.cmd = token.CreateToken(self.app, None)
+
+ def test_token_create_with_project_id(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+ self.sc_mock.get_token.return_value = \
+ identity_fakes.TOKEN_WITH_TENANT_ID
+
+ # 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)
+
+ def test_token_create_with_domain_id(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+ self.sc_mock.get_token.return_value = \
+ identity_fakes.TOKEN_WITH_DOMAIN_ID
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.sc_mock.get_token.assert_called_with()
+
+ collist = ('domain_id', 'expires', 'id', 'user_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.token_expires,
+ identity_fakes.token_id,
+ identity_fakes.user_id,
+ )
+ self.assertEqual(data, datalist)
diff --git a/setup.cfg b/setup.cfg
index 434b7f70a3..a2c34e145a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -229,6 +229,8 @@ openstack.identity.v3 =
service_show = openstackclient.identity.v3.service:ShowService
service_set = openstackclient.identity.v3.service:SetService
+ token_create = openstackclient.identity.v3.token:CreateToken
+
user_create = openstackclient.identity.v3.user:CreateUser
user_delete = openstackclient.identity.v3.user:DeleteUser
user_list = openstackclient.identity.v3.user:ListUser