Merge branch 'feature-recover' into 'master'

Feature: Recover destroyed vm

circle/dashboard/views.py

@@ -716,6 +716,8 @@ vm_ops = OrderedDict([
         op='shutdown', icon='off', effect='warning')),
         op='shutdown', icon='off', effect='warning')),
     ('shut_off', VmOperationView.factory(
     ('shut_off', VmOperationView.factory(
         op='shut_off', icon='ban-circle', effect='warning')),
         op='shut_off', icon='ban-circle', effect='warning')),
+    ('recover', VmOperationView.factory(
+        op='recover', icon='medkit', effect='warning')),
     ('destroy', VmOperationView.factory(
     ('destroy', VmOperationView.factory(
         op='destroy', icon='remove', effect='danger')),
         op='destroy', icon='remove', effect='danger')),
     ('create_disk', VmCreateDiskView),
     ('create_disk', VmCreateDiskView),

circle/storage/models.py

@@ -380,11 +380,16 @@ class Disk(AclBase, TimeStampedModel):
         self.save()
         self.save()
         return True
         return True
 
 
-    def restore(self, user=None, task_uuid=None):
+    def restore(self, user=None, task_uuid=None, timeout=15):
         """Recover destroyed disk from trash if possible.
         """Recover destroyed disk from trash if possible.
         """
         """
-        # TODO
-        pass
+        queue_name = self.datastore.get_remote_queue_name(
+            'storage', priority='slow')
+        logger.info("Image: %s at Datastore: %s recovered from trash." %
+                    (self.filename, self.datastore.path))
+        storage_tasks.recover_from_trash.apply_async(
+            args=[self.datastore.path, self.filename],
+            queue=queue_name).get(timeout=timeout)
 
 
     def save_as(self, user=None, task_uuid=None, timeout=300):
     def save_as(self, user=None, task_uuid=None, timeout=300):
         """Save VM as template.
         """Save VM as template.

circle/storage/tasks/storage_tasks.py

@@ -72,6 +72,9 @@ def make_free_space(datastore, percent):
 def move_to_trash(datastore, disk_path):
 def move_to_trash(datastore, disk_path):
     pass
     pass
 
 
+@celery.task(name='storagedriver.recover_from_trash')
+def recover_from_trash(datastore, disk_path):
+    pass
 
 
 @celery.task(name='storagedriver.get_storage_stat')
 @celery.task(name='storagedriver.get_storage_stat')
 def get_storage_stat(path):
 def get_storage_stat(path):

circle/vm/models/instance.py

@@ -264,6 +264,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
             ('change_resources', _('Can change resources of a running VM.')),
             ('change_resources', _('Can change resources of a running VM.')),
             ('set_resources', _('Can change resources of a new VM.')),
             ('set_resources', _('Can change resources of a new VM.')),
             ('config_ports', _('Can configure port forwards.')),
             ('config_ports', _('Can configure port forwards.')),
+            ('recover', _('Can recover a destroyed VM.')),
         )
         )
         verbose_name = _('instance')
         verbose_name = _('instance')
         verbose_name_plural = _('instances')
         verbose_name_plural = _('instances')

circle/vm/operations.py

@@ -628,3 +628,30 @@ class ScreenshotOperation(InstanceOperation):
 
 
 
 
 register_operation(ScreenshotOperation)
 register_operation(ScreenshotOperation)
+
+
+class RecoverOperation(InstanceOperation):
+    activity_code_suffix = 'recover'
+    id = 'recover'
+    name = _("recover")
+    description = _("Recover virtual machine from destroyed state.")
+    acl_level = "owner"
+    required_perms = ('vm.recover', )
+
+    def check_precond(self):
+        if not self.instance.destroyed_at:
+            raise self.instance.WrongStateError(self.instance)
+
+    def on_commit(self, activity):
+        activity.resultant_state = 'PENDING'
+
+    def _operation(self):
+        for disk in self.instance.disks.all():
+            disk.destroyed = None
+            disk.restore()
+            disk.save()
+        self.instance.destroyed_at = None
+        self.instance.save()
+
+
+register_operation(RecoverOperation)