diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-28 18:34:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-28 18:34:57 +0000 |
| commit | a0e9beadc86c92d7872cc8665d080570a55abedc (patch) | |
| tree | 54ae5d2ffee77ce1308c17ee539dff4e1ab03997 | |
| parent | 21a0bbedb91f8a57b1a1dd848b862a28cd689e26 (diff) | |
| parent | c0a8822f3f7e4a125ff9deef4754f3bfd23eb0a3 (diff) | |
| download | python-troveclient-a0e9beadc86c92d7872cc8665d080570a55abedc.tar.gz | |
Merge "Fixes the backup-delete"
| -rw-r--r-- | troveclient/v1/backups.py | 6 | ||||
| -rw-r--r-- | 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 eba5d8a..d76a3f2 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 7d0c7b0..f824389 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='<backup>', help='ID of the backup.') +@utils.arg('backup', metavar='<backup>', 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='<instance>', |