openstack
/
freezer
Code Issues Proposed changes

Merge "Restore cindernative-vol-id by increment"

This commit is contained in:
Jenkins 2016-06-02 15:12:57 +00:00 committed by Gerrit Code Review
parent 87b4ab66b8 137520ea2d
commit f8010d416b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
freezer/openstack/restore.py
View File

@ -83,11 +83,15 @@ class RestoreOs:
'status': 'available',
}
backups = cinder.backups.list(search_opts=search_opts)
backups = [x for x in backups if x.created_at >= restore_from_timestamp]
if not backups:
logging.error("no available backups for cinder volume")
backups_filter = [x for x in backups if (utils.date_to_timestamp(x.created_at.split('.')[0])
>= restore_from_timestamp)]
if not backups_filter:
logging.warning("no available backups for cinder volume,"
"restore newest backup")
backup = max(backups, key=lambda x: x.created_at)
cinder.restores.restore(backup_id=backup.id)
else:
backup = min(backups, key=lambda x: x.created_at)
backup = min(backups_filter, key=lambda x: x.created_at)
cinder.restores.restore(backup_id=backup.id)
def restore_cinder_by_glance(self, volume_id, restore_from_timestamp):

2
freezer/tests/commons.py
View File

@ -116,7 +116,7 @@ class FakeIdObject:
self.status = "available"
self.size = 10
self.min_disk = 10
self.created_at = 1234
self.created_at = '2016-05-12T02:00:22.000000'
class FakeCinderClient: