1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Commit Graph

581 Commits

Author SHA1 Message Date
Julien Duponchelle
d7ed37ce02
Update and delete VM on controller 2016-04-18 17:36:38 +02:00
Julien Duponchelle
6c11ad5fa6
Reload VM 2016-04-18 16:57:02 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00
Julien Duponchelle
2055cdea5e
/start /stop and /suspend API for VM via container 2016-04-12 18:02:36 +02:00
Julien Duponchelle
ad7ca86f32
Fix 1.5 merge 2016-04-12 16:21:35 +02:00
Julien Duponchelle
6b61811f9d
Merge branch '1.5' into 2.0 2016-04-12 16:14:37 +02:00
Julien Duponchelle
b7a859fa30
Import / Export with images
Ref https://github.com/GNS3/gns3-gui/issues/1173
2016-04-12 10:11:45 +02:00
Julien Duponchelle
cd393491d5
At export use only relative image path
Fix https://github.com/GNS3/gns3-gui/issues/1176
2016-04-11 17:18:03 +02:00
Julien Duponchelle
f6d0971f15
Fix tests 2016-04-11 16:57:59 +02:00
Julien Duponchelle
9e8fcab65c
Merge branch '1.5' into 2.0 2016-04-08 17:40:27 +02:00
Julien Duponchelle
2109fd4f4d
Test docker resolution 2016-04-07 14:33:04 +02:00
Julien Duponchelle
977ccabf98
Server support for VNC console resolution
Ref https://github.com/GNS3/gns3-gui/issues/1165
2016-04-07 13:29:11 +02:00
Jeremy Grossmann
6bc54b17c7 Merge pull request #481 from GNS3/import_linux
Flatten the project at export and support import for Linux
2016-04-06 11:55:46 -06:00
Jeremy Grossmann
bb63f51f80 Merge pull request #478 from GNS3/qcow2_rebase
Qcow2 rebase
2016-04-06 11:55:06 -06:00
Julien Duponchelle
9b9eddb30c
Fix VNC broke after container update
Fix https://github.com/GNS3/gns3-gui/issues/1163
2016-04-06 14:57:52 +02:00
Julien Duponchelle
e564c84529
Flatten the project at export and support import for Linux
The client will send a flag to say if the import should be done
on the VM or not

Ref https://github.com/GNS3/gns3-gui/issues/1151
2016-04-06 12:08:00 +02:00
Julien Duponchelle
9ed15e55af
Move more import code to the server
https://github.com/GNS3/gns3-gui/issues/1156
2016-04-05 18:32:48 +02:00
Julien Duponchelle
2651a48102
Fix the docker aux port is lost after an update
Fix https://github.com/GNS3/gns3-gui/issues/1155
2016-04-05 16:33:40 +02:00
Julien Duponchelle
57394dfebf
Rebase the qcow2 when starting the VM if needed
Ref #466
2016-04-05 12:41:26 +02:00
Julien Duponchelle
7422b31b2c
Refactor code for avoid duplicate in disk management for Qemu 2016-04-05 12:35:07 +02:00
Julien Duponchelle
06b9e46cd2
Create Qcow2 class for reading Qcow2 and rebase it
Ref #466
2016-04-05 12:20:37 +02:00
Julien Duponchelle
3b04f556b3
In the export rename the .gns3 to project.gns3 2016-03-30 17:56:55 +02:00
Julien Duponchelle
bd71f0cf4c
Import API 2016-03-30 17:42:00 +02:00
Julien Duponchelle
879591eaf5
Export API 2016-03-30 17:42:00 +02:00
Julien Duponchelle
f39af9deb7
Fix tests 2016-03-30 17:41:37 +02:00
Julien Duponchelle
c563dbba8a
Change default port to 3080
Fix #487
2016-03-25 15:31:17 +01:00
Julien Duponchelle
2a20333877 Merge pull request #461 from GNS3/ehlers-docker-init
Support /etc/network/interfaces
2016-03-25 11:34:05 +01:00
Julien Duponchelle
23c48f5e3d
Add to project an API to write a file 2016-03-24 17:34:41 +01:00
Julien Duponchelle
e6ddce86b3
Docker init supports /etc/network/interfaces
* Generate an /etc/network/interfaces
* Use busybox also for aux console

Ref #460
2016-03-24 17:10:53 +01:00
Julien Duponchelle
40f496c7e9
Merge branch '1.5' into 2.0 2016-03-24 10:11:58 +01:00
Julien Duponchelle
d2c32bb570
Merge branch 'master' into 1.5 2016-03-24 09:17:52 +01:00
Julien Duponchelle
dcc4ddf11b
Add a test for \r\n
Fix #458
2016-03-21 16:54:03 +01:00
Julien Duponchelle
bc14d5d78e
Notif forwarded from hypervisor to controller 2016-03-18 16:56:23 +01:00
Julien Duponchelle
de61ed316c
The controller has a streaming API
Now we need to link the hypervisor to the controller.
2016-03-17 17:32:37 +01:00
Julien Duponchelle
76a0120d3e
PEP8 2016-03-17 15:16:09 +01:00
Julien Duponchelle
b55969d381
Notification feed for the hypervisor 2016-03-17 15:15:30 +01:00
Julien Duponchelle
dd2fdcc574
Merge branch '1.5' into networkv2 2016-03-16 16:35:23 +01:00
Julien Duponchelle
174e7cccea
Merge branch 'master' into 1.5 2016-03-16 16:35:03 +01:00
Julien Duponchelle
75212cda3f
Improve tests on Travis 2016-03-16 16:34:36 +01:00
Julien Duponchelle
aa6c44a470
Fix crash when a n hypervisor return no body 2016-03-16 16:10:06 +01:00
Julien Duponchelle
757ee34dac
Support auth for network V2 hypervisors 2016-03-16 15:55:07 +01:00
Julien Duponchelle
c0e452133d
Web interface for debbuging controller 2016-03-15 11:32:10 +01:00
Julien Duponchelle
7a095478fe
Success to add a dynamips with apiv2 2016-03-15 10:45:05 +01:00
Julien Duponchelle
8fed1d9b9f
API for deleting a link 2016-03-14 20:54:05 +01:00
Julien Duponchelle
ed291da566
Rebuild doc 2016-03-14 20:37:07 +01:00
Julien Duponchelle
9062490be3
API for deleting a list 2016-03-14 17:40:27 +01:00
Julien Duponchelle
9771b33b68
Create link using UDP work 2016-03-14 16:51:47 +01:00
Julien Duponchelle
65099b9364
Link API should work now need to implement the client 2016-03-11 20:13:52 +01:00
Julien Duponchelle
6a19e4d822
Rebuild link sample 2016-03-11 17:20:09 +01:00
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