Merge "Add "--force" option to "volume qos delete" command"

4 files changed, 49 insertions, 5 deletions

diff --git a/openstackclient/tests/volume/v1/test_qos_specs.py b/openstackclient/tests/volume/v1/test_qos_specs.py
index 392017c6..4e1733fd 100644
--- a/openstackclient/tests/volume/v1/test_qos_specs.py
+++ b/openstackclient/tests/volume/v1/test_qos_specs.py
@@ -211,7 +211,7 @@ class TestQosDelete(TestQos):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.qos_mock.delete.assert_called_with(volume_fakes.qos_id)
+        self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, False)
         self.assertIsNone(result)
 
     def test_qos_delete_with_name(self):
@@ -225,7 +225,23 @@ class TestQosDelete(TestQos):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.qos_mock.delete.assert_called_with(volume_fakes.qos_id)
+        self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, False)
+        self.assertIsNone(result)
+
+    def test_qos_delete_with_force(self):
+        arglist = [
+            '--force',
+            volume_fakes.qos_id
+        ]
+        verifylist = [
+            ('force', True),
+            ('qos_specs', [volume_fakes.qos_id])
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, True)
         self.assertIsNone(result)
 
 
diff --git a/openstackclient/tests/volume/v2/test_qos_specs.py b/openstackclient/tests/volume/v2/test_qos_specs.py
index 11047535..92ffca74 100644
--- a/openstackclient/tests/volume/v2/test_qos_specs.py
+++ b/openstackclient/tests/volume/v2/test_qos_specs.py
@@ -175,7 +175,23 @@ class TestQosDelete(TestQos):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.qos_mock.delete.assert_called_with(self.qos_spec.id)
+        self.qos_mock.delete.assert_called_with(self.qos_spec.id, False)
+        self.assertIsNone(result)
+
+    def test_qos_delete_with_force(self):
+        arglist = [
+            '--force',
+            self.qos_spec.id
+        ]
+        verifylist = [
+            ('force', True),
+            ('qos_specs', [self.qos_spec.id])
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.qos_mock.delete.assert_called_with(self.qos_spec.id, True)
         self.assertIsNone(result)
 
 
diff --git a/openstackclient/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py
index 56a96256..c5850871 100644
--- a/openstackclient/volume/v1/qos_specs.py
+++ b/openstackclient/volume/v1/qos_specs.py
@@ -103,13 +103,19 @@ class DeleteQos(command.Command):
             nargs="+",
             help=_('QoS specification(s) to delete (name or ID)'),
         )
+        parser.add_argument(
+            '--force',
+            action='store_true',
+            default=False,
+            help=_("Allow to delete in-use QoS specification(s)")
+        )
         return parser
 
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         for qos in parsed_args.qos_specs:
             qos_spec = utils.find_resource(volume_client.qos_specs, qos)
-            volume_client.qos_specs.delete(qos_spec.id)
+            volume_client.qos_specs.delete(qos_spec.id, parsed_args.force)
 
 
 class DisassociateQos(command.Command):
diff --git a/openstackclient/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py
index 7ec272b3..5ed1225b 100644
--- a/openstackclient/volume/v2/qos_specs.py
+++ b/openstackclient/volume/v2/qos_specs.py
@@ -103,13 +103,19 @@ class DeleteQos(command.Command):
             nargs="+",
             help=_('QoS specification(s) to delete (name or ID)'),
         )
+        parser.add_argument(
+            '--force',
+            action='store_true',
+            default=False,
+            help=_("Allow to delete in-use QoS specification(s)")
+        )
         return parser
 
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         for qos in parsed_args.qos_specs:
             qos_spec = utils.find_resource(volume_client.qos_specs, qos)
-            volume_client.qos_specs.delete(qos_spec.id)
+            volume_client.qos_specs.delete(qos_spec.id, parsed_args.force)
 
 
 class DisassociateQos(command.Command):