vm: use operations

circle/vm/models/__init__.py

@@ -16,11 +16,12 @@ from .instance import pre_state_changed
 from .network import InterfaceTemplate
 from .network import InterfaceTemplate
 from .network import Interface
 from .network import Interface
 from .node import Node
 from .node import Node
+from .operation import Operation
 
 
 __all__ = [
 __all__ = [
     'InstanceActivity', 'InstanceActiveManager', 'BaseResourceConfigModel',
     'InstanceActivity', 'InstanceActiveManager', 'BaseResourceConfigModel',
     'NamedBaseResourceConfig', 'VirtualMachineDescModel', 'InstanceTemplate',
     'NamedBaseResourceConfig', 'VirtualMachineDescModel', 'InstanceTemplate',
     'Instance', 'instance_activity', 'post_state_changed', 'pre_state_changed',
     'Instance', 'instance_activity', 'post_state_changed', 'pre_state_changed',
     'InterfaceTemplate', 'Interface', 'Trait', 'Node', 'NodeActivity', 'Lease',
     'InterfaceTemplate', 'Interface', 'Trait', 'Node', 'NodeActivity', 'Lease',
-    'node_activity',
+    'node_activity', 'Operation',
 ]
 ]

circle/vm/tasks/local_tasks.py

@@ -13,66 +13,3 @@ def async_operation(operation_id, instance_pk, activity_pk, **kwargs):
     activity.save()
     activity.save()
 
 
     return operation._exec_op(activity=activity, **kwargs)
     return operation._exec_op(activity=activity, **kwargs)
-
-# TODO: Keep synchronised with Instance funcs
-
-
-@celery.task
-def deploy(instance, user):
-    instance.deploy(task_uuid=deploy.request.id, user=user)
-
-
-@celery.task
-def redeploy(instance, user):
-    instance.redeploy(task_uuid=redeploy.request.id, user=user)
-
-
-@celery.task
-def shut_off(instance, user):
-    instance.shut_off(task_uuid=shut_off.request.id, user=user)
-
-
-@celery.task
-def destroy(instance, user):
-    instance.destroy(task_uuid=destroy.request.id, user=user)
-
-
-@celery.task
-def save_as_template(instance, name, user, params):
-    instance.save_as_template(name, task_uuid=save_as_template.request.id,
-                              user=user, **params)
-
-
-@celery.task
-def sleep(instance, user):
-    instance.sleep(task_uuid=sleep.request.id, user=user)
-
-
-@celery.task
-def wake_up(instance, user):
-    instance.wake_up(task_uuid=wake_up.request.id, user=user)
-
-
-@celery.task
-def shutdown(instance, user):
-    instance.shutdown(task_uuid=shutdown.request.id, user=user)
-
-
-@celery.task
-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):
-    node.flush(task_uuid=flush.request.id, user=user)