Merge "Add '--force' option to 'backup delete' command in volumev2"

2 files changed, 24 insertions, 2 deletions

diff --git a/openstackclient/tests/volume/v2/test_backup.py b/openstackclient/tests/volume/v2/test_backup.py
index b1e6594c..ce26a2d6 100644
--- a/openstackclient/tests/volume/v2/test_backup.py
+++ b/openstackclient/tests/volume/v2/test_backup.py
@@ -156,7 +156,23 @@ class TestBackupDelete(TestBackup):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.backups_mock.delete.assert_called_with(self.backup.id)
+        self.backups_mock.delete.assert_called_with(self.backup.id, False)
+        self.assertIsNone(result)
+
+    def test_backup_delete_with_force(self):
+        arglist = [
+            '--force',
+            self.backup.id,
+        ]
+        verifylist = [
+            ('force', True),
+            ("backups", [self.backup.id])
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.backups_mock.delete.assert_called_with(self.backup.id, True)
         self.assertIsNone(result)
 
 
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index a8da4080..fed5f09e 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -92,6 +92,12 @@ class DeleteBackup(command.Command):
             nargs="+",
             help=_("Backup(s) to delete (name or ID)")
         )
+        parser.add_argument(
+            '--force',
+            action='store_true',
+            default=False,
+            help=_("Allow delete in state other than error or available")
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -99,7 +105,7 @@ class DeleteBackup(command.Command):
         for backup in parsed_args.backups:
             backup_id = utils.find_resource(
                 volume_client.backups, backup).id
-            volume_client.backups.delete(backup_id)
+            volume_client.backups.delete(backup_id, parsed_args.force)
 
 
 class ListBackup(command.Lister):