vm: use remote_timeout instead of timeout in RemoteOperations

1e224aeb · Bach Dániel · 42ffa3c1 · 1e224aeb
Commit 1e224aeb authored Oct 07, 2014 by Bach Dániel
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

circle/vm/operations.py
+4 -4

No files found.
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
@@ -470,7 +470,7 @@ class MigrateOperation(RemoteInstanceOperation):
    async_queue = "localhost.man.slow"
    task = vm_tasks.migrate
    remote_queue = ("vm", "slow")
-    timeout = 600
+    remote_timeout = 1000
    def _get_remote_args(self, to_node, **kwargs):
        return (super(MigrateOperation, self)._get_remote_args(**kwargs)
@@ -710,7 +710,7 @@ class ShutdownOperation(AbortableRemoteOperationMixin,
    resultant_state = 'STOPPED'
    task = vm_tasks.shutdown
    remote_queue = ("vm", "slow")
-    timeout = 120
+    remote_timeout = 120
    def _operation(self, task):
        super(ShutdownOperation, self)._operation(task=task)
@@ -793,7 +793,7 @@ class SleepOperation(InstanceOperation):
        name = _("suspend virtual machine")
        task = vm_tasks.sleep
        remote_queue = ("vm", "slow")
-        timeout = 600
+        remote_timeout = 1000
        def _get_remote_args(self, **kwargs):
            return (super(SleepOperation.SuspendVmOperation, self)
@@ -846,7 +846,7 @@ class WakeUpOperation(InstanceOperation):
        name = _("resume virtual machine")
        task = vm_tasks.wake_up
        remote_queue = ("vm", "slow")
-        timeout = 600
+        remote_timeout = 1000
        def _get_remote_args(self, **kwargs):
            return (super(WakeUpOperation.WakeUpVmOperation, self)