arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Code Issues Releases Wiki Activity
2,076 Commits 5 Branches 203 Tags 151 MiB
3c9e8507d1
Commit Graph

582 Commits

Author SHA1 Message Date
Julien Duponchelle
8c1560332e
Remove /controller from the api endpoint 2016-03-11 17:16:09 +01:00
Julien Duponchelle
e3580d52c3
Dummy link api documentation 2016-03-11 17:02:50 +01:00
Julien Duponchelle
abdda4d3b3
Link API (do nothing for the moment) 2016-03-11 16:51:35 +01:00
Julien Duponchelle
6fad82c61d
Rebuild documentation 2016-03-11 15:49:28 +01:00
Julien Duponchelle
7d0b780dcc
Documentation 2016-03-11 15:21:21 +01:00
Julien Duponchelle
be4aa41dda
Create VPCS VM on controller 2016-03-11 15:06:14 +01:00
Julien Duponchelle
4326d412f9
API for creating a VM 2016-03-10 21:51:29 +01:00
Julien Duponchelle
58f1abff35
Close, commit and delete supported for projects in controller 2016-03-10 10:32:07 +01:00
Julien Duponchelle
3296b97f59
Rename modules => hypervisor 2016-03-08 16:12:46 +01:00
Julien Duponchelle
6fa2491255
Rename /controller/servers to /controller/hypervisors 2016-03-08 16:04:12 +01:00
Julien Duponchelle
8114c1d4be
Return just version number for API /v1/version for compatibility 2016-03-07 18:17:24 +01:00
Julien Duponchelle
b2ce7ee8d7
API V2 2016-03-07 17:57:12 +01:00
Julien Duponchelle
664cec97ba
Create /hypervisor and /controller namespace 2016-03-07 15:01:35 +01:00
Julien Duponchelle
e4b12f49d1
Build doc support controller 2016-03-04 17:50:17 +01:00
Julien Duponchelle
0921df520c
Return controller version as server version (temporary) 2016-03-04 16:58:53 +01:00
Julien Duponchelle
0532b4de8a
Fix logging issues with the controller 2016-03-04 16:55:59 +01:00
Julien Duponchelle
4d77b2918e
Raise an error if server flagged as local but should not 
If the controller is not started with --local but the server ID
is local it's raise an error.
 2016-03-04 16:11:31 +01:00
Julien Duponchelle
ee4b094160
Fix tests on @ehlers Docker init patch 2016-03-04 09:08:40 +01:00
Julien Duponchelle
aad69e9650
Create a /server API for register servers 
This allow to push to the controller information about
the connection to a server.
 2016-03-03 16:05:09 +01:00
Julien Duponchelle
84eb8356e8
Create a container class and a flag for enable it from command line 
Ref #417
 2016-03-02 09:49:52 +01:00
Julien Duponchelle
eae6f33e29
Inject an init script 
It's very basic for the moment

Ref #1089
 2016-03-01 18:38:03 +01:00
