Option to allow console connections to any local IP address when using the local server.

This commit is contained in:
Jeremy committed 2014-11-09 23:01:13 -07:00
1 parent 1982ff8100
commit f44fbd1f16
12 files changed
+50 -35

No files matched your search

+3 -3
View File
@@ -71,6 +71,7 @@ class Qemu(IModule):
self._udp_start_port_range = qemu_config.get("udp_start_port_range", 40001)
self._udp_end_port_range = qemu_config.get("udp_end_port_range", 45500)
self._host = qemu_config.get("host", kwargs["host"])
self._console_host = qemu_config.get("console_host", kwargs["console_host"])
self._projects_dir = kwargs["projects_dir"]
self._tempdir = kwargs["temp_dir"]
self._working_dir = self._projects_dir
@@ -214,6 +215,7 @@ class Qemu(IModule):
self._host,
qemu_id,
console,
self._console_host,
self._console_start_port_range,
self._console_end_port_range)
@@ -614,7 +616,6 @@ class Qemu(IModule):
Gets QEMU binaries list.
Response parameters:
- Server address/host
- List of Qemu binaries
"""
@@ -642,8 +643,7 @@ class Qemu(IModule):
log.warn("Could not find QEMU version for {}: {}".format(path, e))
continue
response = {"server": self._host,
"qemus": qemus}
response = {"qemus": qemus}
self.send_response(response)
@IModule.route("qemu.echo")
+5 -2
View File
@@ -44,6 +44,7 @@ class QemuVM(object):
:param host: host/address to bind for console and UDP connections
:param qemu_id: QEMU VM instance ID
:param console: TCP console port
:param console_host: IP address to bind for console connections
:param console_start_port_range: TCP console port range start
:param console_end_port_range: TCP console port range end
"""
@@ -58,6 +59,7 @@ class QemuVM(object):
host="127.0.0.1",
qemu_id=None,
console=None,
console_host="0.0.0.0",
console_start_port_range=5001,
console_end_port_range=5500):
@@ -84,6 +86,7 @@ class QemuVM(object):
self._started = False
self._process = None
self._stdout_file = ""
self._console_host = console_host
self._console_start_port_range = console_start_port_range
self._console_end_port_range = console_end_port_range
@@ -113,7 +116,7 @@ class QemuVM(object):
try:
self._console = find_unused_port(self._console_start_port_range,
self._console_end_port_range,
self._host,
self._console_host,
ignore_ports=self._allocated_console_ports)
except Exception as e:
raise QemuError(e)
@@ -681,7 +684,7 @@ class QemuVM(object):
def _serial_options(self):
if self._console:
return ["-serial", "telnet:{}:{},server,nowait".format(self._host, self._console)]
return ["-serial", "telnet:{}:{},server,nowait".format(self._console_host, self._console)]
else:
return []