arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-11 01:28:09 +00:00
Code Issues Releases Wiki Activity

Handle "aborted" state for VirtualBox VMs. Fixes #1702

Browse Source
This commit is contained in:
grossmj 2020-01-23 18:00:33 +08:00
parent dcdaffa056
commit ab4b391a02
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/compute/virtualbox/virtualbox_vm.py
View File

@ -279,7 +279,7 @@ class VirtualBoxVM(BaseNode):
await self._set_network_options() await self._set_network_options()
await self._set_serial_console() await self._set_serial_console()
else: else:
raise VirtualBoxError("VirtualBox VM not powered off") raise VirtualBoxError("VirtualBox VM '{}' is not powered off (current state is '{}')".format(self.name, vm_state))
# check if there is enough RAM to run # check if there is enough RAM to run
self.check_available_ram(self.ram) self.check_available_ram(self.ram)
@ -320,7 +320,8 @@ class VirtualBoxVM(BaseNode):
await self._stop_ubridge() await self._stop_ubridge()
await self._stop_remote_console() await self._stop_remote_console()
vm_state = await self._get_vm_state() vm_state = await self._get_vm_state()
if vm_state in ("running", "paused", "stuck"): log.info("Stopping VirtualBox VM '{name}' [{id}] (current state is {vm_state})".format(name=self.name, id=self.id, vm_state=vm_state))
if vm_state in ("running", "paused"):
if self.on_close == "save_vm_state": if self.on_close == "save_vm_state":
# add a guest property to know the VM has been saved # add a guest property to know the VM has been saved
@ -348,7 +349,10 @@ class VirtualBoxVM(BaseNode):
result = await self._control_vm("poweroff") result = await self._control_vm("poweroff")
self.status = "stopped" self.status = "stopped"
log.debug("Stop result: {}".format(result)) log.debug("Stop result: {}".format(result))
elif vm_state == "aborted":
self.status = "stopped"
if self.status == "stopped":
log.info("VirtualBox VM '{name}' [{id}] stopped".format(name=self.name, id=self.id)) log.info("VirtualBox VM '{name}' [{id}] stopped".format(name=self.name, id=self.id))
await asyncio.sleep(0.5) # give some time for VirtualBox to unlock the VM await asyncio.sleep(0.5) # give some time for VirtualBox to unlock the VM
if self.on_close != "save_vm_state": if self.on_close != "save_vm_state":