From 2f57bd58c05555c06a9ae1808c3fae6854649fb4 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 8 Oct 2019 17:16:17 +0800 Subject: [PATCH] Fix error with console type in Ethernet switch schema. Fixes #1659 --- gns3server/controller/topology.py | 7 +++++++ gns3server/schemas/iou.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gns3server/controller/topology.py b/gns3server/controller/topology.py index 2f42ec57..2c1a6b89 100644 --- a/gns3server/controller/topology.py +++ b/gns3server/controller/topology.py @@ -167,6 +167,9 @@ def load_topology(path): if "appliance_id" in node: node["template_id"] = 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: _check_topology_schema(topo) @@ -189,6 +192,7 @@ def _convert_2_1_0(topo, topo_path): Changes: * Removed acpi_shutdown option from Qemu, VMware and VirtualBox + """ topo["revision"] = 9 @@ -198,6 +202,9 @@ def _convert_2_1_0(topo, topo_path): topo["drawing_grid_size"] = topo["grid_size"] 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 node["node_type"] in ("qemu", "vmware", "virtualbox"): if "acpi_shutdown" in node["properties"]: diff --git a/gns3server/schemas/iou.py b/gns3server/schemas/iou.py index 12e186e7..84aa5421 100644 --- a/gns3server/schemas/iou.py +++ b/gns3server/schemas/iou.py @@ -48,7 +48,7 @@ IOU_CREATE_SCHEMA = { }, "console_type": { "description": "Console type", - "enum": ["telnet", "none", None] + "enum": ["telnet", "none"] }, "path": { "description": "Path of iou binary",