Drop NAT port from cloud from old topologies

It was almost not used (only one occurrence in the whole
beta test).

Fix #844
This commit is contained in:
Julien Duponchelle committed 2017-01-11 19:20:12 +01:00
1 parent 1bf54bcaeb
commit b1ae884bf0
3 files changed
+176 -2

No files matched your search

+7 -2
View File
@@ -295,9 +295,9 @@ def _convert_1_3_later(topo, topo_path):
elif old_node["type"] == "IOUDevice":
node["node_type"] = "iou"
elif old_node["type"] == "Cloud":
_create_cloud(node, old_node, ":/symbols/cloud.svg")
old_node["ports"] = _create_cloud(node, old_node, ":/symbols/cloud.svg")
elif old_node["type"] == "Host":
_create_cloud(node, old_node, ":/symbols/computer.svg")
old_node["ports"] = _create_cloud(node, old_node, ":/symbols/computer.svg")
else:
raise NotImplementedError("Conversion of {} is not supported".format(old_node["type"]))
@@ -483,6 +483,7 @@ def _create_cloud(node, old_node, icon):
del old_node["properties"]["nios"]
ports = []
keep_ports = []
for old_port in old_node.get("ports", []):
if old_port["name"].startswith("nio_gen_eth"):
port_type = "ethernet"
@@ -492,6 +493,8 @@ def _create_cloud(node, old_node, icon):
port_type = "tap"
elif old_port["name"].startswith("nio_udp"):
port_type = "udp"
elif old_port["name"].startswith("nio_nat"):
continue
else:
raise NotImplementedError("The conversion of cloud with {} is not supported".format(old_port["name"]))
@@ -512,10 +515,12 @@ def _create_cloud(node, old_node, icon):
"port_number": len(ports) + 1,
"type": port_type
}
keep_ports.append(old_port)
ports.append(port)
node["properties"]["ports_mapping"] = ports
node["properties"]["interfaces"] = []
return keep_ports
def _convert_snapshots(topo_dir):