arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Fixes checks for free console and aux ports.

Browse Source
This commit is contained in:
grossmj 2014-04-11 16:24:08 -06:00
parent 96231e3f7f
commit e70ea26639
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/dynamips/dynamips_hypervisor.py
View File

@ -351,7 +351,7 @@ class DynamipsHypervisor(object):
socket_type = socket.SOCK_STREAM socket_type = socket.SOCK_STREAM
for port in range(start_port, end_port): for port in range(start_port, end_port):
if port > end_port: if port + 1 == end_port:
raise DynamipsError("Could not find a free port between {0} and {1}".format(start_port, end_port)) raise DynamipsError("Could not find a free port between {0} and {1}".format(start_port, end_port))
try: try:
if ":" in host: if ":" in host:

21
gns3server/modules/dynamips/nodes/router.py
View File

@ -103,11 +103,9 @@ class Router(object):
platform=platform, platform=platform,
id=self._id)) id=self._id))
# allocate and check that console and aux ports are unused # get console and aux ports
console_port = (self._hypervisor.baseconsole - 1) + self._id self.console = (self._hypervisor.baseconsole - 1) + self._id
self.console = DynamipsHypervisor.find_unused_port(console_port, console_port + 1, self._hypervisor.host) self.aux = (self._hypervisor.baseaux - 1) + self._id
aux_port = (self._hypervisor.baseaux - 1) + self._id
self.aux = DynamipsHypervisor.find_unused_port(aux_port, aux_port + 1, self._hypervisor.host)
# get the default base MAC address # get the default base MAC address
self._mac_addr = self._hypervisor.send("{platform} get_mac_addr {name}".format(platform=self._platform, self._mac_addr = self._hypervisor.send("{platform} get_mac_addr {name}".format(platform=self._platform,
@ -272,6 +270,19 @@ class Router(object):
if self.get_status() == "suspended": if self.get_status() == "suspended":
self.resume() self.resume()
else: else:
if self.console and self.aux:
# check that console and aux ports are available
try:
DynamipsHypervisor.find_unused_port(self.console, self.console + 1, self._hypervisor.host)
except DynamipsError:
raise DynamipsError("console port {} is not available".format(self.console))
try:
DynamipsHypervisor.find_unused_port(self.aux, self.aux + 1, self._hypervisor.host)
except DynamipsError:
raise DynamipsError("aux port {} is not available".format(self.aux))
self._hypervisor.send("vm start {}".format(self._name)) self._hypervisor.send("vm start {}".format(self._name))
log.info("router {name} [id={id}] has been started".format(name=self._name, id=self._id)) log.info("router {name} [id={id}] has been started".format(name=self._name, id=self._id))

2
gns3server/modules/iou/iou_device.py
View File

@ -793,7 +793,7 @@ class IOUDevice(object):
socket_type = socket.SOCK_STREAM socket_type = socket.SOCK_STREAM
for port in range(start_port, end_port): for port in range(start_port, end_port):
if port > end_port: if port + 1 == end_port:
raise IOUError("Could not find a free port between {0} and {1}".format(start_port, end_port)) raise IOUError("Could not find a free port between {0} and {1}".format(start_port, end_port))
try: try:
if ":" in host: if ":" in host: