arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-10-11 18:38:55 +00:00
Code Issues Releases Wiki Activity
1,969 Commits 5 Branches 200 Tags 148 MiB
85136bc2e4
Commit Graph

309 Commits

Author SHA1 Message Date
Julien Duponchelle
7cad25eb1a Raise a VirtualBox error if adapter doesn't exists 
Fix #195
 2015-05-27 16:38:57 +02:00
Julien Duponchelle
ecf4e91e55 Ignore VirtualBox VM Name with a carriage return in name 
Add tests for get_list of VirtualBox

Fix #200
 2015-05-27 16:21:18 +02:00
Julien Duponchelle
ea67f4aeb9 Test ok on Windows 2015-05-27 11:12:39 +02:00
Julien Duponchelle
c98bcedd39 Cleanup the temporary project after modules have been notified of the 
path change
 2015-05-26 15:20:14 +02:00
Julien Duponchelle
117630c887 Test ok on Windows 2015-05-26 11:55:30 +02:00
Julien Duponchelle
e62dd1a572 Fix tests on Windows 2015-05-26 10:06:10 +02:00
Julien Duponchelle
1f931d56c7 Fix test suite on Windows 2015-05-26 10:06:10 +02:00
Julien Duponchelle
6f9f004ebb API for list & download files of a project 2015-05-26 09:49:12 +02:00
Julien Duponchelle
33bca1a85c Fix tests on Windows 2015-05-21 12:01:37 +02:00
Julien Duponchelle
4d50d00b3e Fix test suite on Windows 2015-05-21 11:46:55 +02:00
Julien Duponchelle
743187bb2e Merge branch 'master' into unstable 2015-05-14 19:29:30 +02:00
Julien Duponchelle
3704911c2d Fix tests 2015-05-13 10:19:50 +02:00
Julien Duponchelle
5df5a6da18 Fix qemu tests 2015-05-12 09:32:42 +02:00
Jeremy Grossmann
61fb641215 Merge pull request #168 from GNS3/listen 
A notification stream with process monitoring.
 2015-05-09 17:15:58 -06:00
Julien Duponchelle
00fa1cc370 Merge branch 'master' into unstable 2015-05-08 14:45:07 +02:00
Julien Duponchelle
ed39afbf3d Throw an error if user put an invalid port range in config file 
Fix #117
 2015-05-06 10:40:51 +02:00
Julien Duponchelle
ee2dada88b Fix tests 2015-05-04 21:29:28 +02:00
Julien Duponchelle
d2d91ebdea Fix temporary project not cleanup with save as 2015-05-04 14:04:57 +02:00
Julien Duponchelle
0dea63c9ea If image is not found in VM directory look in images folder 2015-05-04 10:57:08 +02:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Julien Duponchelle
b3f2a6ac2a Fix tests and build documentation 2015-05-01 11:24:56 +02:00
Julien Duponchelle
359abb0286 Revert "Merge branch 'unstable'" 
This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
 2015-04-30 16:43:30 +02:00
Jeremy
929c337e8b Merge branch 'unstable' 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
 2015-04-29 16:29:45 -06:00
Julien Duponchelle
f8f6f5dc5d Merge branch 'master' into unstable 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
 2015-04-29 14:25:44 +02:00
Julien Duponchelle
bad740d32a Fix test on Linux 2015-04-28 15:31:00 +02:00
Julien Duponchelle
5f6d1bfdd6 Merge branch 'master' into unstable 
Conflicts:
	tests/modules/test_manager.py
 2015-04-28 10:46:59 +02:00
Julien Duponchelle
e7ae1776f4 Final fixes for windows test suite 2015-04-27 23:28:12 +02:00
Julien Duponchelle
3f26ada081 Comment broken test 2015-04-27 23:20:01 +02:00
Julien Duponchelle
77f54848e3 Fix some tests on Windows 2015-04-27 23:12:13 +02:00
Julien Duponchelle
4df95efdec Skip IOU test on Windows 
Fix #159
 2015-04-27 15:09:42 +02:00
Julien Duponchelle
834a554fea Fix VPCS tests 2015-04-27 10:14:46 +02:00
Jeremy
40ce22222e Merge branch 'unstable' into api_list_images 
Conflicts:
	gns3server/handlers/api/iou_handler.py
 2015-04-23 17:19:37 -06:00
Julien Duponchelle
531e95463c Add qemu-kvm to the list of binary 2015-04-20 10:12:17 +02:00
Julien Duponchelle
3926390d30 Fix tests broken by a previous commit 2015-04-18 09:22:37 +02:00
Julien Duponchelle
bca90bc563 API in order to get the list of IOU, Dynamips, Qemu images 2015-04-16 18:32:12 +02:00
Julien Duponchelle
e367f95f96 Drop darwin specific tests 2015-04-15 16:42:26 +02:00
Julien Duponchelle
750958bd12 Fix tests 2015-04-15 14:33:51 +02:00
grossmj
aab4a7243b Merge remote-tracking branch 'origin/master' 2015-04-14 18:21:42 -06:00
Julien Duponchelle
aa2472fb30 Rewrote image search 
This code is more generic and support all cases. Previously
we had bug where the user lost his image path if the image
was not located in image directory.
 2015-04-14 18:46:55 +02:00
grossmj
de5e8f852d Cleaner and generic way to set Qemu & IOU VM settings. 2015-04-12 15:09:37 -06:00
Julien Duponchelle
1c4a059982 Look in old IOU images location in order to smooth transition 
Fix #141
 2015-04-07 15:25:53 +02:00
Julien Duponchelle
7efb7c2978 Do not overwrite initial-config IOU if client send an empty 
Fix #140
 2015-04-06 21:30:57 +02:00
Julien Duponchelle
b46e2cf013 Fix issues with macos X dynamips not freeing UDP port 
Fix #133
 2015-04-03 13:32:07 +02:00
Julien Duponchelle
49f36a83bd Test path with chinese charcaters in Qemu 
Refs #120
 2015-04-01 18:24:36 +02:00
Julien Duponchelle
a3c8201bcc Do not crash if no console port is available for VBox 
I don't know how user manage to fall in this situation.

Fix #127
 2015-04-01 17:59:58 +02:00
Julien Duponchelle
4cd5ec5613 Check name of the VBoxManage executable 
Fix #118
 2015-04-01 17:36:22 +02:00
Julien Duponchelle
026fe3df9b Catch error when qemu additional options are invalid 
Fix #119
 2015-03-31 22:14:08 +02:00
Julien Duponchelle
2e72bc2d3a Fix tests 2015-03-26 17:43:00 +01:00
grossmj
980e63e667 Allocate a random port for Qemu monitor. Fixes issue with pre 1.3 projects. 2015-03-23 22:52:02 -06:00
grossmj
153914bf97 Make sure used ports in a project are cleaned up when closing it. 2015-03-21 17:19:12 -06:00
Julien Duponchelle
253ab4e2b5 PEP8 2015-03-19 17:42:43 +01:00
Julien Duponchelle
ddb8a9f06e Fix an issue in IOU relative path looking 2015-03-19 15:36:06 +01:00
Julien Duponchelle
66cdf39ea2 Support uploading iourc 2015-03-17 16:31:45 +01:00
Julien Duponchelle
bcb1ce02ab Refactor config management in tests 2015-03-16 15:03:41 +01:00
Julien Duponchelle
e54649accd Fix dynamips tests 2015-03-16 14:42:00 +01:00
Julien Duponchelle
c05edfe415 Fix test manager 2015-03-16 12:08:23 +01:00
Julien Duponchelle
cf247a9301 Fix iou tests and add tests 2015-03-16 11:52:22 +01:00
grossmj
6d56da03e5 Fixes tests. 2015-03-14 13:16:27 -06:00
grossmj
4f7b896a6a Fixes tests. 2015-03-11 23:09:01 -06:00
Julien Duponchelle
1b68a54234 Look for qemu images in ~/GNS3/images 2015-03-07 11:56:51 +01:00
Jeremy
ee578d3c12 Fixes Qemu networking. 2015-03-06 20:08:00 -07:00
Julien Duponchelle
e37392c482 Correctly recover id when closing VMS 
Fixes #91
 2015-03-06 15:48:16 +01:00
