Support bulk deletion for "flavor/aggregate delete"

Support bulk deletion and error handling for "aggregate delete"
and "flavor delete" commands.

Change-Id: I3f6105cbeeab1c9f8cd571c63ce0e7ac3d4252b3
Partially-Implements: blueprint multi-argument-compute
Partial-Bug: #1592906

1 files changed, 43 insertions, 15 deletions

diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 4365a540..d8d02e11 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -14,6 +14,8 @@
 #
 
 import copy
+import mock
+from mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils
@@ -204,47 +206,73 @@ class TestFlavorCreate(TestFlavor):
 
 class TestFlavorDelete(TestFlavor):
 
-    flavor = compute_fakes.FakeFlavor.create_one_flavor()
+    flavors = compute_fakes.FakeFlavor.create_flavors(count=2)
 
     def setUp(self):
         super(TestFlavorDelete, self).setUp()
 
-        self.flavors_mock.get.return_value = self.flavor
+        self.flavors_mock.get = (
+            compute_fakes.FakeFlavor.get_flavors(self.flavors))
         self.flavors_mock.delete.return_value = None
 
         self.cmd = flavor.DeleteFlavor(self.app, None)
 
     def test_flavor_delete(self):
         arglist = [
-            self.flavor.id
+            self.flavors[0].id
         ]
         verifylist = [
-            ('flavor', self.flavor.id),
+            ('flavor', [self.flavors[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
 
-        self.flavors_mock.delete.assert_called_with(self.flavor.id)
+        self.flavors_mock.delete.assert_called_with(self.flavors[0].id)
         self.assertIsNone(result)
 
-    def test_flavor_delete_with_unexist_flavor(self):
-        self.flavors_mock.get.side_effect = exceptions.NotFound(None)
-        self.flavors_mock.find.side_effect = exceptions.NotFound(None)
+    def test_delete_multiple_flavors(self):
+        arglist = []
+        for f in self.flavors:
+            arglist.append(f.id)
+        verifylist = [
+            ('flavor', arglist),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
 
+        calls = []
+        for f in self.flavors:
+            calls.append(call(f.id))
+        self.flavors_mock.delete.assert_has_calls(calls)
+        self.assertIsNone(result)
+
+    def test_multi_flavors_delete_with_exception(self):
         arglist = [
-            'unexist_flavor'
+            self.flavors[0].id,
+            'unexist_flavor',
         ]
         verifylist = [
-            ('flavor', 'unexist_flavor'),
+            ('flavor', [self.flavors[0].id, 'unexist_flavor'])
         ]
-
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(
-            exceptions.CommandError,
-            self.cmd.take_action,
-            parsed_args)
+        find_mock_result = [self.flavors[0], exceptions.CommandError]
+        self.flavors_mock.get = (
+            mock.MagicMock(side_effect=find_mock_result)
+        )
+        self.flavors_mock.find.side_effect = exceptions.NotFound(None)
+
+        try:
+            self.cmd.take_action(parsed_args)
+            self.fail('CommandError should be raised.')
+        except exceptions.CommandError as e:
+            self.assertEqual('1 of 2 flavors failed to delete.', str(e))
+
+        self.flavors_mock.get.assert_any_call(self.flavors[0].id)
+        self.flavors_mock.get.assert_any_call('unexist_flavor')
+        self.flavors_mock.delete.assert_called_once_with(self.flavors[0].id)
 
 
 class TestFlavorList(TestFlavor):