Őry Máté · @orymate · Guba Sándor · Guba Sándor · Bach Dániel · Guba Sándor
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
 )
-from .tasks import agent_tasks, local_agent_tasks
+from .tasks import agent_tasks, local_agent_tasks, vm_tasks
  
 from dashboard.store_api import Store, NoStoreException
+from storage.tasks import storage_tasks
  
 logger = getLogger(__name__)
  
  
+class RemoteOperationMixin(object):
+
+    remote_timeout = 30
+
+    def _operation(self, **kwargs):
+        args = self._get_remote_args(**kwargs),
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
        return False
  
  
+class RemoteInstanceOperation(RemoteOperationMixin, InstanceOperation):
+
+    remote_queue = ('vm', 'fast')
+    # activity_code_suffix = property(lambda self: self.id or self.task.name)
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
        except:
            pass
  
-        # Resume vm
-        with activity.sub_activity(
-            'booting', readable_name=ugettext_noop(
-                "boot virtual machine")):
-            self.instance.resume_vm(timeout=timeout)
+        self.instance._resume_vm(parent_activity=activity)
  
        if self.instance.has_agent:
            activity.sub_activity('os_boot', readable_name=ugettext_noop(
                "wait operating system loading"), interruptible=True)
  
+    @register_operation
+    class DeployVmOperation(SubOperationMixin, InstanceOperation):
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
-        # Resume vm
-        with activity.sub_activity(
-            'booting', readable_name=ugettext_noop(
-                "boot virtual machine")):
-            self.instance.resume_vm(timeout=timeout)
+        self.instance._resume_vm(parent_activity=activity)
  
        if self.instance.has_agent:
            activity.sub_activity('os_boot', readable_name=ugettext_noop(
                "wait operating system loading"), interruptible=True)
  
+    @register_operation
+    class DeployVmOperation(SubOperationMixin, InstanceOperation):
+        id = "_deploy_vm"
+        name = _("deploy vm")
+        description = _("Deploy all associated disks.")
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
    host_cls = Node
    online_required = True
    superuser_required = True
+    activity_code_suffix = property(lambda self: self.id)
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
+            args=args, queue=self._get_remote_queue()
+        ).get(timeout=self.remote_timeout)
+
+    def check_precond(self):
+        super(RemoteOperationMixin, self).check_precond()
+        self._get_remote_queue()
+
+
+class AbortableRemoteOperationMixin(object):
+    remote_step = property(lambda self: self.remote_timeout / 10)
+
+    def _operation(self, task, **kwargs):
+        args = self._get_remote_args(**kwargs),
+        remote = self.task.apply_async(
+            args=args, queue=self._get_remote_queue())
+        for i in xrange(int(self.remote_timeout / self.remote_step)):