Julien Duponchelle
3407ba802e Rename vlan dat file for IOU 2015-03-05 17:00:25 +01:00
Julien Duponchelle
80fd857658 Fix tests 2015-03-03 14:37:34 +01:00
Julien Duponchelle
a9afaa028c Garbage collect VM when closing a project 2015-03-02 17:17:28 +01:00
Julien Duponchelle
66860655b9 If a VM is already loaded, we return a VM instead of creating it twice 
Partial fix for #81
 2015-03-02 15:35:36 +01:00
Julien Duponchelle
914ea0326c Fix tests 2015-03-02 15:26:57 +01:00
Julien Duponchelle
aa40e6097e Fix tests 2015-02-26 10:45:37 +01:00
Jeremy
0eaad579c2 IOU + VirtualBox conversion of old projects. 2015-02-25 18:55:35 -07:00
Julien Duponchelle
f12d3f07f7 Drop the old -files in the project 2015-02-25 18:23:41 +01:00
Julien Duponchelle
8434a286b6 Fix IOU old project import 
Fixes #69
 2015-02-25 16:35:13 +01:00
Julien Duponchelle
818676ce5e Support relative path in iou 2015-02-25 16:26:17 +01:00
Julien Duponchelle
4ea25739e5 Correctly check if qemu is running 
Fixes #71
Related to #70
 2015-02-25 15:46:05 +01:00
Jeremy
3d3300e83a Rename console methods in port manager to use the generic tcp term in the name. 
Fixes bug when a console port is allocated to a Ghost VM instance and not released.
Warnings at exit when TCP/UDP ports are still allocated.
 2015-02-23 17:42:55 -07:00
Julien Duponchelle
4d1f08c96e Turn off Qemu graphics if no display is available 
Fixes #66
 2015-02-23 20:21:00 +01:00
Julien Duponchelle
cecf2f5014 Async qemu monitor reading 2015-02-21 00:15:56 +01:00
Julien Duponchelle
71357fa7ab Fix tests 2015-02-20 17:45:27 +01:00
Julien Duponchelle
8aa5514890 Qemu binary list 2015-02-20 14:39:13 +01:00
Julien Duponchelle
48f5c7c8b3 All params for qemu 2015-02-19 20:22:30 +01:00
Julien Duponchelle
d0244824bf Get a working Qemu handler. Next step add all parameters 2015-02-19 19:43:45 +01:00
Julien Duponchelle
b03b9226ff So we have running code for a qemu module 
Now the handlers. The telnet code is not yet async
 2015-02-19 16:46:57 +01:00
Julien Duponchelle
d65617657c Fix old project directories renames 2015-02-18 16:13:09 +01:00
Julien Duponchelle
dd1833c4f0 iourc_path is set from server settings file 2015-02-17 16:40:45 +01:00
Julien Duponchelle
57348d0508 Better organisation of the API documentation 2015-02-17 10:37:09 +01:00
Julien Duponchelle
6c3a926ce3 Capture is OK on server side 2015-02-16 20:08:04 +01:00
Julien Duponchelle
ff7f014423 Fix test 2015-02-16 19:14:45 +01:00
Julien Duponchelle
15f89776d3 All current iou code is async 2015-02-16 17:20:07 +01:00
Julien Duponchelle
605afa1d33 Fix bad execption name in IOU 2015-02-16 10:05:54 +01:00
Julien Duponchelle
e082cd8b1a Update the remote IOU initial config 2015-02-13 22:16:43 +01:00
Julien Duponchelle
83edc649d2 Rename NVRAM to the correct application id before start the server 2015-02-13 20:57:20 +01:00
Julien Duponchelle
68427eaddf Auto PEP8 cleanup 2015-02-13 14:43:28 +01:00
Julien Duponchelle
ebc214d6fa Fix tests and rename path to iou_path 2015-02-12 22:29:33 +01:00
Julien Duponchelle
2e99ef69a9 Modules support start iou process (not ioucon and iouyap) 2015-02-12 22:29:32 +01:00
Jeremy
79a57ca420 New Dynamips integration part 3 2015-02-11 19:21:34 -07:00
Julien Duponchelle
a6da2406a0 Fix tests 2015-02-10 17:24:38 +01:00
Julien Duponchelle
e1a80a9fab Remove debug 2015-02-09 19:58:23 +01:00
Julien Duponchelle
b31af0abcd Sub directory project-files 2015-02-09 11:26:42 +01:00
Julien Duponchelle
571044b3e8 Fix server close tests 2015-02-06 11:31:54 +01:00
Julien Duponchelle
5c3969ae79 Fix tests creating garbage project in ~/GNS3/project 2015-02-06 11:15:27 +01:00
Julien Duponchelle
5a0c224292 Allow user to change project path on local server 2015-02-05 17:52:37 +01:00
Julien Duponchelle
41a8872819 Refactor VPCS script file loading 
This allow to support moving the project on disk
 2015-02-05 14:20:01 +01:00
