arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-25 23:41:02 +00:00
Code Issues Releases Wiki Activity

Fix error with console type in Ethernet switch schema. Fixes #1659

Browse Source
This commit is contained in:
grossmj 2019-10-08 17:16:17 +08:00
parent 51a92b46dd
commit 2f57bd58c0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/controller/topology.py
View File

@ -167,6 +167,9 @@ def load_topology(path):
if "appliance_id" in node: if "appliance_id" in node:
node["template_id"] = node["appliance_id"] node["template_id"] = node["appliance_id"]
del node["appliance_id"] del node["appliance_id"]
# make sure console_type is not None but "none" string
if "console_type" in node and node["console_type"] is None:
node["console_type"] = "none"
try: try:
_check_topology_schema(topo) _check_topology_schema(topo)
@ -189,6 +192,7 @@ def _convert_2_1_0(topo, topo_path):
Changes: Changes:
* Removed acpi_shutdown option from Qemu, VMware and VirtualBox * Removed acpi_shutdown option from Qemu, VMware and VirtualBox
""" """
topo["revision"] = 9 topo["revision"] = 9
@ -198,6 +202,9 @@ def _convert_2_1_0(topo, topo_path):
topo["drawing_grid_size"] = topo["grid_size"] topo["drawing_grid_size"] = topo["grid_size"]
for node in topo.get("topology", {}).get("nodes", []): for node in topo.get("topology", {}).get("nodes", []):
# make sure console_type is not None but "none" string
if "console_type" in node and node["console_type"] is None:
node["console_type"] = "none"
if "properties" in node: if "properties" in node:
if node["node_type"] in ("qemu", "vmware", "virtualbox"): if node["node_type"] in ("qemu", "vmware", "virtualbox"):
if "acpi_shutdown" in node["properties"]: if "acpi_shutdown" in node["properties"]:

2
gns3server/schemas/iou.py
View File

@ -48,7 +48,7 @@ IOU_CREATE_SCHEMA = {
}, },
"console_type": { "console_type": {
"description": "Console type", "description": "Console type",
"enum": ["telnet", "none", None] "enum": ["telnet", "none"]
}, },
"path": { "path": {
"description": "Path of iou binary", "description": "Path of iou binary",