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

Merge remote-tracking branch 'origin/2.2' into 2.2

Browse Source
This commit is contained in:
grossmj 2018-11-27 15:47:29 +07:00
commit 83161bcdd4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-requirements.txt
View File

@ -1,6 +1,6 @@
-rrequirements.txt -rrequirements.txt
sphinx==1.7.1 sphinx==1.8.2
pytest==4.0.0 pytest==4.0.1
pep8==1.7.1 pep8==1.7.1
pytest-timeout==1.3.3 pytest-timeout==1.3.3

2
gns3server/controller/__init__.py
View File

@ -341,7 +341,7 @@ class Controller:
if "appliances" in controller_settings: if "appliances" in controller_settings:
for appliance_settings in controller_settings["appliances"]: for appliance_settings in controller_settings["appliances"]:
try: try:
appliance = Appliance(appliance_settings["appliance_id"], appliance_settings) appliance = Appliance(appliance_settings.get("appliance_id"), appliance_settings)
self._appliances[appliance.id] = appliance self._appliances[appliance.id] = appliance
except jsonschema.ValidationError as e: except jsonschema.ValidationError as e:
message = "Cannot load appliance with JSON data '{}': {}".format(appliance_settings, e.message) message = "Cannot load appliance with JSON data '{}': {}".format(appliance_settings, e.message)