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

Rename "enable console" to "remote console".

Browse Source
This commit is contained in:
grossmj 2014-11-06 13:56:19 -07:00
parent a98a8b1acc
commit e07347a961
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/virtualbox/schemas.py
View File

@ -102,8 +102,8 @@ VBOX_UPDATE_SCHEMA = {
"maximum": 65535, "maximum": 65535,
"type": "integer" "type": "integer"
}, },
"enable_console": { "enable_remote_console": {
"description": "enable the console", "description": "enable the remote console",
"type": "boolean" "type": "boolean"
}, },
"headless": { "headless": {

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

@ -103,7 +103,7 @@ class VirtualBoxVM(object):
self._console = console self._console = console
self._ethernet_adapters = [] self._ethernet_adapters = []
self._headless = False self._headless = False
self._enable_console = True self._enable_remote_console = True
self._vmname = vmname self._vmname = vmname
self._adapter_start_index = 0 self._adapter_start_index = 0
self._adapter_type = "Intel PRO/1000 MT Desktop (82540EM)" self._adapter_type = "Intel PRO/1000 MT Desktop (82540EM)"
@ -158,7 +158,7 @@ class VirtualBoxVM(object):
"adapter_start_index": self._adapter_start_index, "adapter_start_index": self._adapter_start_index,
"adapter_type": "Intel PRO/1000 MT Desktop (82540EM)", "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
"console": self._console, "console": self._console,
"enable_console": self._enable_console, "enable_remote_console": self._enable_remote_console,
"headless": self._headless} "headless": self._headless}
return vbox_defaults return vbox_defaults
@ -328,28 +328,28 @@ class VirtualBoxVM(object):
self._headless = headless self._headless = headless
@property @property
def enable_console(self): def enable_remote_console(self):
""" """
Returns either the console is enabled or not Returns either the remote console is enabled or not
:returns: boolean :returns: boolean
""" """
return self._enable_console return self._enable_remote_console
@enable_console.setter @enable_remote_console.setter
def enable_console(self, enable_console): def enable_remote_console(self, enable_remote_console):
""" """
Sets either the console is enabled or not Sets either the console is enabled or not
:param enable_console: boolean :param enable_remote_console: boolean
""" """
if enable_console: if enable_remote_console:
log.info("VirtualBox VM {name} [id={id}] has enabled the console".format(name=self._name, id=self._id)) log.info("VirtualBox VM {name} [id={id}] has enabled the console".format(name=self._name, id=self._id))
else: else:
log.info("VirtualBox VM {name} [id={id}] has disabled the console".format(name=self._name, id=self._id)) log.info("VirtualBox VM {name} [id={id}] has disabled the console".format(name=self._name, id=self._id))
self._enable_console = enable_console self._enable_remote_console = enable_remote_console
@property @property
def vmname(self): def vmname(self):
@ -674,7 +674,7 @@ class VirtualBoxVM(object):
result = self._execute("startvm", args) result = self._execute("startvm", args)
log.debug("started VirtualBox VM: {}".format(result)) log.debug("started VirtualBox VM: {}".format(result))
if self._enable_console: if self._enable_remote_console:
# starts the Telnet to pipe thread # starts the Telnet to pipe thread
pipe_name = self._get_pipe_name() pipe_name = self._get_pipe_name()
if sys.platform.startswith('win'): if sys.platform.startswith('win'):