Error handling for delete commands in identity

Add missing multi deletion error handling for
identity delete commands.
All delete commands in identity support
error handling now.

Change-Id: I05626dcb5e516a423d610906347b02236ba7eeaf

1 files changed, 19 insertions, 5 deletions

diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index ddd5b981..2a3dde6b 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -19,6 +19,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
 
@@ -145,12 +146,25 @@ class DeleteUser(command.Command):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
+        errors = 0
         for user in parsed_args.users:
-            user_obj = utils.find_resource(
-                identity_client.users,
-                user,
-            )
-            identity_client.users.delete(user_obj.id)
+            try:
+                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):