Merge "Error handling for delete commands in identity"

8 files changed, 161 insertions, 45 deletions

diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 8526d6bd..ca565d4d 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -20,6 +20,7 @@ import logging
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.cli import parseractions
 from osc_lib.command import command
+from osc_lib import exceptions
 from osc_lib import utils
 import six
 
@@ -117,12 +118,25 @@ class DeleteProject(command.Command):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
+        errors = 0
         for project in parsed_args.projects:
-            project_obj = utils.find_resource(
-                identity_client.tenants,
-                project,
-            )
-            identity_client.tenants.delete(project_obj.id)
+            try:
+                project_obj = utils.find_resource(
+                    identity_client.tenants,
+                    project,
+                )
+                identity_client.tenants.delete(project_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete project with "
+                          "name or ID '%(project)s': %(e)s"),
+                          {'project': project, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.projects)
+            msg = (_("%(errors)s of %(total)s projects failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListProject(command.Lister):
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 0a28a70a..e254e05f 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -124,12 +124,25 @@ class DeleteRole(command.Command):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
+        errors = 0
         for role in parsed_args.roles:
-            role_obj = utils.find_resource(
-                identity_client.roles,
-                role,
-            )
-            identity_client.roles.delete(role_obj.id)
+            try:
+                role_obj = utils.find_resource(
+                    identity_client.roles,
+                    role,
+                )
+                identity_client.roles.delete(role_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete role with "
+                          "name or ID '%(role)s': %(e)s"),
+                          {'role': role, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.roles)
+            msg = (_("%(errors)s of %(total)s roles failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListRole(command.Lister):
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):
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index df684c12..a03a86eb 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -20,6 +20,7 @@ import sys
 
 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
 
@@ -194,11 +195,24 @@ class DeleteGroup(command.Command):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
+        errors = 0
         for group in parsed_args.groups:
-            group_obj = common.find_group(identity_client,
-                                          group,
-                                          parsed_args.domain)
-            identity_client.groups.delete(group_obj.id)
+            try:
+                group_obj = common.find_group(identity_client,
+                                              group,
+                                              parsed_args.domain)
+                identity_client.groups.delete(group_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete group with "
+                          "name or ID '%(group)s': %(e)s"),
+                          {'group': group, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.groups)
+            msg = (_("%(errors)s of %(total)s groups failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListGroup(command.Lister):
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index a6348659..12197cdd 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -20,6 +20,7 @@ import logging
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.cli import parseractions
 from osc_lib.command import command
+from osc_lib import exceptions
 from osc_lib import utils
 import six
 
@@ -148,15 +149,28 @@ class DeleteProject(command.Command):
         domain = None
         if parsed_args.domain:
             domain = common.find_domain(identity_client, parsed_args.domain)
+        errors = 0
         for project in parsed_args.projects:
-            if domain is not None:
-                project_obj = utils.find_resource(identity_client.projects,
-                                                  project,
-                                                  domain_id=domain.id)
-            else:
-                project_obj = utils.find_resource(identity_client.projects,
-                                                  project)
-            identity_client.projects.delete(project_obj.id)
+            try:
+                if domain is not None:
+                    project_obj = utils.find_resource(identity_client.projects,
+                                                      project,
+                                                      domain_id=domain.id)
+                else:
+                    project_obj = utils.find_resource(identity_client.projects,
+                                                      project)
+                identity_client.projects.delete(project_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete project with "
+                          "name or ID '%(project)s': %(e)s"),
+                          {'project': project, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.projects)
+            msg = (_("%(errors)s of %(total)s projects failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListProject(command.Lister):
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index c9d0fbf3..994ecc9c 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -20,6 +20,7 @@ import sys
 
 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
 
@@ -223,14 +224,26 @@ class DeleteRole(command.Command):
         if parsed_args.domain:
             domain_id = common.find_domain(identity_client,
                                            parsed_args.domain).id
-
+        errors = 0
         for role in parsed_args.roles:
-            role_obj = utils.find_resource(
-                identity_client.roles,
-                role,
-                domain_id=domain_id
-            )
-            identity_client.roles.delete(role_obj.id)
+            try:
+                role_obj = utils.find_resource(
+                    identity_client.roles,
+                    role,
+                    domain_id=domain_id
+                )
+                identity_client.roles.delete(role_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete role with "
+                          "name or ID '%(role)s': %(e)s"),
+                          {'role': role, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.roles)
+            msg = (_("%(errors)s of %(total)s roles failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListRole(command.Lister):
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py
index 62d72ea1..04ee4dce 100644
--- a/openstackclient/identity/v3/trust.py
+++ b/openstackclient/identity/v3/trust.py
@@ -14,8 +14,10 @@
 """Identity v3 Trust action implementations"""
 
 import datetime
+import logging
 
 from osc_lib.command import command
+from osc_lib import exceptions
 from osc_lib import utils
 import six
 
@@ -23,6 +25,9 @@ from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
+LOG = logging.getLogger(__name__)
+
+
 class CreateTrust(command.ShowOne):
     _description = _("Create new trust")
 
@@ -145,9 +150,24 @@ class DeleteTrust(command.Command):
 
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
-        for t in parsed_args.trust:
-            trust_obj = utils.find_resource(identity_client.trusts, t)
-            identity_client.trusts.delete(trust_obj.id)
+
+        errors = 0
+        for trust in parsed_args.trust:
+            try:
+                trust_obj = utils.find_resource(identity_client.trusts,
+                                                trust)
+                identity_client.trusts.delete(trust_obj.id)
+            except Exception as e:
+                errors += 1
+                LOG.error(_("Failed to delete trust with "
+                          "name or ID '%(trust)s': %(e)s"),
+                          {'trust': trust, 'e': e})
+
+        if errors > 0:
+            total = len(parsed_args.trust)
+            msg = (_("%(errors)s of %(total)s trusts failed "
+                   "to delete.") % {'errors': errors, 'total': total})
+            raise exceptions.CommandError(msg)
 
 
 class ListTrust(command.Lister):
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):