From c0a8822f3f7e4a125ff9deef4754f3bfd23eb0a3 Mon Sep 17 00:00:00 2001 From: Sushil Kumar Date: Mon, 19 Oct 2015 22:42:19 +0000 Subject: [PATCH] Fixes the backup-delete backup-delete does not works with backup-name Change-Id: I7a24d9c67c730a6acb8246b37bfcd4bd97482705 Closes-Bug: #1507802 --- troveclient/v1/backups.py | 6 +++--- troveclient/v1/shell.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/troveclient/v1/backups.py b/troveclient/v1/backups.py index eba5d8a9..d76a3f27 100644 --- a/troveclient/v1/backups.py +++ b/troveclient/v1/backups.py @@ -69,11 +69,11 @@ class Backups(base.ManagerWithFind): body['backup']['parent_id'] = parent_id return self._create("/backups", body, "backup") - def delete(self, backup_id): + def delete(self, backup): """Delete the specified backup. - :param backup_id: The backup id to delete + :param backup: The backup to delete """ - url = "/backups/%s" % backup_id + url = "/backups/%s" % base.getid(backup) resp, body = self.api.client.delete(url) common.check_for_exceptions(resp, body, url) diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py index 7d0c7b09..f8243892 100644 --- a/troveclient/v1/shell.py +++ b/troveclient/v1/shell.py @@ -753,11 +753,12 @@ def do_backup_list(cs, args): order_by='updated') -@utils.arg('backup', metavar='', help='ID of the backup.') +@utils.arg('backup', metavar='', help='ID or name of the backup.') @utils.service_type('database') def do_backup_delete(cs, args): """Deletes a backup.""" - cs.backups.delete(args.backup) + backup = _find_backup(cs, args.backup) + cs.backups.delete(backup) @utils.arg('instance', metavar='',