Commit 2fc3ff12 by Guba Sándor

Merge branch 'feature-extra-buttons'

parents 479b2ce0 ecd67ff5
......@@ -64,7 +64,8 @@ class ActivityModel(TimeStampedModel):
if not self.finished:
self.finished =
self.succeeded = succeeded
self.result = result
if result is not None:
self.result = result
if event_handler is not None:
......@@ -150,7 +150,7 @@ class Disk(AclBase, TimeStampedModel):
return {
'source': self.path,
'driver_type': self.format,
'driver_cache': 'default',
'driver_cache': 'none',
'target_device': self.device_type + self.dev_num,
'disk_device': 'cdrom' if self.type == 'iso' else 'disk'
......@@ -607,9 +607,10 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
queue_name = self.get_remote_queue_name('vm')
# Deploy VM on remote machine
with act.sub_activity('deploying_vm'):
with act.sub_activity('deploying_vm') as deploy_act:
deploy_act.result = vm_tasks.deploy.apply_async(
# Estabilish network connection (vmdriver)
with act.sub_activity('deploying_net'):
......@@ -671,7 +672,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
return local_tasks.deploy.apply_async(args=[self, user],
def __destroy_vm(self, act, timeout):
def __destroy_vm(self, act, timeout=15):
"""Destroy the virtual machine and its associated networks.
:param self: The virtual machine.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment