From c9bdd7692254d81cfe537a96985f83add5910bfc Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 18 Jul 2016 18:55:47 +0200 Subject: [PATCH] IOU support for conversion from 1.5 --- gns3server/controller/topology.py | 2 + tests/topologies/1_5_iou/after/1_5_iou.gns3 | 53 +++++++ tests/topologies/1_5_iou/before/1_5_iou.gns3 | 151 +++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 tests/topologies/1_5_iou/after/1_5_iou.gns3 create mode 100644 tests/topologies/1_5_iou/before/1_5_iou.gns3 diff --git a/gns3server/controller/topology.py b/gns3server/controller/topology.py index 84e6dba2..ab090d1d 100644 --- a/gns3server/controller/topology.py +++ b/gns3server/controller/topology.py @@ -227,6 +227,8 @@ def _convert_1_3_later(topo, topo_path): node["node_type"] = "virtualbox" if node["symbol"] is None: node["symbol"] = ":/symbols/vbox_guest.svg" + elif old_node["type"] == "IOUDevice": + node["node_type"] = "iou" elif old_node["type"] == "Cloud": _create_cloud(node, old_node) else: diff --git a/tests/topologies/1_5_iou/after/1_5_iou.gns3 b/tests/topologies/1_5_iou/after/1_5_iou.gns3 new file mode 100644 index 00000000..03971fde --- /dev/null +++ b/tests/topologies/1_5_iou/after/1_5_iou.gns3 @@ -0,0 +1,53 @@ +{ + "auto_start": false, + "name": "1_5_iou", + "project_id": "8a077150-3e3e-4fed-944e-b8cd882e24db", + "revision": 5, + "topology": { + "computes": [ + { + "compute_id": "ANYUUID", + "host": "127.0.0.1", + "name": "Remote 1", + "port": 3081, + "protocol": "http" + } + ], + "drawings": [], + "links": [], + "nodes": [ + { + "compute_id": "ANYUUID", + "console": 6001, + "console_type": "telnet", + "label": { + "rotation": 0, + "style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;", + "text": "IOU1", + "x": 16, + "y": -25 + }, + "name": "IOU1", + "node_id": "aaeb2288-a7d8-42a9-b9d8-c42ab464a390", + "node_type": "iou", + "properties": { + "ethernet_adapters": 2, + "l1_keepalives": false, + "md5sum": "4cfb52a3bff5fa3edf3df5694afce3de", + "nvram": 128, + "path": "i86bi-linux-l3-adventerprisek9-15.4.1T.bin", + "ram": 256, + "serial_adapters": 2, + "startup_config": "startup-config.cfg", + "use_default_iou_values": true + }, + "symbol": ":/symbols/router.svg", + "x": -76, + "y": -48, + "z": 1 + } + ] + }, + "type": "topology", + "version": "2.0.0dev1" +} diff --git a/tests/topologies/1_5_iou/before/1_5_iou.gns3 b/tests/topologies/1_5_iou/before/1_5_iou.gns3 new file mode 100644 index 00000000..e4236bc2 --- /dev/null +++ b/tests/topologies/1_5_iou/before/1_5_iou.gns3 @@ -0,0 +1,151 @@ +{ + "auto_start": false, + "name": "1_5_iou", + "project_id": "8a077150-3e3e-4fed-944e-b8cd882e24db", + "revision": 4, + "topology": { + "nodes": [ + { + "description": "IOU device", + "id": 1, + "label": { + "color": "#ff000000", + "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "text": "IOU1", + "x": 16.2578125, + "y": -25.0 + }, + "ports": [ + { + "adapter_number": 0, + "id": 1, + "name": "Ethernet0/0", + "port_number": 0 + }, + { + "adapter_number": 0, + "id": 2, + "name": "Ethernet0/1", + "port_number": 1 + }, + { + "adapter_number": 0, + "id": 3, + "name": "Ethernet0/2", + "port_number": 2 + }, + { + "adapter_number": 0, + "id": 4, + "name": "Ethernet0/3", + "port_number": 3 + }, + { + "adapter_number": 1, + "id": 5, + "name": "Ethernet1/0", + "port_number": 0 + }, + { + "adapter_number": 1, + "id": 6, + "name": "Ethernet1/1", + "port_number": 1 + }, + { + "adapter_number": 1, + "id": 7, + "name": "Ethernet1/2", + "port_number": 2 + }, + { + "adapter_number": 1, + "id": 8, + "name": "Ethernet1/3", + "port_number": 3 + }, + { + "adapter_number": 2, + "id": 9, + "name": "Serial2/0", + "port_number": 0 + }, + { + "adapter_number": 2, + "id": 10, + "name": "Serial2/1", + "port_number": 1 + }, + { + "adapter_number": 2, + "id": 11, + "name": "Serial2/2", + "port_number": 2 + }, + { + "adapter_number": 2, + "id": 12, + "name": "Serial2/3", + "port_number": 3 + }, + { + "adapter_number": 3, + "id": 13, + "name": "Serial3/0", + "port_number": 0 + }, + { + "adapter_number": 3, + "id": 14, + "name": "Serial3/1", + "port_number": 1 + }, + { + "adapter_number": 3, + "id": 15, + "name": "Serial3/2", + "port_number": 2 + }, + { + "adapter_number": 3, + "id": 16, + "name": "Serial3/3", + "port_number": 3 + } + ], + "properties": { + "console": 6001, + "ethernet_adapters": 2, + "l1_keepalives": false, + "md5sum": "4cfb52a3bff5fa3edf3df5694afce3de", + "name": "IOU1", + "nvram": 128, + "path": "i86bi-linux-l3-adventerprisek9-15.4.1T.bin", + "ram": 256, + "serial_adapters": 2, + "startup_config": "startup-config.cfg", + "use_default_iou_values": true + }, + "server_id": 1, + "symbol": ":/symbols/router.svg", + "type": "IOUDevice", + "vm_id": "aaeb2288-a7d8-42a9-b9d8-c42ab464a390", + "x": -76.0, + "y": -48.0 + } + ], + "servers": [ + { + "host": "127.0.0.1", + "id": 1, + "local": false, + "port": 3081, + "protocol": "http", + "user": "", + "vm": false + } + ] + }, + "type": "topology", + "version": "1.5.1dev1" +}