summaryrefslogtreecommitdiff
path: root/openstackclient/volume
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-28 17:52:37 +0000
committerGerrit Code Review <review@openstack.org>2019-02-28 17:52:37 +0000
commit3599ebe9333e618028c5ae2946e42a10fdb3621f (patch)
tree9fcfc601b6c86b2b11b1ef461027755bdaf5e576 /openstackclient/volume
parent3d7772e34ad421f6ce1362641e79a8da0255e455 (diff)
parent24255ad0dde608a19d371a27c13714098097f185 (diff)
downloadpython-openstackclient-3599ebe9333e618028c5ae2946e42a10fdb3621f.tar.gz
Merge "Fix: Restore output 'VolumeBackupsRestore' object is not iterable"
Diffstat (limited to 'openstackclient/volume')
-rw-r--r--openstackclient/volume/v2/backup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index 60633a70..d4aec8d7 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -319,7 +319,9 @@ class RestoreVolumeBackup(command.ShowOne):
backup = utils.find_resource(volume_client.backups, parsed_args.backup)
destination_volume = utils.find_resource(volume_client.volumes,
parsed_args.volume)
- return volume_client.restores.restore(backup.id, destination_volume.id)
+ backup = volume_client.restores.restore(backup.id,
+ destination_volume.id)
+ return zip(*sorted(six.iteritems(backup._info)))
class RestoreBackup(RestoreVolumeBackup):