summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-27 17:48:25 +0000
committerGerrit Code Review <review@openstack.org>2014-06-27 17:48:25 +0000
commit4bebd8ac123cc57470219abff3b3717dda4de57d (patch)
tree34071c11cb4dfc3c3835d75bb931ae596a51216e /openstackclient/identity/v3
parent86e0cf70cf5c4429fc527377b8ec4f18831173be (diff)
parent1fca946890be22f51463975c1bf6449b8680c23a (diff)
downloadpython-openstackclient-4bebd8ac123cc57470219abff3b3717dda4de57d.tar.gz
Merge "Rename token classes to match command"
Diffstat (limited to 'openstackclient/identity/v3')
-rw-r--r--openstackclient/identity/v3/token.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index cd73d03a..52ed439f 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -22,7 +22,7 @@ from cliff import show
class AuthorizeRequestToken(show.ShowOne):
- """Authorize request token command"""
+ """Authorize request token"""
log = logging.getLogger(__name__ + '.AuthorizeRequestToken')
@@ -59,7 +59,7 @@ class AuthorizeRequestToken(show.ShowOne):
class CreateAccessToken(show.ShowOne):
- """Create access token command"""
+ """Create access token"""
log = logging.getLogger(__name__ + '.CreateAccessToken')
@@ -110,7 +110,7 @@ class CreateAccessToken(show.ShowOne):
class CreateRequestToken(show.ShowOne):
- """Create request token command"""
+ """Create request token"""
log = logging.getLogger(__name__ + '.CreateRequestToken')
@@ -148,18 +148,19 @@ class CreateRequestToken(show.ShowOne):
return zip(*sorted(six.iteritems(info)))
-class CreateToken(show.ShowOne):
- """Issue token command"""
+class IssueToken(show.ShowOne):
+ """Issue new token"""
- log = logging.getLogger(__name__ + '.CreateToken')
+ log = logging.getLogger(__name__ + '.IssueToken')
def get_parser(self, prog_name):
- parser = super(CreateToken, self).get_parser(prog_name)
+ parser = super(IssueToken, 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')