Julien Duponchelle
dae48b2de4 Update temporary status if project change location 
This avoid race condition during file move.
 2015-02-05 11:44:51 +01:00
Jeremy
b680138073 Merge remote-tracking branch 'origin/asyncio' into asyncio 
Conflicts:
	gns3server/modules/project.py
	tests/modules/test_project.py
 2015-02-04 13:52:46 -07:00
Jeremy
1bea78194c Explicit ID names, remove {uuid} from URLs and add vms in URLs for VMs. 2015-02-04 13:48:29 -07:00
Julien Duponchelle
c5c219ffe1 Allow modification of path from the client 2015-02-04 21:17:00 +01:00
Julien Duponchelle
2ace014a3c Cleanup old temporary project at startup 2015-02-04 17:18:53 +01:00
Jeremy
d2699f051d Change URL for projects: /project becomes /projects and project_id is used instead of uuid. 2015-02-03 18:23:11 -07:00
Julien Duponchelle
aeb83a7945 Support %h in VPCS config file 2015-02-03 21:48:20 +01:00
Jeremy
d199778745 Fixes tests. 2015-02-02 19:41:26 -07:00
Jeremy
22369ade49 Rename port_id to port_number for VPCS and adapter_id for VirtualBox to avoid confusion. 2015-01-31 12:01:23 -07:00
Julien Duponchelle
8bc26420b7 If not script file is setted we use the default from VPCS 2015-01-30 14:57:25 +01:00
Julien Duponchelle
df8bdcc152 Catch exceptions from rmtree 2015-01-26 13:54:44 +01:00
Julien Duponchelle
4518404706 Run rmtree in a different thread 2015-01-26 12:10:30 +01:00
Julien Duponchelle
70faf76c10 PEP8, documentation update, test fix 2015-01-26 09:36:26 +01:00
Jeremy
ff63530f52 Get all available VirtualBox VMs on the server. 2015-01-23 17:57:54 -07:00
Jeremy
499a8f10ae Update tests. 2015-01-23 16:38:59 -07:00
Julien Duponchelle
8e249b670d Set a location by default 2015-01-23 17:39:17 +01:00
Julien Duponchelle
017c5ac9f6 Allow changing location only for local usage 2015-01-23 16:58:14 +01:00
Julien Duponchelle
abc885049f Temporary project 2015-01-23 16:02:26 +01:00
Julien Duponchelle
7bf121c6da When we remove a VM, the VM is removed from the project. 2015-01-23 14:37:21 +01:00
Julien Duponchelle
3f5c2390cd Close a project 2015-01-23 14:07:10 +01:00
Julien Duponchelle
986a7f55ef Delete a project 2015-01-23 11:48:20 +01:00
Julien Duponchelle
9a0b260c56 Small change in order to avoid a PEP8 warning 2015-01-23 11:30:49 +01:00
Julien Duponchelle
f97c2b2cbe Delete a VM, mark it as destroyable 2015-01-23 11:28:58 +01:00
Jeremy
05c0efe39b More VirtualBox work. 2015-01-22 19:07:09 -07:00
Jeremy
d9b02efbfa Rename destroy to close or unload (more friendly). 2015-01-22 19:06:17 -07:00
Jeremy
2681defe27 Moves NIO creation to the base manager. 2015-01-22 18:04:24 -07:00
Julien Duponchelle
2c50bb607f VPCS Mac address / project 2015-01-22 18:47:27 +01:00
Julien Duponchelle
6644c640db Attribute mac address 2015-01-22 16:12:21 +01:00
Julien Duponchelle
e12e6044dc Delete VPCS 2015-01-22 11:34:10 +01:00
Julien Duponchelle
8d3ea60404 VPCS reload 2015-01-22 10:55:11 +01:00
Jeremy
1a43ff118c Fix tests and clean. 2015-01-21 19:30:24 -07:00
Julien Duponchelle
97cefa23fb Move fixtures to conftest 2015-01-21 22:32:33 +01:00
Julien Duponchelle
f3e07d5ad9 Fix random failure related to ports 2015-01-21 22:21:01 +01:00
Julien Duponchelle
ef4ecbfb6a Improve VPCS port change test 2015-01-21 22:09:52 +01:00
Julien Duponchelle
368d1ff70b Update VPCS instance 2015-01-21 21:46:16 +01:00
Julien Duponchelle
87a089457f Update script file 2015-01-21 16:43:34 +01:00
Julien Duponchelle
f99538ccef Cleanup test 2015-01-21 15:50:35 +01:00
Julien Duponchelle
df31b2ad5a Fix project path 2015-01-21 11:33:24 +01:00
Julien Duponchelle
fc66e4592a VPCS is trully async 2015-01-20 23:27:28 +01:00
Julien Duponchelle
984d47f9c8 Test work without vpcs binary 2015-01-20 22:50:26 +01:00
Julien Duponchelle
f2289874af Raise exception if we try to reserve an already reserve port 2015-01-20 20:09:20 +01:00
Julien Duponchelle
bbee5f90a0 Yet another PEP 8 :) 2015-01-20 16:37:18 +01:00
Julien Duponchelle
db41076ce5 Use the project working directory for VPCS VM 2015-01-20 14:31:47 +01:00
Julien Duponchelle
7f185663d1 VPCS Device => VPCS VM 2015-01-20 13:12:26 +01:00
Julien Duponchelle
68d0e5f42d PEP8 2015-01-20 13:04:20 +01:00
Julien Duponchelle
0695e75e77 Fix tests 2015-01-20 12:46:15 +01:00
Julien Duponchelle
927e6b540d Fix tests 2015-01-20 09:58:58 +01:00
Julien Duponchelle
f0094cc0d0 Project Manager 2015-01-19 17:07:32 +01:00
Julien Duponchelle
240d83411c Create a project entity 2015-01-19 16:23:41 +01:00
Julien Duponchelle
7de95cd60a Fix tests 2015-01-19 11:28:51 +01:00
Julien Duponchelle
73a481e510 Refactor port manager 2015-01-19 11:22:24 +01:00
Julien Duponchelle
77db08c39e Remove NIO from VPCS 2015-01-16 21:39:58 +01:00
Julien Duponchelle
8e307c8cbb Use PATH environnement variable for searching binary 2015-01-16 20:23:43 +01:00
Julien Duponchelle
0cdc1c3042 VCPS create NIO work and tested 2015-01-16 16:20:10 +01:00
Julien Duponchelle
c1ef406311 A basic implementation of port manager 2015-01-15 16:59:01 +01:00
Julien Duponchelle
3abcac43ab Test the stop method 2015-01-15 14:27:33 +01:00
Julien Duponchelle
6bb2b88f1a It's was hard but i have finally a beginning of test for start VPCS 2015-01-15 13:02:43 +01:00
Julien Duponchelle
6c35cc304e Dirty stop start for VPCS 2015-01-14 18:52:02 +01:00