summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/user.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/identity/v3/user.py')
-rw-r--r--openstackclient/identity/v3/user.py30
1 files changed, 22 insertions, 8 deletions
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 796cf28c..19a4c298 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -20,6 +20,7 @@ import logging
from keystoneauth1 import exceptions as ks_exc
from osc_lib.command import command
+from osc_lib import exceptions
from osc_lib import utils
import six
@@ -161,15 +162,28 @@ class DeleteUser(command.Command):
domain = None
if parsed_args.domain:
domain = common.find_domain(identity_client, parsed_args.domain)
+ errors = 0
for user in parsed_args.users:
- if domain is not None:
- user_obj = utils.find_resource(identity_client.users,
- user,
- domain_id=domain.id)
- else:
- user_obj = utils.find_resource(identity_client.users,
- user)
- identity_client.users.delete(user_obj.id)
+ try:
+ if domain is not None:
+ user_obj = utils.find_resource(identity_client.users,
+ user,
+ domain_id=domain.id)
+ else:
+ user_obj = utils.find_resource(identity_client.users,
+ user)
+ identity_client.users.delete(user_obj.id)
+ except Exception as e:
+ errors += 1
+ LOG.error(_("Failed to delete user with "
+ "name or ID '%(user)s': %(e)s"),
+ {'user': user, 'e': e})
+
+ if errors > 0:
+ total = len(parsed_args.users)
+ msg = (_("%(errors)s of %(total)s users failed "
+ "to delete.") % {'errors': errors, 'total': total})
+ raise exceptions.CommandError(msg)
class ListUser(command.Lister):