mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-24 15:58:08 +00:00
Merge remote-tracking branch 'origin/2.2' into 2.2
This commit is contained in:
commit
83161bcdd4
@ -1,6 +1,6 @@
|
||||
-rrequirements.txt
|
||||
|
||||
sphinx==1.7.1
|
||||
pytest==4.0.0
|
||||
sphinx==1.8.2
|
||||
pytest==4.0.1
|
||||
pep8==1.7.1
|
||||
pytest-timeout==1.3.3
|
||||
|
@ -341,7 +341,7 @@ class Controller:
|
||||
if "appliances" in controller_settings:
|
||||
for appliance_settings in controller_settings["appliances"]:
|
||||
try:
|
||||
appliance = Appliance(appliance_settings["appliance_id"], appliance_settings)
|
||||
appliance = Appliance(appliance_settings.get("appliance_id"), appliance_settings)
|
||||
self._appliances[appliance.id] = appliance
|
||||
except jsonschema.ValidationError as e:
|
||||
message = "Cannot load appliance with JSON data '{}': {}".format(appliance_settings, e.message)
|
||||
|
Loading…
Reference in New Issue
Block a user