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

Return computer name instead of local. It's more logic when using remote controller

Browse Source
This commit is contained in:
Julien Duponchelle 2016-08-22 18:49:25 +02:00
parent 46910a183e
commit 897455d5e9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gns3server/controller/__init__.py
View File

@ -51,14 +51,13 @@ class Controller:
self._config_file = os.path.join(config_path, "gns3_controller.conf")
server_config = Config.instance().get_section_config("Server")
if server_config.getboolean("local", False) is True:
self._computes["local"] = Compute(compute_id="local",
controller=self,
protocol=server_config.get("protocol", "http"),
host=server_config.get("host", "localhost"),
port=server_config.getint("port", 3080),
user=server_config.get("user", ""),
password=server_config.get("password", ""))
self._computes["local"] = Compute(compute_id="local",
controller=self,
protocol=server_config.get("protocol", "http"),
host=server_config.get("host", "localhost"),
port=server_config.getint("port", 3080),
user=server_config.get("user", ""),
password=server_config.get("password", ""))
def save(self):
"""

3
gns3server/controller/compute.py
View File

@ -17,6 +17,7 @@
import aiohttp
import asyncio
import socket
import json
import uuid
import os
@ -163,7 +164,7 @@ class Compute:
if name is not None:
self._name = name
elif self._id == "local":
self._name = "Local"
self._name = socket.gethostname()
else:
if self._user:
user = self._user