Merge "Improve error for token issue command without auth"

This commit is contained in:
Jenkins 2016-03-21 21:20:48 +00:00 committed by Gerrit Code Review
commit a48de855d0

View File

@ -18,6 +18,7 @@
import six import six
from openstackclient.common import command from openstackclient.common import command
from openstackclient.common import exceptions
from openstackclient.common import utils from openstackclient.common import utils
from openstackclient.identity import common from openstackclient.identity import common
@ -172,6 +173,9 @@ class IssueToken(command.ShowOne):
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
if not self.app.client_manager.auth_ref:
raise exceptions.AuthorizationFailure(
"Only an authorized user may issue a new token.")
token = self.app.client_manager.auth_ref.service_catalog.get_token() token = self.app.client_manager.auth_ref.service_catalog.get_token()
if 'tenant_id' in token: if 'tenant_id' in token:
token['project_id'] = token.pop('tenant_id') token['project_id'] = token.pop('tenant_id')