Commit af0882f5 by Bach Dániel

Merge branch 'feature-improved-recovery' into 'master'

Feature improved recovery

See merge request !254
parents 4392ed39 fb838841
...@@ -1181,13 +1181,27 @@ class RecoverOperation(InstanceOperation): ...@@ -1181,13 +1181,27 @@ class RecoverOperation(InstanceOperation):
except Instance.InstanceDestroyedError: except Instance.InstanceDestroyedError:
pass pass
def _operation(self): def _operation(self, user, activity):
for disk in self.instance.disks.all(): with activity.sub_activity(
disk.destroyed = None 'recover_instance',
disk.restore() readable_name=ugettext_noop("recover instance")):
disk.save() self.instance.destroyed_at = None
self.instance.destroyed_at = None for disk in self.instance.disks.all():
self.instance.save() disk.destroyed = None
disk.restore()
disk.save()
self.instance.status = 'PENDING'
self.instance.save()
try:
self.instance.renew(parent_activity=activity)
except:
pass
if self.instance.template:
for net in self.instance.template.interface_set.all():
self.instance.add_interface(
parent_activity=activity, user=user, vlan=net.vlan)
@register_operation @register_operation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment