Commit 2fc3ff12 by Guba Sándor

Merge branch 'feature-extra-buttons'

parents 479b2ce0 ecd67ff5
...@@ -64,7 +64,8 @@ class ActivityModel(TimeStampedModel): ...@@ -64,7 +64,8 @@ class ActivityModel(TimeStampedModel):
if not self.finished: if not self.finished:
self.finished = timezone.now() self.finished = timezone.now()
self.succeeded = succeeded self.succeeded = succeeded
self.result = result if result is not None:
self.result = result
if event_handler is not None: if event_handler is not None:
event_handler(self) event_handler(self)
self.save() self.save()
......
...@@ -150,7 +150,7 @@ class Disk(AclBase, TimeStampedModel): ...@@ -150,7 +150,7 @@ class Disk(AclBase, TimeStampedModel):
return { return {
'source': self.path, 'source': self.path,
'driver_type': self.format, 'driver_type': self.format,
'driver_cache': 'default', 'driver_cache': 'none',
'target_device': self.device_type + self.dev_num, 'target_device': self.device_type + self.dev_num,
'disk_device': 'cdrom' if self.type == 'iso' else 'disk' 'disk_device': 'cdrom' if self.type == 'iso' else 'disk'
} }
......
...@@ -607,9 +607,10 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel): ...@@ -607,9 +607,10 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
queue_name = self.get_remote_queue_name('vm') queue_name = self.get_remote_queue_name('vm')
# Deploy VM on remote machine # Deploy VM on remote machine
with act.sub_activity('deploying_vm'): with act.sub_activity('deploying_vm') as deploy_act:
vm_tasks.deploy.apply_async(args=[self.get_vm_desc()], deploy_act.result = vm_tasks.deploy.apply_async(
queue=queue_name).get(timeout=timeout) args=[self.get_vm_desc()],
queue=queue_name).get(timeout=timeout)
# Estabilish network connection (vmdriver) # Estabilish network connection (vmdriver)
with act.sub_activity('deploying_net'): with act.sub_activity('deploying_net'):
...@@ -671,7 +672,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel): ...@@ -671,7 +672,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
return local_tasks.deploy.apply_async(args=[self, user], return local_tasks.deploy.apply_async(args=[self, user],
queue="localhost.man") queue="localhost.man")
def __destroy_vm(self, act, timeout): def __destroy_vm(self, act, timeout=15):
"""Destroy the virtual machine and its associated networks. """Destroy the virtual machine and its associated networks.
:param self: The virtual machine. :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