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

Fix linked_clone property lost during topology convert

Browse Source
This commit is contained in:
Julien Duponchelle 2017-02-14 14:45:48 +01:00
parent 0dbd92db11
commit a191029c4f
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/topology.py
View File

@ -321,10 +321,12 @@ def _convert_1_3_later(topo, topo_path):
node["properties"]["ram"] = PLATFORMS_DEFAULT_RAM[old_node["type"].lower()] node["properties"]["ram"] = PLATFORMS_DEFAULT_RAM[old_node["type"].lower()]
elif old_node["type"] == "VMwareVM": elif old_node["type"] == "VMwareVM":
node["node_type"] = "vmware" node["node_type"] = "vmware"
node["properties"]["linked_clone"] = old_node.get("linked_clone", False)
if node["symbol"] is None: if node["symbol"] is None:
node["symbol"] = ":/symbols/vmware_guest.svg" node["symbol"] = ":/symbols/vmware_guest.svg"
elif old_node["type"] == "VirtualBoxVM": elif old_node["type"] == "VirtualBoxVM":
node["node_type"] = "virtualbox" node["node_type"] = "virtualbox"
node["properties"]["linked_clone"] = old_node.get("linked_clone", False)
if node["symbol"] is None: if node["symbol"] is None:
node["symbol"] = ":/symbols/vbox_guest.svg" node["symbol"] = ":/symbols/vbox_guest.svg"
elif old_node["type"] == "IOUDevice": elif old_node["type"] == "IOUDevice":

24
tests/controller/test_export_project.py
View File

@ -202,7 +202,7 @@ def test_export_disallow_some_type(tmpdir, project, async_run):
with pytest.raises(aiohttp.web.HTTPConflict): with pytest.raises(aiohttp.web.HTTPConflict):
z = async_run(export_project(project, str(tmpdir))) z = async_run(export_project(project, str(tmpdir)))
z = async_run(export_project(project, str(tmpdir), allow_all_nodes=True)) z = async_run(export_project(project, str(tmpdir), allow_all_nodes=True))
def test_export_fix_path(tmpdir, project, async_run): def test_export_fix_path(tmpdir, project, async_run):
@ -215,18 +215,18 @@ def test_export_fix_path(tmpdir, project, async_run):
topology = { topology = {
"topology": { "topology": {
"nodes": [ "nodes": [
{
"properties": {
"image": "/tmp/c3725-adventerprisek9-mz.124-25d.image"
},
"node_type": "dynamips"
},
{ {
"properties": { "properties": {
"image": "gns3/webterm:lastest" "image": "/tmp/c3725-adventerprisek9-mz.124-25d.image"
}, },
"node_type": "docker" "node_type": "dynamips"
} },
{
"properties": {
"image": "gns3/webterm:lastest"
},
"node_type": "docker"
}
] ]
} }
} }

1
tests/topologies/1_5_virtualbox/after/1_5_virtualbox.gns3
View File

@ -34,6 +34,7 @@
"port_segment_size": 0, "port_segment_size": 0,
"first_port_name": null, "first_port_name": null,
"properties": { "properties": {
"linked_clone": false,
"acpi_shutdown": false, "acpi_shutdown": false,
"adapter_type": "Intel PRO/1000 MT Desktop (82540EM)", "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
"adapters": 1, "adapters": 1,

1
tests/topologies/1_5_vmware/after/1_5_vmware.gns3
View File

@ -34,6 +34,7 @@
"port_segment_size": 0, "port_segment_size": 0,
"first_port_name": null, "first_port_name": null,
"properties": { "properties": {
"linked_clone": false,
"acpi_shutdown": false, "acpi_shutdown": false,
"adapter_type": "e1000", "adapter_type": "e1000",
"adapters": 1, "adapters": 1,