arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-12 17:10:55 +00:00
Code Issues Releases Wiki Activity

Fix crash when converting topology with broken link

Browse Source 
Fix #845
This commit is contained in:
Julien Duponchelle 2016-12-21 14:39:44 +01:00
parent e53db1ed81
commit ef54367bf7
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gns3server/controller/topology.py
View File

@ -310,20 +310,23 @@ def _convert_1_3_later(topo, topo_path):
# Create links # Create links
for old_link in topo.get("links", []): for old_link in topo.get("links", []):
nodes = [] try:
source_node = { nodes = []
"adapter_number": ports[old_link["source_port_id"]].get("adapter_number", 0), source_node = {
"port_number": ports[old_link["source_port_id"]].get("port_number", 0), "adapter_number": ports[old_link["source_port_id"]].get("adapter_number", 0),
"node_id": node_id_to_node_uuid[old_link["source_node_id"]] "port_number": ports[old_link["source_port_id"]].get("port_number", 0),
} "node_id": node_id_to_node_uuid[old_link["source_node_id"]]
nodes.append(source_node) }
nodes.append(source_node)
destination_node = { destination_node = {
"adapter_number": ports[old_link["destination_port_id"]].get("adapter_number", 0), "adapter_number": ports[old_link["destination_port_id"]].get("adapter_number", 0),
"port_number": ports[old_link["destination_port_id"]].get("port_number", 0), "port_number": ports[old_link["destination_port_id"]].get("port_number", 0),
"node_id": node_id_to_node_uuid[old_link["destination_node_id"]] "node_id": node_id_to_node_uuid[old_link["destination_node_id"]]
} }
nodes.append(destination_node) nodes.append(destination_node)
except KeyError:
continue
link = { link = {
"link_id": str(uuid.uuid4()), "link_id": str(uuid.uuid4()),