258c1102cc
Previously each command logs take_action parameters explicitly by using @utils.log_method decorator or log.debug(). Some commands have no logging. This commit calls a logger in the base class and drops all logging definition from individual commands. Closes-Bug: #1532294 Change-Id: I43cd0290a4353c68c075bade9571c940733da1be
385 lines
12 KiB
Python
385 lines
12 KiB
Python
# Copyright 2012-2013 OpenStack Foundation
|
|
#
|
|
# 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.0 User action implementations"""
|
|
|
|
import six
|
|
|
|
from keystoneauth1 import exceptions as ks_exc
|
|
|
|
from openstackclient.common import command
|
|
from openstackclient.common import utils
|
|
from openstackclient.i18n import _ # noqa
|
|
|
|
|
|
class CreateUser(command.ShowOne):
|
|
"""Create new user"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(CreateUser, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<name>',
|
|
help=_('New user name'),
|
|
)
|
|
parser.add_argument(
|
|
'--project',
|
|
metavar='<project>',
|
|
help=_('Default project (name or ID)'),
|
|
)
|
|
parser.add_argument(
|
|
'--password',
|
|
metavar='<password>',
|
|
help=_('Set user password'),
|
|
)
|
|
parser.add_argument(
|
|
'--password-prompt',
|
|
dest="password_prompt",
|
|
action="store_true",
|
|
help=_('Prompt interactively for password'),
|
|
)
|
|
parser.add_argument(
|
|
'--email',
|
|
metavar='<email-address>',
|
|
help=_('Set user email address'),
|
|
)
|
|
enable_group = parser.add_mutually_exclusive_group()
|
|
enable_group.add_argument(
|
|
'--enable',
|
|
action='store_true',
|
|
help=_('Enable user (default)'),
|
|
)
|
|
enable_group.add_argument(
|
|
'--disable',
|
|
action='store_true',
|
|
help=_('Disable user'),
|
|
)
|
|
parser.add_argument(
|
|
'--or-show',
|
|
action='store_true',
|
|
help=_('Return existing user'),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
identity_client = self.app.client_manager.identity
|
|
|
|
if parsed_args.project:
|
|
project_id = utils.find_resource(
|
|
identity_client.tenants,
|
|
parsed_args.project,
|
|
).id
|
|
else:
|
|
project_id = None
|
|
|
|
enabled = True
|
|
if parsed_args.disable:
|
|
enabled = False
|
|
if parsed_args.password_prompt:
|
|
parsed_args.password = utils.get_password(self.app.stdin)
|
|
|
|
try:
|
|
user = identity_client.users.create(
|
|
parsed_args.name,
|
|
parsed_args.password,
|
|
parsed_args.email,
|
|
tenant_id=project_id,
|
|
enabled=enabled,
|
|
)
|
|
except ks_exc.Conflict as e:
|
|
if parsed_args.or_show:
|
|
user = utils.find_resource(
|
|
identity_client.users,
|
|
parsed_args.name,
|
|
)
|
|
self.log.info('Returning existing user %s', user.name)
|
|
else:
|
|
raise e
|
|
|
|
# NOTE(dtroyer): The users.create() method wants 'tenant_id' but
|
|
# the returned resource has 'tenantId'. Sigh.
|
|
# We're using project_id now inside OSC so there.
|
|
if 'tenantId' in user._info:
|
|
user._info.update(
|
|
{'project_id': user._info.pop('tenantId')}
|
|
)
|
|
|
|
info = {}
|
|
info.update(user._info)
|
|
return zip(*sorted(six.iteritems(info)))
|
|
|
|
|
|
class DeleteUser(command.Command):
|
|
"""Delete user(s)"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(DeleteUser, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'users',
|
|
metavar='<user>',
|
|
nargs="+",
|
|
help=_('User(s) to delete (name or ID)'),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
identity_client = self.app.client_manager.identity
|
|
|
|
for user in parsed_args.users:
|
|
user_obj = utils.find_resource(
|
|
identity_client.users,
|
|
user,
|
|
)
|
|
identity_client.users.delete(user_obj.id)
|
|
return
|
|
|
|
|
|
class ListUser(command.Lister):
|
|
"""List users"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ListUser, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--project',
|
|
metavar='<project>',
|
|
help=_('Filter users by project (name or ID)'),
|
|
)
|
|
parser.add_argument(
|
|
'--long',
|
|
action='store_true',
|
|
default=False,
|
|
help=_('List additional fields in output'))
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
identity_client = self.app.client_manager.identity
|
|
|
|
def _format_project(project):
|
|
if not project:
|
|
return ""
|
|
if project in project_cache.keys():
|
|
return project_cache[project].name
|
|
else:
|
|
return project
|
|
|
|
project = None
|
|
if parsed_args.project:
|
|
project = utils.find_resource(
|
|
identity_client.tenants,
|
|
parsed_args.project,
|
|
)
|
|
project = project.id
|
|
|
|
if parsed_args.long:
|
|
columns = (
|
|
'ID',
|
|
'Name',
|
|
'tenantId',
|
|
'Email',
|
|
'Enabled',
|
|
)
|
|
column_headers = (
|
|
'ID',
|
|
'Name',
|
|
'Project',
|
|
'Email',
|
|
'Enabled',
|
|
)
|
|
# Cache the project list
|
|
project_cache = {}
|
|
try:
|
|
for p in identity_client.tenants.list():
|
|
project_cache[p.id] = p
|
|
except Exception:
|
|
# Just forget it if there's any trouble
|
|
pass
|
|
else:
|
|
columns = column_headers = ('ID', 'Name')
|
|
data = identity_client.users.list(tenant_id=project)
|
|
|
|
if parsed_args.project:
|
|
d = {}
|
|
for s in data:
|
|
d[s.id] = s
|
|
data = d.values()
|
|
|
|
if parsed_args.long:
|
|
# FIXME(dtroyer): Sometimes user objects have 'tenant_id' instead
|
|
# of 'tenantId'. Why? Dunno yet, but until that
|
|
# is fixed we need to handle it; auth_token.py
|
|
# only looks for 'tenantId'.
|
|
for d in data:
|
|
if 'tenant_id' in d._info:
|
|
d._info['tenantId'] = d._info.pop('tenant_id')
|
|
d._add_details(d._info)
|
|
|
|
return (column_headers,
|
|
(utils.get_item_properties(
|
|
s, columns,
|
|
mixed_case_fields=('tenantId',),
|
|
formatters={'tenantId': _format_project},
|
|
) for s in data))
|
|
|
|
|
|
class SetUser(command.Command):
|
|
"""Set user properties"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(SetUser, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'user',
|
|
metavar='<user>',
|
|
help=_('User to change (name or ID)'),
|
|
)
|
|
parser.add_argument(
|
|
'--name',
|
|
metavar='<name>',
|
|
help=_('Set user name'),
|
|
)
|
|
parser.add_argument(
|
|
'--project',
|
|
metavar='<project>',
|
|
help=_('Set default project (name or ID)'),
|
|
)
|
|
parser.add_argument(
|
|
'--password',
|
|
metavar='<user-password>',
|
|
help=_('Set user password'),
|
|
)
|
|
parser.add_argument(
|
|
'--password-prompt',
|
|
dest="password_prompt",
|
|
action="store_true",
|
|
help=_('Prompt interactively for password'),
|
|
)
|
|
parser.add_argument(
|
|
'--email',
|
|
metavar='<email-address>',
|
|
help=_('Set user email address'),
|
|
)
|
|
enable_group = parser.add_mutually_exclusive_group()
|
|
enable_group.add_argument(
|
|
'--enable',
|
|
action='store_true',
|
|
help=_('Enable user (default)'),
|
|
)
|
|
enable_group.add_argument(
|
|
'--disable',
|
|
action='store_true',
|
|
help=_('Disable user'),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
identity_client = self.app.client_manager.identity
|
|
|
|
if parsed_args.password_prompt:
|
|
parsed_args.password = utils.get_password(self.app.stdin)
|
|
|
|
if (not parsed_args.name
|
|
and not parsed_args.name
|
|
and not parsed_args.password
|
|
and not parsed_args.email
|
|
and not parsed_args.project
|
|
and not parsed_args.enable
|
|
and not parsed_args.disable):
|
|
return
|
|
|
|
user = utils.find_resource(
|
|
identity_client.users,
|
|
parsed_args.user,
|
|
)
|
|
|
|
if parsed_args.password:
|
|
identity_client.users.update_password(
|
|
user.id,
|
|
parsed_args.password,
|
|
)
|
|
|
|
if parsed_args.project:
|
|
project = utils.find_resource(
|
|
identity_client.tenants,
|
|
parsed_args.project,
|
|
)
|
|
identity_client.users.update_tenant(
|
|
user.id,
|
|
project.id,
|
|
)
|
|
|
|
kwargs = {}
|
|
if parsed_args.name:
|
|
kwargs['name'] = parsed_args.name
|
|
if parsed_args.email:
|
|
kwargs['email'] = parsed_args.email
|
|
kwargs['enabled'] = user.enabled
|
|
if parsed_args.enable:
|
|
kwargs['enabled'] = True
|
|
if parsed_args.disable:
|
|
kwargs['enabled'] = False
|
|
|
|
identity_client.users.update(user.id, **kwargs)
|
|
return
|
|
|
|
|
|
class ShowUser(command.ShowOne):
|
|
"""Display user details"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowUser, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'user',
|
|
metavar='<user>',
|
|
help=_('User to display (name or ID)'),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
identity_client = self.app.client_manager.identity
|
|
|
|
info = {}
|
|
try:
|
|
user = utils.find_resource(
|
|
identity_client.users,
|
|
parsed_args.user,
|
|
)
|
|
info.update(user._info)
|
|
except ks_exc.Forbidden as e:
|
|
auth_ref = self.app.client_manager.auth_ref
|
|
if (
|
|
parsed_args.user == auth_ref.user_id or
|
|
parsed_args.user == auth_ref.username
|
|
):
|
|
# Ask for currently auth'ed project so return it
|
|
info = {
|
|
'id': auth_ref.user_id,
|
|
'name': auth_ref.username,
|
|
'project_id': auth_ref.project_id,
|
|
# True because we don't get this far if it is disabled
|
|
'enabled': True,
|
|
}
|
|
else:
|
|
raise e
|
|
|
|
if 'tenantId' in info:
|
|
info.update(
|
|
{'project_id': info.pop('tenantId')}
|
|
)
|
|
if 'tenant_id' in info:
|
|
info.update(
|
|
{'project_id': info.pop('tenant_id')}
|
|
)
|
|
|
|
return zip(*sorted(six.iteritems(info)))
|