ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-24 15:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes console restoration when loading a VirtualBox project.

Browse Source
This commit is contained in:
Jeremy 2015-03-02 17:28:28 -07:00
parent f269ec9527
commit a6869379c3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/handlers/api/virtualbox_handler.py
View File

@ -67,8 +67,12 @@ class VirtualBoxHandler:
request.json.get("vm_id"), request.json.get("vm_id"),
request.json.pop("vmname"), request.json.pop("vmname"),
request.json.pop("linked_clone"), request.json.pop("linked_clone"),
console=request.json.get("console", None),
adapters=request.json.get("adapters", 0)) adapters=request.json.get("adapters", 0))
if "enable_remote_console" in request.json:
yield from vm.set_enable_remote_console(request.json.pop("enable_remote_console"))
for name, value in request.json.items(): for name, value in request.json.items():
if hasattr(vm, name) and getattr(vm, name) != value: if hasattr(vm, name) and getattr(vm, name) != value:
setattr(vm, name, value) setattr(vm, name, value)
@ -117,6 +121,9 @@ class VirtualBoxHandler:
vbox_manager = VirtualBox.instance() vbox_manager = VirtualBox.instance()
vm = vbox_manager.get_vm(request.match_info["vm_id"], project_id=request.match_info["project_id"]) vm = vbox_manager.get_vm(request.match_info["vm_id"], project_id=request.match_info["project_id"])
if "enable_remote_console" in request.json:
yield from vm.set_enable_remote_console(request.json.pop("enable_remote_console"))
for name, value in request.json.items(): for name, value in request.json.items():
if hasattr(vm, name) and getattr(vm, name) != value: if hasattr(vm, name) and getattr(vm, name) != value:
setattr(vm, name, value) setattr(vm, name, value)

12
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -49,9 +49,9 @@ class VirtualBoxVM(BaseVM):
VirtualBox VM implementation. VirtualBox VM implementation.
""" """
def __init__(self, name, vm_id, project, manager, vmname, linked_clone, adapters=0): def __init__(self, name, vm_id, project, manager, vmname, linked_clone, console=None, adapters=0):
super().__init__(name, vm_id, project, manager) super().__init__(name, vm_id, project, manager, console=console)
self._maximum_adapters = 8 self._maximum_adapters = 8
self._linked_clone = linked_clone self._linked_clone = linked_clone
@ -389,8 +389,8 @@ class VirtualBoxVM(BaseVM):
return self._enable_remote_console return self._enable_remote_console
@enable_remote_console.setter @asyncio.coroutine
def enable_remote_console(self, enable_remote_console): def set_enable_remote_console(self, enable_remote_console):
""" """
Sets either the console is enabled or not Sets either the console is enabled or not
@ -399,7 +399,9 @@ class VirtualBoxVM(BaseVM):
if enable_remote_console: if enable_remote_console:
log.info("VirtualBox VM '{name}' [{id}] has enabled the console".format(name=self.name, id=self.id)) log.info("VirtualBox VM '{name}' [{id}] has enabled the console".format(name=self.name, id=self.id))
self._start_remote_console() vm_state = yield from self._get_vm_state()
if vm_state == "running":
self._start_remote_console()
else: else:
log.info("VirtualBox VM '{name}' [{id}] has disabled the console".format(name=self.name, id=self.id)) log.info("VirtualBox VM '{name}' [{id}] has disabled the console".format(name=self.name, id=self.id))
self._stop_remote_console() self._stop_remote_console()