Julien Duponchelle
59c1e125d3
Change the name of veth to avoid bugs :( 
Fun stuff the name create different behavior with
network manager.

Ref #440
 2016-03-01 15:33:30 +01:00
Julien Duponchelle
dab1b26569
Aux console for Docker 
Fix https://github.com/GNS3/gns3-gui/issues/1039
 2016-03-01 14:53:43 +01:00
Julien Duponchelle
03ffce0a75
Docker VNC support 
Ref https://github.com/GNS3/gns3-gui/issues/947
 2016-02-29 23:09:47 +01:00
Julien Duponchelle
9d28f4c0c3
Refactor aux port allocation 
This move the allocation of aux port to the base vm.
Also now the free of console port during the close is in the
base VM.

An aux port is allocated to the docker container but not used
for the moment.

Ref https://github.com/GNS3/gns3-gui/issues/1039
 2016-02-29 10:44:08 +01:00
Julien Duponchelle
c333e9451f
Fix pull of images 
Fix #445
 2016-02-24 17:08:28 +01:00
Julien Duponchelle
2d42f32d71
Restart the container if running and you change the hostname 
Fix #439
 2016-02-24 15:47:53 +01:00
Julien Duponchelle
057b637961
Set the hostname for docker containers 
Fix #437
 2016-02-23 19:22:35 +01:00
Julien Duponchelle
f35c742b07
Avoid consuming 100% of CPU when stopping docker container 
Fix #427
 2016-02-19 17:53:17 +01:00
Julien Duponchelle
f4f9e6eba6
Fix Docker has returned an error: 500 b'No command specified' 
Fix #433
 2016-02-19 17:01:28 +01:00
Julien Duponchelle
7aedfc92fa
Fix test 2016-02-17 10:37:22 +01:00
Julien Duponchelle
01e2fcf225
Fix docker console port lost during update 
Fix https://github.com/GNS3/gns3-gui/issues/1026
 2016-02-12 16:38:16 +01:00
Julien Duponchelle
1532b3ed9b
Support for mounting volumes 
Fix #425
 2016-02-12 11:57:56 +01:00
Julien Duponchelle
9b0088728f
Catch docker namespace error 
Fix #424
 2016-02-11 15:49:28 +01:00
Julien Duponchelle
5a8408cdb9
Fix a crash in Travis tests 
Fix #422
 2016-02-10 17:14:14 +01:00
Julien Duponchelle
a7ec224b6d
Docker capture and refactor common capture code 
Fix https://github.com/GNS3/gns3-gui/issues/891
 2016-02-09 16:07:33 +01:00
Julien Duponchelle
89e86b7778
Create veth for docker even if link is not connected 
Fix #406
 2016-02-09 14:22:37 +01:00
Julien Duponchelle
f6fb0623be
Merge branch 'master' into 1.5 2016-02-08 13:14:30 +01:00
Julien Duponchelle
373113545f
Code cleanup 2016-02-05 10:07:13 +01:00
Julien Duponchelle
5bee927481
Disallow creating project with " in the path 
It's not supported by dynamips.

Fix https://github.com/GNS3/gns3-gui/issues/987
 2016-02-04 11:47:48 +01:00
Jeremy Grossmann
3e4423f663 Merge pull request #418 from GNS3/no_spice 
Do not list qemu binary with -spice in the name
 2016-02-03 13:45:03 -08:00
Julien Duponchelle
537122daba
Do not list qemu binary with -spice in the name 
It's create confusion and you can enable spice with the -spice
options.

Fix https://github.com/GNS3/gns3-gui/issues/981
 2016-02-03 16:40:39 +01:00
Julien Duponchelle
fd22cd8361
Send command line used to start the VM to client 
Add a command_line attribute to the VM object with
the command line used to start the VM.

Now /start return the object in order to get
this new attribute. And the HTTP status code
is 200 instead of 204 because 204 disallow body.

Support:
* Qemu
* Dynamips
* IOU

Ref https://github.com/GNS3/gns3-gui/issues/513
 2016-02-02 18:25:17 +01:00
Julien Duponchelle
03414993dc
Merge branch 'master' into 1.5 2016-02-01 15:47:46 +01:00
Julien Duponchelle
29089f1884
Cleanup an old kvm-ok test 2016-01-28 17:54:29 +01:00
Julien Duponchelle
889ea14973
For topologies before 1.4 manage qemu missing 
If qemu is missing for topologies before 1.4 we try
to search it in the path.

Ref #921
 2016-01-28 16:24:24 +01:00
Julien Duponchelle
58b998600e Send machine stats via the notification stream 
Fix #252
 2016-01-26 16:35:00 +01:00
Julien Duponchelle
119a2a3b66 Add test for unicode char in images path 
Ref #401
 2016-01-26 15:32:40 +01:00
Julien Duponchelle
ee2104ba35 Check for /dev/kvm instead of kvm-ok 
Fix #411
 2016-01-26 13:58:29 +01:00
Julien Duponchelle
5617ddc4cc Show a warning when starting ASA8 2016-01-22 19:46:05 +01:00
Julien Duponchelle
c280fd5fb8 Merge branch 'master' into 1.5 2016-01-20 17:10:59 +01:00
Julien Duponchelle
8225bad76b Fix usage of qemu 0.10 on Windows 
Fix #392
 2016-01-14 17:40:58 +01:00
Julien Duponchelle
5db1f6b2f7 Fix a test related to docker 2016-01-11 19:14:45 +01:00
Julien Duponchelle
758fb2a0e7 adapter_remove_nio_binding is a coroutine for all device type 
It's cleaner
 2016-01-11 15:19:15 +01:00
Julien Duponchelle
5a28b9409a Fix Crash at startup when docker is not installed 
Fix #384
 2016-01-06 15:13:22 +01:00
Julien Duponchelle
1f756c0d4f Merge branch '1.4' into 1.5 2016-01-06 14:35:48 +01:00
Julien Duponchelle
d184b65800 Improve PR #386 
* Add more test
* Check to kvmi-ok is asynchronous
 2016-01-04 16:30:06 +01:00
Julien Duponchelle
439a0c80d6 Another fix for docker tests 2016-01-04 09:36:24 +01:00
Julien Duponchelle
fd0fb97204 Fix test 2016-01-04 09:28:12 +01:00
Vasil Rangelov
d00efbfb0f Adds a handler for getting the Qemu related capabilities of the server. Currently includes just a check for KVM architectures. 2016-01-03 19:38:16 +02:00
Jeremy Grossmann
8cf55166cb Merge pull request #379 from GNS3/docker_cleanup 
Docker cleanup and improvements
 2015-12-24 14:56:24 -08:00
Julien Duponchelle
61cf91d83c Fix tests on Windows 
Fix #377
 2015-12-22 13:16:30 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
286cd7a3ac A debug status page embed in the server 2015-12-18 14:38:26 +01:00
Julien Duponchelle
480ca037cd Fix test on Windows 
Sadly python crash on my Windows and I can't run the full test
suite.

Fix #377
 2015-12-14 16:06:51 +01:00
Julien Duponchelle
ad4501838b Merge branch 'master' into unstable 2015-12-11 14:35:08 +01:00
grossmj
55034dd24f Update links for new website. 2015-12-10 15:00:16 -07:00
Julien Duponchelle
2aaad4749b Replace by another TCP port if port is already used 
Another version of #370

This time we replace a free TCP port if port is used and raise
a warning to the user.
 2015-12-07 12:26:46 +01:00
Julien Duponchelle
5b347fe48f Raise error if server received windows path 2015-11-12 15:38:47 +01:00
Julien Duponchelle
3f4da9050c Support VPCS 0.6.1 2015-11-11 21:57:58 +01:00
Julien Duponchelle
63edcc1c34 Fix duplicate of -no-kvm options 
Fix #356
 2015-11-10 16:25:02 +01:00
Julien Duponchelle
caade47e16 Fix tests about images paths security 2015-11-10 15:21:10 +01:00
Julien Duponchelle
390c88d7cd Raise an error if user send a non local path to remote server 2015-11-09 19:02:10 +01:00
Julien Duponchelle
669295131b Fix qemu tests on Linux 2015-11-09 15:01:02 +01:00
Julien Duponchelle
ab4c8665e4 Fix backup projects and a qemu broken tests 2015-11-09 14:17:19 +01:00
Julien Duponchelle
da240f21ba Apply pep8 fix 2015-11-09 12:28:00 +01:00
Julien Duponchelle
f01a6dcaaf Fix qemu tests 2015-11-09 12:23:50 +01:00
Julien Duponchelle
1248584841 Cleanup unused and duplicates 2015-11-09 12:14:25 +01:00
Julien Duponchelle
58d2a5d4b0 Support VPCS 0.6.1 
Fix #347
 2015-11-09 10:26:16 +01:00
grossmj
c3e99bfc1d Drop netifaces (replaced by psutil). Fixes #344. 2015-11-08 13:34:27 -07:00
Julien Duponchelle
6fbc84c0dc Return relative path for dynamips images 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:47:37 +01:00
Julien Duponchelle
7ee12edb5c Fix add existing IOS not working 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:28:11 +01:00
Julien Duponchelle
f1e9262c94 Avoid test crash if GNS3 is running on the same computer 2015-11-03 21:06:30 +01:00
Julien Duponchelle
7967a922bc Merge branch 'master' into unstable 2015-11-03 12:39:01 +01:00
Julien Duponchelle
bd54c55ae1 Fix minor errors reported by codacy.com 2015-11-03 12:34:22 +01:00
Julien Duponchelle
69c38c6414 Use pytest 2.8 so it's work with Python 3.5 without warning 2015-11-02 16:35:12 +01:00
Julien Duponchelle
6edb41ded7 Merge branch 'master' into unstable 2015-10-30 15:17:17 +01:00
Julien Duponchelle
42c8fb7c29 Raise an error when you use a port outside the ranges 
Fix #739
 2015-10-30 15:15:28 +01:00
Julien Duponchelle
c2a08a391c Fix crash in IOU config export 
Fix #335
 2015-10-21 14:28:39 +02:00
Julien Duponchelle
d979f08c93 Update api documentation 2015-10-16 19:05:29 +02:00
Julien Duponchelle
504a4af4ab Enforce console port for VNC 
Ref https://github.com/GNS3/gns3-gui/issues/721
 2015-10-16 18:16:07 +02:00
Julien Duponchelle
c50c735e86 Merge branch 'master' into unstable 2015-10-07 13:51:28 +02:00
Julien Duponchelle
acd5c992ba Fix Dynamips identifier is already used by another router 
Fix #327
 2015-10-07 13:50:40 +02:00
Julien Duponchelle
9b740e85d0 Fix Dynamips identifier is already used by another router 
Fix #327
 2015-10-07 11:34:27 +02:00
Julien Duponchelle
5e3ce48a52 Merge branch 'master' into unstable 2015-10-06 19:19:56 +02:00
Julien Duponchelle
3d7d8682ee OVA file support 2015-10-06 17:50:54 +02:00
Julien Duponchelle
034ac392b7 Support listing images in subdirectories 
It's a part of the OVA support:
https://github.com/GNS3/gns3-gui/issues/700
 2015-10-05 11:07:15 +02:00
Julien Duponchelle
bfe9c117ba Fix tests 2015-10-05 09:14:55 +02:00
grossmj
47abba3c9c Fixes tests. 2015-09-14 15:16:54 -06:00
Julien Duponchelle
c16d237176 Fix test 2015-09-04 09:13:57 +02:00
Julien Duponchelle
986ab649d7 Fix project not closing 
Fix #303
 2015-09-03 16:46:34 +02:00
Julien Duponchelle
d853ffe791 Change the way we look for Qemu path 
Fix #302
 2015-08-27 18:27:17 +02:00
Julien Duponchelle
fea7a8a9ab Fix Qemu cannot be used on Windows 
Fix #291
 2015-08-26 13:47:12 +02:00
Julien Duponchelle
796ca86df9 Fix random failures in tests on OSX and Windows 2015-08-25 10:13:49 +02:00
Julien Duponchelle
55f7c79918 Explicit set qemu memory as MB 2015-08-07 17:03:06 +02:00
Julien Duponchelle
323674ba5c Turn off KVM for non x86 architectures 
Fix #289
 2015-08-07 16:49:45 +02:00
Julien Duponchelle
8b46a1a4ab Fix tests 2015-08-07 09:21:09 +02:00
Julien Duponchelle
dbc4f05465 Fix tests 2015-08-03 12:10:36 +02:00
Julien Duponchelle
e92d9ca5ff Raise error if qemu image already exist when creating disk 2015-07-28 16:15:01 +02:00
Julien Duponchelle
54448ab936 Prevent user to create a qemu to a different directory on non local 
server
 2015-07-28 16:07:13 +02:00
Julien Duponchelle
5b0c36c0d6 API for creating a qemu disk image 2015-07-27 19:18:36 +02:00
Julien Duponchelle
5d8c90d138 Rename qemu image type to qemu image format 2015-07-27 17:32:27 +02:00
Julien Duponchelle
b94a4e2308 Add code for creating qemu image on server side 
Ref https://github.com/GNS3/gns3-gui/issues/558
 2015-07-27 16:27:14 +02:00
Julien Duponchelle
c3c971921d Update documentation 2015-07-24 10:15:15 +02:00
Julien Duponchelle
d9f1a7c7d3 API for listing current projects 
Fix #274
 2015-07-24 10:09:16 +02:00
Julien Duponchelle
cbe593f4a4 Fix virtualbox test crash on Linux 2015-07-23 12:06:35 +02:00
Julien Duponchelle
cbc859a03b Merge remote-tracking branch 'origin/master' into unstable 2015-07-23 11:35:15 +02:00
Julien Duponchelle
3f25bfcb27 Fix qemu tests 2015-07-23 10:46:43 +02:00
Julien Duponchelle
fc14deee1b Restore images & projects tarballs 2015-07-21 16:14:03 +02:00
Julien Duponchelle
270017d945 Allow user to backup projects and images 2015-07-21 14:20:58 +02:00
Julien Duponchelle
c3eb6a440f Fix vmware and interfaces tests 2015-07-09 16:12:33 +02:00
Julien Duponchelle
a461cb71c6 Allow to send the iourc when starting the VM 
Ref https://github.com/GNS3/gns3-server/issues/255
 2015-07-09 16:06:52 +02:00
Julien Duponchelle
dd6c377b15 Fix test on Linux 
Fix #258
 2015-07-09 15:39:14 +02:00
Julien Duponchelle
33d6fbde21 Fix server tests 2015-07-05 21:14:05 +02:00
Julien Duponchelle
e93f1330b8 Fix dynamips tests 2015-07-03 10:47:30 +02:00
Julien Duponchelle
1f116fc992 Fix tests 2015-07-03 10:43:48 +02:00
Julien Duponchelle
3b3929803b Force turn off KVM for the CI 2015-06-26 17:13:32 +02:00
Julien Duponchelle
6e3ebb714d Return vm_directory for VirtualBox and VMware 
Fix #246
 2015-06-26 17:09:19 +02:00
Julien Duponchelle
feefb075d4 Make the qemu event crash more future proof 2015-06-26 15:10:41 +02:00
Julien Duponchelle
e8805d3fdc When a qemu VM crash send the log to the client. 
Fix #243
 2015-06-26 14:41:58 +02:00
Julien Duponchelle
3bb1509f41 Fix the tests after the removal of the KVM flag from VM 2015-06-25 09:54:42 +02:00
Julien Duponchelle
2b36746d52 Return the working directory of a Qemu VM 2015-06-25 09:53:16 +02:00
Julien Duponchelle
a8e69d9a0b Do not use the md5 from cache for a missing image 2015-06-19 16:36:25 +02:00
Julien Duponchelle
4aadfa3b67 Test all IOU requirements at VM startup 
This allow user to create the node and upload the image after
 2015-06-19 16:35:19 +02:00
Julien Duponchelle
a577fe9fdb Make VMX reading case insensitive 
Fix #237
 2015-06-18 16:28:13 +02:00
Julien Duponchelle
f041697311 Compute a md5sum of images for futur purpose 
Fix #234
 2015-06-17 17:11:25 +02:00
Julien Duponchelle
04aac2f3dc Convert old -enable-kvm to kvm settings for Qemu 
Fix #233
 2015-06-12 09:40:38 +02:00
Julien Duponchelle
04e62e429c Merge branch 'master' into unstable 2015-06-11 16:55:09 +02:00
Julien Duponchelle
07eab6e766 Fix tests 2015-06-11 09:18:02 +02:00
Julien Duponchelle
2da0b36ee7 Support a platform parameter for Qemu 
I'm sure we will discover a distribution with a different
naming conventions...

Fix #220
 2015-06-10 15:49:24 +02:00
Julien Duponchelle
fb79543342 Build documentation 2015-06-10 14:35:53 +02:00
Julien Duponchelle
b0fb2fcc6d Fix test 2015-06-10 14:33:44 +02:00
Julien Duponchelle
b36c5f25d2 Improve memory consumption of file upload with the HTML form 
Fix #86
 2015-06-10 14:20:06 +02:00
Julien Duponchelle
7c7f8fe3ed Fix ethernet interfaces tests if eth0 doesn't exists 
Also on Windows and MacOS it return error if we try
to use a non existing interfaces.

Fix #230
 2015-06-09 16:35:21 +02:00
Julien Duponchelle
525940ee15 Add a stupid is_interface_up test in order to see why it's crash on 
travis

Related to #230
 2015-06-09 09:56:08 +02:00
Julien Duponchelle
352fa3480b Fix qemu tests on travis 2015-06-09 09:55:51 +02:00
Julien Duponchelle
669ec42985 Add a test for KVM support 2015-06-09 09:28:39 +02:00
grossmj
ca331ae2a5 Import/Export support for IOU nvrams. 2015-06-06 15:15:03 -06:00
Julien Duponchelle
a1204dca0a Merge branch 'master' into unstable 2015-06-03 18:34:46 +02:00
Julien Duponchelle
b344def887 Fix crash when virtualbox list of VMS return an empty line 
Fix #206
 2015-06-03 11:59:53 +02:00
Julien Duponchelle
a79249aa9e Fix tests after merge 2015-05-28 12:05:19 +02:00
Julien Duponchelle
9442042d7a Merge branch 'master' into unstable 2015-05-28 12:04:01 +02:00
Vasil Rangelov
9ef4628cbc Added a method for getting qemu-img binaries, and moved the qemu folder into a separate method. 2015-05-28 00:11:36 +03:00
Julien Duponchelle
8abf22ef24 Skip network interfaces on Travis 2015-05-27 16:45:39 +02:00
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
4216724d0b Give a reason for travis skip test 2015-05-26 12:00:13 +02:00
Julien Duponchelle
117630c887 Test ok on Windows 2015-05-26 11:55:30 +02:00
Julien Duponchelle
c03c66ec48 Fix tests crash on travis 2015-05-26 11:35:06 +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
24e84a3dd8 Test interfaces (it seem it's crash on Travis) 2015-05-26 10:05:53 +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
f8d95291fa Test interfaces (it seem it's crash on Travis) 2015-05-21 10:45:07 +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
Julien Duponchelle
bb4ebbfe64 Upload images API 
Conflicts:
	requirements.txt
	setup.py
 2015-05-10 21:06:31 +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
Jeremy Grossmann
4f021054e0 Merge pull request #158 from GNS3/keep_iou_config 
Do not erase the IOU initial-config if there is one when creating the IOU VM.
 2015-04-27 18:37:17 -06: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
bf3444933e Fix test qemu now raise 409 if nio_ethernet 2015-04-27 22:54:24 +02:00
Julien Duponchelle
324a4f73d0 Do not erase the IOU config 2015-04-27 18:22:54 +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
8b879c0614 Support wireshark remote capture 2015-04-20 19:27:07 +02: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