Merge "Error handling for delete commands in identity"

8 files changed, 231 insertions, 0 deletions

diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py
index c1f00762..4e1077db 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_project.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_project.py
@@ -13,8 +13,11 @@
 #   under the License.
 #
 
+import mock
+
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v2_0 import project
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
@@ -302,6 +305,32 @@ class TestProjectDelete(TestProject):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_projects_with_exception(self, find_mock):
+        find_mock.side_effect = [self.fake_project,
+                                 exceptions.CommandError]
+        arglist = [
+            self.fake_project.id,
+            'unexist_project',
+        ]
+        verifylist = [
+            ('projects', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 projects failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.projects_mock, self.fake_project.id)
+        find_mock.assert_any_call(self.projects_mock, 'unexist_project')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.projects_mock.delete.assert_called_once_with(self.fake_project.id)
+
 
 class TestProjectList(TestProject):
 
diff --git a/openstackclient/tests/unit/identity/v2_0/test_role.py b/openstackclient/tests/unit/identity/v2_0/test_role.py
index 68ebf141..684ce803 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_role.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_role.py
@@ -17,6 +17,7 @@ import mock
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v2_0 import role
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
@@ -240,6 +241,32 @@ class TestRoleDelete(TestRole):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_roles_with_exception(self, find_mock):
+        find_mock.side_effect = [self.fake_role,
+                                 exceptions.CommandError]
+        arglist = [
+            self.fake_role.id,
+            'unexist_role',
+        ]
+        verifylist = [
+            ('roles', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 roles failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.roles_mock, self.fake_role.id)
+        find_mock.assert_any_call(self.roles_mock, 'unexist_role')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.roles_mock.delete.assert_called_once_with(self.fake_role.id)
+
 
 class TestRoleList(TestRole):
 
diff --git a/openstackclient/tests/unit/identity/v2_0/test_user.py b/openstackclient/tests/unit/identity/v2_0/test_user.py
index 765f8559..a8b9497e 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_user.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_user.py
@@ -17,6 +17,7 @@ import mock
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v2_0 import user
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
@@ -411,6 +412,32 @@ class TestUserDelete(TestUser):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_users_with_exception(self, find_mock):
+        find_mock.side_effect = [self.fake_user,
+                                 exceptions.CommandError]
+        arglist = [
+            self.fake_user.id,
+            'unexist_user',
+        ]
+        verifylist = [
+            ('users', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 users failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.users_mock, self.fake_user.id)
+        find_mock.assert_any_call(self.users_mock, 'unexist_user')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.users_mock.delete.assert_called_once_with(self.fake_user.id)
+
 
 class TestUserList(TestUser):
 
diff --git a/openstackclient/tests/unit/identity/v3/test_group.py b/openstackclient/tests/unit/identity/v3/test_group.py
index eb50adb5..8558de95 100644
--- a/openstackclient/tests/unit/identity/v3/test_group.py
+++ b/openstackclient/tests/unit/identity/v3/test_group.py
@@ -16,6 +16,7 @@ from mock import call
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v3 import group
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
@@ -257,6 +258,32 @@ class TestGroupDelete(TestGroup):
         self.groups_mock.delete.assert_called_once_with(self.groups[0].id)
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_groups_with_exception(self, find_mock):
+        find_mock.side_effect = [self.groups[0],
+                                 exceptions.CommandError]
+        arglist = [
+            self.groups[0].id,
+            'unexist_group',
+        ]
+        verifylist = [
+            ('groups', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 groups failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.groups_mock, self.groups[0].id)
+        find_mock.assert_any_call(self.groups_mock, 'unexist_group')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.groups_mock.delete.assert_called_once_with(self.groups[0].id)
+
 
 class TestGroupList(TestGroup):
 
diff --git a/openstackclient/tests/unit/identity/v3/test_project.py b/openstackclient/tests/unit/identity/v3/test_project.py
index 702d9209..2b898090 100644
--- a/openstackclient/tests/unit/identity/v3/test_project.py
+++ b/openstackclient/tests/unit/identity/v3/test_project.py
@@ -16,6 +16,7 @@
 import mock
 
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v3 import project
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
@@ -445,6 +446,32 @@ class TestProjectDelete(TestProject):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_projects_with_exception(self, find_mock):
+        find_mock.side_effect = [self.project,
+                                 exceptions.CommandError]
+        arglist = [
+            self.project.id,
+            'unexist_project',
+        ]
+        verifylist = [
+            ('projects', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 projects failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.projects_mock, self.project.id)
+        find_mock.assert_any_call(self.projects_mock, 'unexist_project')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.projects_mock.delete.assert_called_once_with(self.project.id)
+
 
 class TestProjectList(TestProject):
 
diff --git a/openstackclient/tests/unit/identity/v3/test_role.py b/openstackclient/tests/unit/identity/v3/test_role.py
index 448e18d3..c0b68bdf 100644
--- a/openstackclient/tests/unit/identity/v3/test_role.py
+++ b/openstackclient/tests/unit/identity/v3/test_role.py
@@ -14,6 +14,10 @@
 #
 
 import copy
+import mock
+
+from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v3 import role
 from openstackclient.tests.unit import fakes
@@ -428,6 +432,36 @@ class TestRoleDelete(TestRole):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_roles_with_exception(self, find_mock):
+        find_mock.side_effect = [self.roles_mock.get.return_value,
+                                 exceptions.CommandError]
+        arglist = [
+            identity_fakes.role_name,
+            'unexist_role',
+        ]
+        verifylist = [
+            ('roles', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 roles failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.roles_mock,
+                                  identity_fakes.role_name,
+                                  domain_id=None)
+        find_mock.assert_any_call(self.roles_mock,
+                                  'unexist_role',
+                                  domain_id=None)
+
+        self.assertEqual(2, find_mock.call_count)
+        self.roles_mock.delete.assert_called_once_with(identity_fakes.role_id)
+
 
 class TestRoleList(TestRole):
 
diff --git a/openstackclient/tests/unit/identity/v3/test_trust.py b/openstackclient/tests/unit/identity/v3/test_trust.py
index 4eeb8bfe..93e8f63d 100644
--- a/openstackclient/tests/unit/identity/v3/test_trust.py
+++ b/openstackclient/tests/unit/identity/v3/test_trust.py
@@ -12,6 +12,10 @@
 #
 
 import copy
+import mock
+
+from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.identity.v3 import trust
 from openstackclient.tests.unit import fakes
@@ -148,6 +152,33 @@ class TestTrustDelete(TestTrust):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_trusts_with_exception(self, find_mock):
+        find_mock.side_effect = [self.trusts_mock.get.return_value,
+                                 exceptions.CommandError]
+        arglist = [
+            identity_fakes.trust_id,
+            'unexist_trust',
+        ]
+        verifylist = [
+            ('trust', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 trusts failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.trusts_mock, identity_fakes.trust_id)
+        find_mock.assert_any_call(self.trusts_mock, 'unexist_trust')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.trusts_mock.delete.assert_called_once_with(
+            identity_fakes.trust_id)
+
 
 class TestTrustList(TestTrust):
 
diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py
index 6150a5f3..3c1f49a6 100644
--- a/openstackclient/tests/unit/identity/v3/test_user.py
+++ b/openstackclient/tests/unit/identity/v3/test_user.py
@@ -16,6 +16,9 @@
 import contextlib
 import mock
 
+from osc_lib import exceptions
+from osc_lib import utils
+
 from openstackclient.identity.v3 import user
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
@@ -465,6 +468,32 @@ class TestUserDelete(TestUser):
         )
         self.assertIsNone(result)
 
+    @mock.patch.object(utils, 'find_resource')
+    def test_delete_multi_users_with_exception(self, find_mock):
+        find_mock.side_effect = [self.user,
+                                 exceptions.CommandError]
+        arglist = [
+            self.user.id,
+            'unexist_user',
+        ]
+        verifylist = [
+            ('users', arglist),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 users failed to delete.',
+                             str(e))
+
+        find_mock.assert_any_call(self.users_mock, self.user.id)
+        find_mock.assert_any_call(self.users_mock, 'unexist_user')
+
+        self.assertEqual(2, find_mock.call_count)
+        self.users_mock.delete.assert_called_once_with(self.user.id)
+
 
 class TestUserList(TestUser):