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

Load local server before anything else

Browse Source
This commit is contained in:
Julien Duponchelle 2017-02-28 12:08:47 +01:00
parent da8811515d
commit 41d7570b24
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/controller/__init__.py
View File

@ -53,9 +53,10 @@ class Controller:
@asyncio.coroutine @asyncio.coroutine
def start(self): def start(self):
log.info("Start controller") log.info("Start controller")
yield from self.load()
server_config = Config.instance().get_section_config("Server") server_config = Config.instance().get_section_config("Server")
host = server_config.get("host", "localhost") host = server_config.get("host", "localhost")
# If console_host is 0.0.0.0 client will use the ip they use # If console_host is 0.0.0.0 client will use the ip they use
# to connect to the controller # to connect to the controller
console_host = host console_host = host
@ -70,6 +71,7 @@ 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)
yield from self._load_controller_settings()
yield from self.load_projects() yield from self.load_projects()
yield from self.gns3vm.auto_start_vm() yield from self.gns3vm.auto_start_vm()
yield from self._project_auto_open() yield from self._project_auto_open()
@ -116,7 +118,7 @@ class Controller:
json.dump(data, f, indent=4) json.dump(data, f, indent=4)
@asyncio.coroutine @asyncio.coroutine
def load(self): def _load_controller_settings(self):
""" """
Reload the controller configuration from disk Reload the controller configuration from disk
""" """

10
tests/controller/test_controller.py
View File

@ -42,7 +42,7 @@ def test_save(controller, controller_config_path):
assert data["gns3vm"] == controller.gns3vm.__json__() assert data["gns3vm"] == controller.gns3vm.__json__()
def test_load(controller, controller_config_path, async_run): def test_load_controller_settings(controller, controller_config_path, async_run):
controller.save() controller.save()
with open(controller_config_path) as f: with open(controller_config_path) as f:
data = json.load(f) data = json.load(f)
@ -60,7 +60,7 @@ def test_load(controller, controller_config_path, async_run):
data["gns3vm"] = {"vmname": "Test VM"} data["gns3vm"] = {"vmname": "Test VM"}
with open(controller_config_path, "w+") as f: with open(controller_config_path, "w+") as f:
json.dump(data, f) json.dump(data, f)
async_run(controller.load()) async_run(controller._load_controller_settings())
assert controller.settings["IOU"] assert controller.settings["IOU"]
assert controller.computes["test1"].__json__() == { assert controller.computes["test1"].__json__() == {
"compute_id": "test1", "compute_id": "test1",
@ -104,7 +104,7 @@ def test_import_computes_1_x(controller, controller_config_path, async_run):
with open(os.path.join(config_dir, "gns3_gui.conf"), "w+") as f: with open(os.path.join(config_dir, "gns3_gui.conf"), "w+") as f:
json.dump(gns3_gui_conf, f) json.dump(gns3_gui_conf, f)
async_run(controller.load()) async_run(controller._load_controller_settings())
for compute in controller.computes.values(): for compute in controller.computes.values():
if compute.id != "local": if compute.id != "local":
assert len(compute.id) == 36 assert len(compute.id) == 36
@ -146,7 +146,7 @@ def test_import_gns3vm_1_x(controller, controller_config_path, async_run):
json.dump(gns3_gui_conf, f) json.dump(gns3_gui_conf, f)
controller.gns3vm.settings["engine"] = None controller.gns3vm.settings["engine"] = None
async_run(controller.load()) async_run(controller._load_controller_settings())
assert controller.gns3vm.settings["engine"] == "vmware" assert controller.gns3vm.settings["engine"] == "vmware"
assert controller.gns3vm.settings["enable"] assert controller.gns3vm.settings["enable"]
assert controller.gns3vm.settings["headless"] assert controller.gns3vm.settings["headless"]
@ -202,7 +202,7 @@ def test_import_remote_gns3vm_1_x(controller, controller_config_path, async_run)
json.dump(gns3_gui_conf, f) json.dump(gns3_gui_conf, f)
with asyncio_patch("gns3server.controller.compute.Compute.connect"): with asyncio_patch("gns3server.controller.compute.Compute.connect"):
async_run(controller.load()) async_run(controller._load_controller_settings())
assert controller.gns3vm.settings["engine"] == "remote" assert controller.gns3vm.settings["engine"] == "remote"
assert controller.gns3vm.settings["vmname"] == "http://127.0.0.1:3081" assert controller.gns3vm.settings["vmname"] == "http://127.0.0.1:3081"