Allow user to set console port

This commit is contained in:
Julien Duponchelle committed 2015-01-20 20:54:46 +01:00
1 parent 57c3463edc
commit 649d4e5143
8 files changed
+27 -14

No files matched your search

+2
View File
@@ -157,6 +157,7 @@ class PortManager:
Get an available TCP console port and reserve it
"""
print("FREE")
port = self.find_unused_port(self._console_port_range[0],
self._console_port_range[1],
host=self._console_host,
@@ -176,6 +177,7 @@ class PortManager:
if port in self._used_tcp_ports:
raise HTTPConflict(reason="TCP port already {} in use on host".format(port, self._console_host))
self._used_tcp_ports.add(port)
return port
def release_console_port(self, port):
"""
+7 -10
View File
@@ -72,13 +72,10 @@ class VPCSVM(BaseVM):
self._script_file = script_file
self._ethernet_adapter = EthernetAdapter() # one adapter with 1 Ethernet interface
try:
if not self._console:
self._console = self._manager.port_manager.get_free_console_port()
else:
self._console = self._manager.port_manager.reserve_console_port(self._console)
except Exception as e:
raise VPCSError(e)
if self._console is not None:
self._console = self._manager.port_manager.reserve_console_port(self._console)
else:
self._console = self._manager.port_manager.get_free_console_port()
self._check_requirements()
@@ -106,9 +103,9 @@ class VPCSVM(BaseVM):
def __json__(self):
return {"name": self.name,
"uuid": self.uuid,
"console": self.console,
return {"name": self._name,
"uuid": self._uuid,
"console": self._console,
"project_uuid": self.project.uuid,
"script_file": self.script_file}