mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-11-16 16:54:51 +02:00
Raise exception if we try to reserve an already reserve port
This commit is contained in:
parent
fa57485f11
commit
f2289874af
@ -18,6 +18,7 @@
|
||||
import socket
|
||||
import ipaddress
|
||||
import asyncio
|
||||
from aiohttp.web import HTTPConflict
|
||||
|
||||
|
||||
class PortManager:
|
||||
@ -146,10 +147,10 @@ class PortManager:
|
||||
else:
|
||||
continue
|
||||
|
||||
raise Exception("Could not find a free port between {} and {} on host {}, last exception: {}".format(start_port,
|
||||
end_port,
|
||||
host,
|
||||
last_exception))
|
||||
raise HTTPConflict(reason="Could not find a free port between {} and {} on host {}, last exception: {}".format(start_port,
|
||||
end_port,
|
||||
host,
|
||||
last_exception))
|
||||
|
||||
def get_free_console_port(self):
|
||||
"""
|
||||
@ -173,7 +174,7 @@ class PortManager:
|
||||
"""
|
||||
|
||||
if port in self._used_tcp_ports:
|
||||
raise Exception("TCP port already {} in use on host".format(port, self._host))
|
||||
raise HTTPConflict(reason="TCP port already {} in use on host".format(port, self._console_host))
|
||||
self._used_tcp_ports.add(port)
|
||||
|
||||
def release_console_port(self, port):
|
||||
|
27
tests/modules/test_port_manager.py
Normal file
27
tests/modules/test_port_manager.py
Normal file
@ -0,0 +1,27 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright (C) 2015 GNS3 Technologies Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import aiohttp
|
||||
import pytest
|
||||
from gns3server.modules.port_manager import PortManager
|
||||
|
||||
|
||||
def test_reserve_console_port():
|
||||
pm = PortManager.instance()
|
||||
pm.reserve_console_port(4242)
|
||||
with pytest.raises(aiohttp.web.HTTPConflict):
|
||||
pm.reserve_console_port(4242)
|
Loading…
Reference in New Issue
Block a user