vm: move Instance.wake_up_vm to WakeUpVmOperation

circle/dashboard/tests/test_views.py

@@ -512,20 +512,20 @@ class VmDetailTest(LoginMixin, TestCase):
         self.login(c, "user2")
         self.login(c, "user2")
         with patch.object(Instance, 'select_node', return_value=None), \
         with patch.object(Instance, 'select_node', return_value=None), \
                 patch.object(WakeUpOperation, 'async') as new_wake_up, \
                 patch.object(WakeUpOperation, 'async') as new_wake_up, \
-                patch('vm.tasks.vm_tasks.wake_up.apply_async') as wuaa, \
                 patch.object(Instance.WrongStateError, 'send_message') as wro:
                 patch.object(Instance.WrongStateError, 'send_message') as wro:
             inst = Instance.objects.get(pk=1)
             inst = Instance.objects.get(pk=1)
             new_wake_up.side_effect = inst.wake_up
             new_wake_up.side_effect = inst.wake_up
+            inst._wake_up_vm = Mock()
             inst.get_remote_queue_name = Mock(return_value='test')
             inst.get_remote_queue_name = Mock(return_value='test')
             inst.status = 'SUSPENDED'
             inst.status = 'SUSPENDED'
             inst.set_level(self.u2, 'owner')
             inst.set_level(self.u2, 'owner')
             with patch('dashboard.views.messages') as msg:
             with patch('dashboard.views.messages') as msg:
                 response = c.post("/dashboard/vm/1/op/wake_up/")
                 response = c.post("/dashboard/vm/1/op/wake_up/")
                 assert not msg.error.called
                 assert not msg.error.called
+            assert inst._wake_up_vm.called
             self.assertEqual(response.status_code, 302)
             self.assertEqual(response.status_code, 302)
             self.assertEqual(inst.status, 'RUNNING')
             self.assertEqual(inst.status, 'RUNNING')
             assert new_wake_up.called
             assert new_wake_up.called
-            assert wuaa.called
             assert not wro.called
             assert not wro.called
 
 
     def test_unpermitted_wake_up(self):
     def test_unpermitted_wake_up(self):

circle/vm/models/instance.py

@@ -792,13 +792,6 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
                                           queue=queue_name
                                           queue=queue_name
                                           ).get(timeout=timeout)
                                           ).get(timeout=timeout)
 
 
-    def wake_up_vm(self, timeout=60):
-        queue_name = self.get_remote_queue_name('vm', 'slow')
-        return vm_tasks.wake_up.apply_async(args=[self.vm_name,
-                                                  self.mem_dump['path']],
-                                            queue=queue_name
-                                            ).get(timeout=timeout)
-
     def delete_mem_dump(self, timeout=15):
     def delete_mem_dump(self, timeout=15):
         queue_name = self.mem_dump['datastore'].get_remote_queue_name(
         queue_name = self.mem_dump['datastore'].get_remote_queue_name(
             'storage', 'fast')
             'storage', 'fast')

circle/vm/operations.py

@@ -771,16 +771,13 @@ class WakeUpOperation(InstanceOperation):
         else:
         else:
             activity.resultant_state = 'ERROR'
             activity.resultant_state = 'ERROR'
 
 
-    def _operation(self, activity, timeout=60):
+    def _operation(self, activity):
         # Schedule vm
         # Schedule vm
         self.instance.allocate_vnc_port()
         self.instance.allocate_vnc_port()
         self.instance.allocate_node()
         self.instance.allocate_node()
 
 
         # Resume vm
         # Resume vm
-        with activity.sub_activity(
-            'resuming', readable_name=ugettext_noop(
-                "resume virtual machine")):
-            self.instance.wake_up_vm(timeout=timeout)
+        self.instance._wake_up_vm(parent_activity=activity)
 
 
         # Estabilish network connection (vmdriver)
         # Estabilish network connection (vmdriver)
         with activity.sub_activity(
         with activity.sub_activity(
@@ -793,6 +790,19 @@ class WakeUpOperation(InstanceOperation):
         except:
         except:
             pass
             pass
 
 
+    @register_operation
+    class WakeUpVmOperation(SubOperationMixin, RemoteInstanceOperation):
+        id = "_wake_up_vm"
+        name = _("resume virtual machine")
+        task = vm_tasks.wake_up
+        remote_queue = ("vm", "slow")
+        timeout = 600
+
+        def _get_remote_args(self, **kwargs):
+            return (super(WakeUpOperation.WakeUpVmOperation, self)
+                    ._get_remote_args(**kwargs)
+                    + [self.instance.mem_dump['path']])
+
 
 
 @register_operation
 @register_operation
 class RenewOperation(InstanceOperation):
 class RenewOperation(InstanceOperation):