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

If your settings from 1.X are broken with skip them at import

Browse Source 
Fix #932
This commit is contained in:
Julien Duponchelle 2017-03-13 18:17:17 +01:00
parent 1d5029e4e2
commit 84a6ed7684
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/controller/__init__.py
View File

@ -196,14 +196,17 @@ class Controller:
data = json.load(f) data = json.load(f)
server_settings = data.get("Servers", {}) server_settings = data.get("Servers", {})
for remote in server_settings.get("remote_servers", []): for remote in server_settings.get("remote_servers", []):
yield from self.add_compute( try:
host=remote.get("host", "localhost"), yield from self.add_compute(
port=remote.get("port", 3080), host=remote.get("host", "localhost"),
protocol=remote.get("protocol", "http"), port=remote.get("port", 3080),
name=remote.get("url"), protocol=remote.get("protocol", "http"),
user=remote.get("user"), name=remote.get("url"),
password=remote.get("password") user=remote.get("user"),
) password=remote.get("password")
)
except aiohttp.web.HTTPConflict:
pass # if the server is broken we skip it
if "vm" in server_settings: if "vm" in server_settings:
vmname = None vmname = None
vm_settings = server_settings["vm"] vm_settings = server_settings["vm"]