summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-18 22:44:24 +0000
committerGerrit Code Review <review@openstack.org>2014-06-18 22:44:24 +0000
commit0a491b2ac82553d5bec10e782c582fca3a88c148 (patch)
tree9fffd8c361e137288ddc65cb258dc77c6037fb26
parent982b418da78e5d729ba0c4f3113bb691eb78b7c7 (diff)
parent25d6955bb477241af0926ca90969b9e0c1ec5647 (diff)
downloadpython-openstackclient-0a491b2ac82553d5bec10e782c582fca3a88c148.tar.gz
Merge "Change the token verb to issue/revoke"
-rw-r--r--openstackclient/identity/v2_0/token.py4
-rw-r--r--openstackclient/identity/v3/token.py2
-rw-r--r--setup.cfg6
3 files changed, 6 insertions, 6 deletions
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index 5cd41bb3..fe1557a5 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -23,7 +23,7 @@ from cliff import show
class CreateToken(show.ShowOne):
- """Create token command"""
+ """Issue token command"""
log = logging.getLogger(__name__ + '.CreateToken')
@@ -40,7 +40,7 @@ class CreateToken(show.ShowOne):
class DeleteToken(command.Command):
- """Delete token command"""
+ """Revoke token command"""
log = logging.getLogger(__name__ + '.DeleteToken')
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index b038e3fe..cd73d03a 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -149,7 +149,7 @@ class CreateRequestToken(show.ShowOne):
class CreateToken(show.ShowOne):
- """Create token command"""
+ """Issue token command"""
log = logging.getLogger(__name__ + '.CreateToken')
diff --git a/setup.cfg b/setup.cfg
index 60f48a43..571a41fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -152,8 +152,8 @@ openstack.identity.v2_0 =
service_list =openstackclient.identity.v2_0.service:ListService
service_show =openstackclient.identity.v2_0.service:ShowService
- token_create =openstackclient.identity.v2_0.token:CreateToken
- token_delete =openstackclient.identity.v2_0.token:DeleteToken
+ token_issue =openstackclient.identity.v2_0.token:CreateToken
+ token_revoke =openstackclient.identity.v2_0.token:DeleteToken
user_role_list = openstackclient.identity.v2_0.role:ListUserRole
@@ -235,7 +235,7 @@ openstack.identity.v3 =
service_show = openstackclient.identity.v3.service:ShowService
service_set = openstackclient.identity.v3.service:SetService
- token_create = openstackclient.identity.v3.token:CreateToken
+ token_issue = openstackclient.identity.v3.token:CreateToken
user_create = openstackclient.identity.v3.user:CreateUser
user_delete = openstackclient.identity.v3.user:DeleteUser