-
Notifications
You must be signed in to change notification settings - Fork 261
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Error when converting some dynamips topologies from 1.3 => 2.0
Fix #718
- Loading branch information
1 parent
b6fa144
commit 241c9b0
Showing
6 changed files
with
445 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
tests/topologies/1_3_dynamips_missing_platform/after/1_3_dynamips_missing_platform.gns3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| { | ||
| "revision": 5, | ||
| "auto_start": false, | ||
| "topology": { | ||
| "drawings": [], | ||
| "links": [], | ||
| "nodes": [ | ||
| { | ||
| "port_segment_size": 0, | ||
| "name": "ASW1", | ||
| "node_type": "dynamips", | ||
| "label": { | ||
| "x": -16, | ||
| "y": -26, | ||
| "style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;", | ||
| "text": "ASW1", | ||
| "rotation": 0 | ||
| }, | ||
| "port_name_format": "Ethernet{0}", | ||
| "node_id": "02e4a9e8-a897-4b5b-94ba-968d8a0dc5b3", | ||
| "y": 25, | ||
| "x": -722, | ||
| "console": 2012, | ||
| "compute_id": "local", | ||
| "symbol": ":/symbols/router.svg", | ||
| "properties": { | ||
| "slot0": "Leopard-2FE", | ||
| "idlepc": "0x6057efc8", | ||
| "chassis": "3660", | ||
| "startup_config": "configs/i1_startup-config.cfg", | ||
| "image": "c3660-a3jk9s-mz.124-25c.bin", | ||
| "mac_addr": "cc01.20b8.0000", | ||
| "aux": 2103, | ||
| "ram": 192, | ||
| "platform": "c3600", | ||
| "dynamips_id": 1, | ||
| "slot1": "NM-16ESW" | ||
| }, | ||
| "first_port_name": null, | ||
| "console_type": "telnet", | ||
| "z": 1 | ||
| } | ||
| ], | ||
| "computes": [ | ||
| { | ||
| "name": "Local", | ||
| "port": 8000, | ||
| "compute_id": "local", | ||
| "protocol": "http", | ||
| "host": "127.0.0.1" | ||
| } | ||
| ] | ||
| }, | ||
| "project_id": "6e8b7940-a855-4e0c-8854-82577ba08eb1", | ||
| "type": "topology", | ||
| "name": "1_3_dynamips_missing_platform", | ||
| "version": "ANYSTR" | ||
| } |
176 changes: 176 additions & 0 deletions
176
...topologies/1_3_dynamips_missing_platform/after/1_3_dynamips_missing_platform.gns3.backup3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| { | ||
| "auto_start": false, | ||
| "name": "1_3_dynamips_missing_platform", | ||
| "project_id": "6e8b7940-a855-4e0c-8854-82577ba08eb1", | ||
| "resources_type": "local", | ||
| "revision": 3, | ||
| "topology": { | ||
| "nodes": [ | ||
| { | ||
| "description": "Router c3600", | ||
| "dynamips_id": 1, | ||
| "id": 1, | ||
| "label": { | ||
| "color": "#000000", | ||
| "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", | ||
| "text": "ASW1", | ||
| "x": -16.924486139, | ||
| "y": -26.2599194157 | ||
| }, | ||
| "ports": [ | ||
| { | ||
| "adapter_number": 0, | ||
| "id": 1, | ||
| "name": "FastEthernet0/0", | ||
| "port_number": 0 | ||
| }, | ||
| { | ||
| "adapter_number": 0, | ||
| "id": 2, | ||
| "name": "FastEthernet0/1", | ||
| "port_number": 1 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "description": "connected to Client1 on port FastEthernet0/0", | ||
| "id": 3, | ||
| "link_id": 15, | ||
| "name": "FastEthernet1/0", | ||
| "nio": "NIO_UDP", | ||
| "port_number": 0 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 4, | ||
| "name": "FastEthernet1/1", | ||
| "port_number": 1 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 5, | ||
| "name": "FastEthernet1/2", | ||
| "port_number": 2 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 6, | ||
| "name": "FastEthernet1/3", | ||
| "port_number": 3 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 7, | ||
| "name": "FastEthernet1/4", | ||
| "port_number": 4 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 8, | ||
| "name": "FastEthernet1/5", | ||
| "port_number": 5 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 9, | ||
| "name": "FastEthernet1/6", | ||
| "port_number": 6 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 10, | ||
| "name": "FastEthernet1/7", | ||
| "port_number": 7 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 11, | ||
| "name": "FastEthernet1/8", | ||
| "port_number": 8 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "description": "connected to DSW1 on port FastEthernet1/9", | ||
| "id": 12, | ||
| "link_id": 8, | ||
| "name": "FastEthernet1/9", | ||
| "nio": "NIO_UDP", | ||
| "port_number": 9 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "description": "connected to DSW1 on port FastEthernet1/10", | ||
| "id": 13, | ||
| "link_id": 5, | ||
| "name": "FastEthernet1/10", | ||
| "nio": "NIO_UDP", | ||
| "port_number": 10 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "description": "connected to DSW2 on port FastEthernet1/11", | ||
| "id": 14, | ||
| "link_id": 6, | ||
| "name": "FastEthernet1/11", | ||
| "nio": "NIO_UDP", | ||
| "port_number": 11 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "description": "connected to DSW2 on port FastEthernet1/12", | ||
| "id": 15, | ||
| "link_id": 7, | ||
| "name": "FastEthernet1/12", | ||
| "nio": "NIO_UDP", | ||
| "port_number": 12 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 16, | ||
| "name": "FastEthernet1/13", | ||
| "port_number": 13 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 17, | ||
| "name": "FastEthernet1/14", | ||
| "port_number": 14 | ||
| }, | ||
| { | ||
| "adapter_number": 1, | ||
| "id": 18, | ||
| "name": "FastEthernet1/15", | ||
| "port_number": 15 | ||
| } | ||
| ], | ||
| "properties": { | ||
| "aux": 2103, | ||
| "chassis": "3660", | ||
| "console": 2012, | ||
| "idlepc": "0x6057efc8", | ||
| "image": "c3660-a3jk9s-mz.124-25c.bin", | ||
| "mac_addr": "cc01.20b8.0000", | ||
| "name": "ASW1", | ||
| "slot0": "Leopard-2FE", | ||
| "slot1": "NM-16ESW", | ||
| "startup_config": "configs/i1_startup-config.cfg" | ||
| }, | ||
| "server_id": 1, | ||
| "type": "C3600", | ||
| "vm_id": "02e4a9e8-a897-4b5b-94ba-968d8a0dc5b3", | ||
| "x": -722.7235717864439, | ||
| "y": 25.4496381690538 | ||
| } | ||
| ], | ||
| "servers": [ | ||
| { | ||
| "cloud": false, | ||
| "host": "127.0.0.1", | ||
| "id": 1, | ||
| "local": true, | ||
| "port": 8000 | ||
| } | ||
| ] | ||
| }, | ||
| "type": "topology", | ||
| "version": "1.3.0" | ||
| } |
Oops, something went wrong.