arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-02-09 06:32:40 +00:00
Code Issues Releases Wiki Activity

Do not automatically connect to local compute.

Browse Source
This commit is contained in:
grossmj 2020-10-22 16:47:11 +10:30
parent a92c47b310
commit 13da8aa8f5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/controller/__init__.py
View File

@ -91,13 +91,13 @@ class Controller:
user=server_config.get("user", ""), user=server_config.get("user", ""),
password=server_config.get("password", ""), password=server_config.get("password", ""),
force=True, force=True,
connect=True) # FIXME: not connection for now connect=False)
except ControllerError: except ControllerError:
log.fatal("Cannot access to the local server, make sure something else is not running on the TCP port {}".format(port)) log.fatal("Cannot access to the local server, make sure something else is not running on the TCP port {}".format(port))
sys.exit(1) sys.exit(1)
for c in computes: for c in computes:
try: try:
await self.add_compute(**c, connect=False) # FIXME: not connection for now await self.add_compute(**c, connect=False)
except (ControllerError, KeyError): except (ControllerError, KeyError):
pass # Skip not available servers at loading pass # Skip not available servers at loading

3
gns3server/controller/compute.py
View File

@ -501,7 +501,8 @@ class Compute:
async def _run_http_query(self, method, path, data=None, timeout=20, raw=False): async def _run_http_query(self, method, path, data=None, timeout=20, raw=False):
with async_timeout.timeout(timeout): with async_timeout.timeout(timeout):
url = self._getUrl(path) url = self._getUrl(path)
headers = {'content-type': 'application/json'} headers = {}
headers['content-type'] = 'application/json'
chunked = None chunked = None
if data == {}: if data == {}:
data = None data = None

6
tests/controller/test_controller.py
View File

@ -295,9 +295,9 @@ async def test_start(controller):
"vmname": "GNS3 VM" "vmname": "GNS3 VM"
} }
with asyncio_patch("gns3server.controller.compute.Compute.connect") as mock: #with asyncio_patch("gns3server.controller.compute.Compute.connect") as mock:
await controller.start() await controller.start()
assert mock.called #assert mock.called
assert len(controller.computes) == 1 # Local compute is created assert len(controller.computes) == 1 # Local compute is created
assert controller.computes["local"].name == socket.gethostname() assert controller.computes["local"].name == socket.gethostname()