NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 22:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop console_type serial, and enable_remote_console for Vbox and VMware

Browse Source 
Ref #748
This commit is contained in:
Julien Duponchelle committed 2016-11-03 18:17:50 +01:00
1 parent 382d8887d5
commit 4e15f89604
28 files changed
+163 -110
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/controller/test_topology.py
+2 -2
View File
@@ -39,7 +39,7 @@ def test_project_to_topology_empty(tmpdir):
"auto_open": False,
"scene_width": 2000,
"scene_height": 1000,
"revision": 5,
"revision": GNS3_FILE_FORMAT_REVISION,
"topology": {
"nodes": [],
"links": [],
@@ -79,7 +79,7 @@ def test_load_topology(tmpdir):
data = {
"project_id": "69f26504-7aa3-48aa-9f29-798d44841211",
"name": "Test",
"revision": 5,
"revision": GNS3_FILE_FORMAT_REVISION,
"topology": {
"nodes": [],
"links": [],
tests/topologies/1_0_empty/after/1_0_empty.gns3
+1 -1
View File
@@ -15,7 +15,7 @@
}
]
},
"revision" : 5,
"revision": 6,
"project_id" : "ANYUUID",
"type" : "topology",
"auto_start" : false
tests/topologies/1_3_dynamips/after/1_3_dynamips.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_3_dynamips",
"project_id": "ba5790e1-2f51-443e-a3cc-1a2eee132888",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/1_3_dynamips_missing_platform/after/1_3_dynamips_missing_platform.gns3
+1 -1
View File
@@ -1,5 +1,5 @@
{
"revision": 5,
"revision": 6,
"auto_start": false,
"topology": {
"drawings": [],
tests/topologies/1_5_builtins/after/builtins.gns3
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "builtins",
"project_id": "644e3892-4a50-4457-9601-2234d4842169",
"revision": 5,
"revision": 6,
"auto_start": false,
"topology": {
"computes": [
tests/topologies/1_5_cloud/after/1_5_cloud.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_cloud",
"project_id": "467ce18d-4848-494a-88d2-4f53ddaca111",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/1_5_docker_remote/after/1_5_docker_remote.gns3
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "1_5_docker_remote",
"project_id": "8182b710-c6bf-4e51-8e2e-213cce952797",
"revision": 5,
"revision": 6,
"auto_start": false,
"topology": {
"computes": [
tests/topologies/1_5_drawing/after/1_5_drawing.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_drawing",
"project_id": "ANYUUID",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
],
tests/topologies/1_5_dynamips/after/1_5_dynamips.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_dynamips",
"project_id": "62f389c0-f26d-43b7-ab29-e4d306b29c07",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/1_5_host/after/1_5_host.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_host",
"project_id": "ce17e635-bc1b-44df-946c-149e938dedc4",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/1_5_images/after/1_5_image.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_image",
"project_id": "ANYUUID",
"revision": 5,
"revision": 6,
"topology": {
"computes": [],
"drawings": [
tests/topologies/1_5_internet/after/1_5_internet.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_internet",
"project_id": "a64f6cf9-ea6e-42e6-9e4e-a2a292e2b827",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{"name": "GNS3 VM", "protocol": "http", "port": 3080, "host": "172.16.16.150", "compute_id": "vm"}
tests/topologies/1_5_iou/after/1_5_iou.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_iou",
"project_id": "8a077150-3e3e-4fed-944e-b8cd882e24db",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/1_5_qemu/after/testqemu.gns3
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "testqemu",
"project_id": "a3ca8a82-6b11-4c8e-b20d-c9e94286054c",
"revision": 5,
"revision": 6,
"auto_start": false,
"topology": {
"computes": [
tests/topologies/1_5_snapshot/after/1_5_snapshot.gns3
+1 -1
View File
@@ -41,7 +41,7 @@
}
]
},
"revision" : 5,
"revision": 6,
"name" : "1_5_snapshot",
"project_id" : "17912669-dd40-4843-b348-689b8f34f09d",
"auto_start" : false
tests/topologies/1_5_virtualbox/after/1_5_virtualbox.gns3
+1 -2
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_virtualbox",
"project_id": "bf00c459-05a5-45c0-950c-3f6150a20703",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
@@ -37,7 +37,6 @@
"acpi_shutdown": false,
"adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
"adapters": 1,
"enable_remote_console": false,
"headless": false,
"ram": 512,
"use_any_adapter": false,
tests/topologies/1_5_vmware/after/1_5_vmware.gns3
+1 -2
View File
@@ -1,7 +1,7 @@
{
"name": "1_5_vmware",
"project_id": "4be1f3e5-76e5-4223-93b7-f37f4091549e",
"revision": 5,
"revision": 6,
"auto_start": false,
"topology": {
"computes": [
@@ -37,7 +37,6 @@
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"enable_remote_console": false,
"headless": false,
"use_any_adapter": false,
"vmx_path": "/Users/bob/Documents/Virtual Machines.localized/GNS3 VM.vmwarevm/GNS3 VM.vmx"
tests/topologies/1_5_vpcs/after/1_5_vpcs.gns3
+1 -1
View File
@@ -2,7 +2,7 @@
"auto_start": false,
"name": "1_5_vpcs",
"project_id": "62fc7a04-ae65-4003-a9e6-a046b1996f0e",
"revision": 5,
"revision": 6,
"topology": {
"computes": [
{
tests/topologies/2_0_vmware/after/1_5_vmware.gns3
+53
View File
@@ -0,0 +1,53 @@
{
"name": "1_5_vmware",
"project_id": "4be1f3e5-76e5-4223-93b7-f37f4091549e",
"revision": 6,
"auto_start": false,
"topology": {
"computes": [
{
"compute_id": "local",
"host": "127.0.0.1",
"name": "Local",
"port": 3080,
"protocol": "http"
}
],
"drawings": [],
"links": [],
"nodes": [
{
"compute_id": "local",
"console": 2000,
"console_type": "telnet",
"label": {
"rotation": 0,
"style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;",
"text": "GNS3 VM",
"x": 5,
"y": -25
},
"name": "GNS3 VM",
"node_id": "9e06d0ce-e8df-4f38-bdfa-7c83e19a91c1",
"node_type": "vmware",
"port_name_format": "Ethernet{0}",
"port_segment_size": 0,
"first_port_name": null,
"properties": {
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"headless": false,
"use_any_adapter": false,
"vmx_path": "/Users/bob/Documents/Virtual Machines.localized/GNS3 VM.vmwarevm/GNS3 VM.vmx"
},
"symbol": ":/symbols/vmware_guest.svg",
"x": 7,
"y": 8,
"z": 1
}
]
},
"type": "topology",
"version": "ANYSTR"
}
tests/topologies/2_0_vmware/before/1_5_vmware.gns3
+54
View File
@@ -0,0 +1,54 @@
{
"name": "1_5_vmware",
"project_id": "4be1f3e5-76e5-4223-93b7-f37f4091549e",
"revision": 5,
"auto_start": false,
"topology": {
"computes": [
{
"compute_id": "local",
"host": "127.0.0.1",
"name": "Local",
"port": 3080,
"protocol": "http"
}
],
"drawings": [],
"links": [],
"nodes": [
{
"compute_id": "local",
"console": 2000,
"console_type": "serial",
"label": {
"rotation": 0,
"style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;",
"text": "GNS3 VM",
"x": 5,
"y": -25
},
"name": "GNS3 VM",
"node_id": "9e06d0ce-e8df-4f38-bdfa-7c83e19a91c1",
"node_type": "vmware",
"port_name_format": "Ethernet{0}",
"port_segment_size": 0,
"first_port_name": null,
"properties": {
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"headless": false,
"use_any_adapter": false,
"enable_remote_console": false,
"vmx_path": "/Users/bob/Documents/Virtual Machines.localized/GNS3 VM.vmwarevm/GNS3 VM.vmx"
},
"symbol": ":/symbols/vmware_guest.svg",
"x": 7,
"y": 8,
"z": 1
}
]
},
"type": "topology",
"version": "ANYSTR"
}