Dudás Ádám · @siliconbrain · Őry Máté · Őry Máté · Őry Máté · Őry Máté
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
  
            self.instance = instance
  
+    def __getattr__(self, name):
+        if name in self._ops:
+            return self._ops[name](self)
+        else:
+            raise AttributeError("%s object has no attribute '%s'" %
--- a/circle/vm/models/operation.py
+++ b/circle/vm/models/operation.py
+        self.instance = instance
+
+    def __call__(self, **kwargs):
+        """Execute the operation synchronously.
+        """
+        activity = self.__prelude(kwargs)
+        return self._exec_op(activity=activity, **kwargs)
+
+    def __unicode__(self):
+        return self.name
+
+    def __prelude(self, kwargs):
+        """This method contains the shared prelude of __call__ and async.
+        """
+        user = kwargs.setdefault('user', None)
+        self.check_auth(user)  # TODO what's check_auth's specification?
--- a/circle/vm/models/operation.py
+++ b/circle/vm/models/operation.py
+
+from common.models import activity_context
+from storage.models import Disk
+from ..tasks import vm_tasks
+from ..tasks.local_tasks import async_operation
+from .activity import InstanceActivity
+from .instance import Instance, InstanceTemplate
+
+
+logger = getLogger(__name__)
+
+
+class Operation:
+    """Base class for VM operations.
+    """
+    acl_level = 'owner'
--- a/circle/vm/models/operation.py
+++ b/circle/vm/models/operation.py
+        self.check_precond()
+        return self.create_activity(user=user)
+
+    def _exec_op(self, activity, user=None, **kwargs):
+        """Execute the operation inside the specified activity's context.
+        """
+        with activity_context(activity, on_abort=self.on_abort,
+                              on_commit=self.on_commit):
+            return self._operation(activity, user, **kwargs)
+
+    def _operation(self, activity, user=None, **kwargs):
+        """This method is the operation's particular implementation.
+
+        Deriving classes should implement this method.
+        """
+        pass
--- a/circle/vm/models/operation.py
+++ b/circle/vm/models/operation.py
+        """
+        with activity_context(activity, on_abort=self.on_abort,
+                              on_commit=self.on_commit):
+            return self._operation(activity, user, **kwargs)
+
+    def _operation(self, activity, user=None, **kwargs):
+        """This method is the operation's particular implementation.
+
+        Deriving classes should implement this method.
+        """
+        pass
+
+    def async(self, **kwargs):
+        """Execute the operation asynchronously.
+
+        Only a quick, preliminary check is ran before queuing the job.
--- a/circle/vm/tasks/local_tasks.py
+++ b/circle/vm/tasks/local_tasks.py
-def reset(instance, user):
-    instance.reset(task_uuid=reset.request.id, user=user)
-
-
-@celery.task
-def reboot(instance, user):
-    instance.reboot(task_uuid=reboot.request.id, user=user)
-
-
-@celery.task
-def migrate(instance, to_node,  user):
-    instance.migrate(to_node, task_uuid=migrate.request.id, user=user)
-
-
-@celery.task
-def flush(node, user):
--- a/circle/vm/__init__.py
+++ b/circle/vm/__init__.py
+from . import operations  # noqa
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
-            tmpl.full_clean()  # Avoiding database errors.
-            tmpl.save()
-            try:
-                with act.sub_activity('saving_disks'):
-                    tmpl.disks.add(*[__try_save_disk(disk)
-                                   for disk in self.disks.all()])
-                # create interface templates
-                for i in self.interface_set.all():
-                    i.save_as_template(tmpl)
-            except:
-                tmpl.delete()
-                raise
-            else:
-                return tmpl
-
    def shutdown_and_save_as_template(self, name, user=None, task_uuid=None,
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
+class RebootOperation(InstanceOperation):
+    activity_code_suffix = 'reboot'
+    id = 'reboot'
+    name = _("reboot")
+    description = _("""Reboot virtual machine with Ctrl+Alt+Del signal.""")
+
+    def _operation(self, activity, user, system, timeout=5):
+        queue_name = self.instance.get_remote_queue_name('vm')
+        vm_tasks.reboot.apply_async(args=[self.instance.vm_name],
+                                    queue=queue_name).get(timeout=timeout)
+
+
+register_instance_operation(RebootOperation)
+
+
+class RedeployOperation(InstanceOperation):