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

Feature improved recovery

See merge request !254

circle/vm/operations.py

@@ -1181,14 +1181,28 @@ class RecoverOperation(InstanceOperation):
         except Instance.InstanceDestroyedError:
             pass
 
-    def _operation(self):
+    def _operation(self, user, activity):
+        with activity.sub_activity(
+            'recover_instance',
+                readable_name=ugettext_noop("recover instance")):
+            self.instance.destroyed_at = None
             for disk in self.instance.disks.all():
                 disk.destroyed = None
                 disk.restore()
                 disk.save()
-        self.instance.destroyed_at = None
+            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
 class ResourcesOperation(InstanceOperation):