Use module settings from the config file.

This commit is contained in:
Jeremy committed 2015-02-02 14:52:58 -07:00
1 parent 2c3fe2ad4b
commit 45ca493ecf
4 files changed
+8 -19

No files matched your search

+3
View File
@@ -44,9 +44,12 @@ class PortManager:
console_start_port_range = server_config.getint("console_start_port_range", 2000)
console_end_port_range = server_config.getint("console_end_port_range", 5000)
self._console_port_range = (console_start_port_range, console_end_port_range)
log.debug("Console port range is {}-{}".format(console_start_port_range, console_end_port_range))
udp_start_port_range = server_config.getint("udp_start_port_range", 10000)
udp_end_port_range = server_config.getint("udp_end_port_range", 20000)
self._udp_port_range = (udp_start_port_range, udp_end_port_range)
log.debug("UDP port range is {}-{}".format(udp_start_port_range, udp_end_port_range))
if remote_console_connections:
log.warning("Remote console connections are allowed")
+3 -13
View File
@@ -38,7 +38,6 @@ class VirtualBox(BaseManager):
super().__init__()
self._vboxmanage_path = None
self._vbox_user = None
@property
def vboxmanage_path(self):
@@ -50,16 +49,6 @@ class VirtualBox(BaseManager):
return self._vboxmanage_path
@property
def vbox_user(self):
"""
Returns the VirtualBox user
:returns: username
"""
return self._vbox_user
def find_vboxmanage(self):
# look for VBoxManage
@@ -94,9 +83,10 @@ class VirtualBox(BaseManager):
command = [vboxmanage_path, "--nologo", subcommand]
command.extend(args)
try:
if self.vbox_user:
vbox_user = self.config.get_section_config("VirtualBox").get("vbox_user")
if vbox_user:
# TODO: test & review this part
sudo_command = "sudo -i -u {}".format(self.vbox_user) + " ".join(command)
sudo_command = "sudo -i -u {}".format(vbox_user) + " ".join(command)
process = yield from asyncio.create_subprocess_shell(sudo_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
else:
process = yield from asyncio.create_subprocess_exec(*command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
+1 -3
View File
@@ -57,10 +57,8 @@ class VPCSVM(BaseVM):
super().__init__(name, uuid, project, manager)
self._path = manager.config.get_section_config("VPCS").get("path", "vpcs")
self._path = manager.config.get_section_config("VPCS").get("vpcs_path", "vpcs")
self._console = console
self._command = []
self._process = None
self._vpcs_stdout_file = ""