Skip to content

Commit 4c71809

Browse files
committed
Bulk backup delete
Change-Id: I100f8a302aeb498e3c0cebd8d36ef5fa437d444d
1 parent 8271ba8 commit 4c71809

3 files changed

Lines changed: 53 additions & 20 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
features:
3+
- Support deleting backups in batch.

troveclient/osc/v1/database_backups.py

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
from osc_lib.command import command
1616
from osc_lib import exceptions
1717
from osc_lib import utils as osc_utils
18+
from oslo_utils import uuidutils
1819

1920
from troveclient.i18n import _
21+
from troveclient.osc.v1 import base
22+
from troveclient import utils as trove_utils
2023

2124

2225
def set_attributes_for_print_detail(backup):
@@ -169,29 +172,42 @@ def take_action(self, parsed_args):
169172
return zip(*sorted(backup.items()))
170173

171174

172-
class DeleteDatabaseBackup(command.Command):
175+
class DeleteDatabaseBackup(base.TroveDeleter):
173176

174177
_description = _("Deletes a backup.")
175178

176179
def get_parser(self, prog_name):
177180
parser = super(DeleteDatabaseBackup, self).get_parser(prog_name)
178181
parser.add_argument(
179182
'backup',
180-
metavar='<backup>',
181-
help=_('ID or name of the backup.')
183+
nargs='+',
184+
metavar='backup',
185+
help='Id or name of backup(s).'
182186
)
183187
return parser
184188

185189
def take_action(self, parsed_args):
186-
database_backups = self.app.client_manager.database.backups
187-
try:
188-
backup = osc_utils.find_resource(database_backups,
189-
parsed_args.backup)
190-
database_backups.delete(backup)
191-
except Exception as e:
192-
msg = (_("Failed to delete backup %(backup)s: %(e)s")
193-
% {'backup': parsed_args.backup, 'e': e})
194-
raise exceptions.CommandError(msg)
190+
db_backups = self.app.client_manager.database.backups
191+
192+
# Used for batch deletion
193+
self.delete_func = db_backups.delete
194+
self.resource = 'database backup'
195+
196+
ids = []
197+
for backup_id in parsed_args.backup:
198+
if not uuidutils.is_uuid_like(backup_id):
199+
try:
200+
backup_id = trove_utils.get_resource_id_by_name(
201+
db_backups, backup_id
202+
)
203+
except Exception as e:
204+
msg = ("Failed to get database backup %s, error: %s" %
205+
(backup_id, str(e)))
206+
raise exceptions.CommandError(msg)
207+
208+
ids.append(backup_id)
209+
210+
self.delete_resources(ids)
195211

196212

197213
class CreateDatabaseBackup(command.ShowOne):

troveclient/tests/osc/v1/test_database_backups.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from osc_lib import exceptions
1616
from osc_lib import utils
17+
from oslo_utils import uuidutils
1718

1819
from troveclient import common
1920
from troveclient.osc.v1 import database_backups
@@ -181,25 +182,38 @@ def setUp(self):
181182
super(TestDatabaseBackupDelete, self).setUp()
182183
self.cmd = database_backups.DeleteDatabaseBackup(self.app, None)
183184

184-
@mock.patch.object(utils, 'find_resource')
185-
def test_backup_delete(self, mock_find):
185+
@mock.patch("troveclient.utils.get_resource_id_by_name")
186+
def test_backup_delete(self, mock_getid):
186187
args = ['backup1']
187-
mock_find.return_value = args[0]
188+
mock_getid.return_value = args[0]
188189
parsed_args = self.check_parser(self.cmd, args, [])
189-
result = self.cmd.take_action(parsed_args)
190+
self.cmd.take_action(parsed_args)
190191
self.backup_client.delete.assert_called_with('backup1')
191-
self.assertIsNone(result)
192192

193-
@mock.patch.object(utils, 'find_resource')
194-
def test_backup_delete_with_exception(self, mock_find):
193+
@mock.patch("troveclient.utils.get_resource_id_by_name")
194+
def test_backup_delete_with_exception(self, mock_getid):
195195
args = ['fakebackup']
196196
parsed_args = self.check_parser(self.cmd, args, [])
197197

198-
mock_find.side_effect = exceptions.CommandError
198+
mock_getid.side_effect = exceptions.CommandError
199199
self.assertRaises(exceptions.CommandError,
200200
self.cmd.take_action,
201201
parsed_args)
202202

203+
@mock.patch("troveclient.utils.get_resource_id_by_name")
204+
def test_backup_bulk_delete(self, mock_getid):
205+
backup_1 = uuidutils.generate_uuid()
206+
backup_2 = uuidutils.generate_uuid()
207+
mock_getid.return_value = backup_1
208+
209+
args = ["fake_backup", backup_2]
210+
parsed_args = self.check_parser(self.cmd, args, [])
211+
self.cmd.take_action(parsed_args)
212+
213+
mock_getid.assert_called_once_with(self.backup_client, "fake_backup")
214+
calls = [mock.call(backup_1), mock.call(backup_2)]
215+
self.backup_client.delete.assert_has_calls(calls)
216+
203217

204218
class TestBackupCreate(TestBackups):
205219

0 commit comments

Comments
 (0)