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

Fix when config file doesn't have computes section (#1062)

Browse Source
This commit is contained in:
ziajka 2017-06-07 10:50:40 +02:00 committed by Julien Duponchelle
parent 88cd804274
commit e0b519eced
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/controller/__init__.py
View File

@ -82,7 +82,7 @@ class Controller:
password=server_config.get("password", ""), password=server_config.get("password", ""),
force=True) force=True)
except aiohttp.web_exceptions.HTTPConflict as e: except aiohttp.web_exceptions.HTTPConflict as e:
log.fatal("Can't acces to the local server, make sure anything else is not running on the same port") log.fatal("Can't access to the local server, make sure anything else is not running on the same port")
sys.exit(1) sys.exit(1)
for c in computes: for c in computes:
try: try:
@ -176,7 +176,7 @@ class Controller:
if "gns3vm" in data: if "gns3vm" in data:
self.gns3vm.settings = data["gns3vm"] self.gns3vm.settings = data["gns3vm"]
return data["computes"] return data.get("computes", [])
@asyncio.coroutine @asyncio.coroutine
def load_projects(self): def load_projects(self):

10
tests/controller/test_controller.py
View File

@ -65,6 +65,16 @@ def test_load_controller_settings(controller, controller_config_path, async_run)
assert controller.gns3vm.settings["vmname"] == "Test VM" assert controller.gns3vm.settings["vmname"] == "Test VM"
def test_load_controller_settings_with_no_computes_section(controller, controller_config_path, async_run):
controller.save()
with open(controller_config_path) as f:
data = json.load(f)
del data['computes']
with open(controller_config_path, "w+") as f:
json.dump(data, f)
assert len(async_run(controller._load_controller_settings())) == 0
def test_import_computes_1_x(controller, controller_config_path, async_run): def test_import_computes_1_x(controller, controller_config_path, async_run):
""" """
At first start the server should import the At first start the server should import the