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

1586 Commits

Author SHA1 Message Date
Julien Duponchelle
5531a576d1
Import create project if not exists (GNS3 VM just need an UUID) 2016-04-05 19:59:38 +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
36dbcfa7f6
Do not block when ifup
-R --timeout=1 --tryagain=1 -b

Fix #469
2016-04-04 20:32:11 +02:00
grossmj
6eca621b19 Clear warnings about using linked clones with VMware Player. 2016-04-04 12:10:48 -06:00
Julien Duponchelle
34459f6a88
Fix log with recent aiohttp versions 2016-03-31 18:03:40 +02:00
Julien Duponchelle
e097a0e728
Fix Dynamips VM ignores changed console port
Fix #468
2016-03-31 10:06:38 +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
Bernhard Ehlers
498d006225 Minor cleanup on docker-init 2016-03-30 08:29:10 +00:00
Julien Duponchelle
c1193c23c1
Merge branch 'master' into 1.5 2016-03-29 09:20:43 +02:00
grossmj
ba006f105f Alternative method to find the Documents folder on Windows. 2016-03-28 19:37:34 -06:00
grossmj
fa58b1f81c Check for NPF service on Windows. 2016-03-25 19:53:36 -06:00
grossmj
d243cb7d02 New console port range 5000 to 10000. 2016-03-25 10:32:04 -06:00
Julien Duponchelle
c563dbba8a
Change default port to 3080
Fix #487
2016-03-25 15:31:17 +01:00
Julien Duponchelle
5345fe8490
Minor code cleanup 2016-03-25 15:27:31 +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
2e455037e1
Fix crash when you start twice the same container 2016-03-24 18:35:15 +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
268c61ce80
Merge branch 'docker-init' of https://github.com/ehlers/gns3-server into ehlers-docker-init 2016-03-24 16:11:20 +01:00
Julien Duponchelle
2fcada49d4
2.0.0dev1 2016-03-24 10:38:57 +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
3fe8016938
1.4.6 dev1 2016-03-23 18:14:04 +01:00
Julien Duponchelle
01dbaea2e4
1.4.5 2016-03-23 18:11:48 +01:00
grossmj
427cb05c2a Stop the VMware VM if there is an error while setting up the network connections or console. 2016-03-23 10:54:45 -06:00
Bernhard Ehlers
d36a9f3403 docker-init: add DHCP support 2016-03-23 09:13:07 +00:00
grossmj
fa22e19321 Bump version to 1.4.5dev2 2016-03-22 14:43:47 -06:00
Bernhard Ehlers
d472f47829 docker-init: static busybox, support for /etc/network/interfaces 2016-03-22 15:28:56 +00:00
grossmj
975e1c8fa7 Fixes dev syntax bug. 2016-03-20 11:32:40 -06:00
grossmj
19b46a4014 Include VMware VMs paths found preferences.ini 2016-03-19 15:41:26 -06:00
grossmj
7cdf23f497 Allow to stop a VMware VM from GNS3 even if halted within the VM. Fixes #1118. 2016-03-19 12:08:44 -06:00
grossmj
06da40cdcd Keep Dynamips stdout log file in the project directory. 2016-03-19 11:32:15 -06: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
d81fc25b27
Fix a merge error 2016-03-16 16:40:12 +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
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
grossmj
a018c5b0f5 Get MAC addresses for host interfaces to use for filtering frames from vmnet interfaces. 2016-03-14 18:27:51 -06: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
grossmj
93e2d4096d Dynamips uuid hypervisor command is no longer supported. 2016-03-12 22:15:36 -07:00
Julien Duponchelle
8cb5a6ec75
Typo 2016-03-11 20:34:01 +01:00
Julien Duponchelle
17c5d3048c
Cleanup 2016-03-11 20:15:02 +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
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
69bf8bbb4e
Fix doc generation 2016-03-11 15:39:42 +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
65de1b7b5e
Default arg for post in controllers 2016-03-10 10:57:14 +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
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
Bernhard Ehlers
1dd437ecdc updated docker command line processing 2016-03-03 09:12:36 +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
c833a20a8c
Fix Deleting a docker VM gives console error message "Not connected"
Fix #446
2016-03-01 20:25:50 +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
7469f65fa0
Add setter for allocate_aux 2016-03-01 15:33:07 +01:00
Julien Duponchelle
392fa187c2
Expose the allocate_aux setting 2016-03-01 15:01:45 +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
04b02171bb
Support /etc/gns3/gns3_server.conf for the config
It's better for a server deployment
2016-02-25 15:07:55 +01:00
Julien Duponchelle
e91e3525c4
Improve warning if fusion is not installed or in non standard location
For the moment I don't see a good reason to not installating fusion
in the standard location.  If check in Docker Machine code they don't
support it. And with their large user base we can think it's safe.

Fix #435
2016-02-25 12:15:38 +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
fd18458588
Fix stop capture for Docker
Fix #443, #442
2016-02-24 15:14:01 +01:00
Julien Duponchelle
5f15667ad1
Rename invalid variable iou_manager in Docker 2016-02-24 15:08:48 +01:00
Julien Duponchelle
bbdbc971c0
Fix Exception on removal of Docker VM
Fix #441
2016-02-24 15:04:45 +01:00
Julien Duponchelle
057b637961
Set the hostname for docker containers
Fix #437
2016-02-23 19:22:35 +01:00
Julien Duponchelle
87eef545e1
Correctly close the telnet connection for docker
Fix #427
2016-02-23 16:54:12 +01:00
Julien Duponchelle
38815b3eaf
Merge branch 'master' into 1.5 2016-02-23 15:42:58 +01:00
Julien Duponchelle
4c4613b29b
1.4.5dev1 2016-02-23 15:41:45 +01:00
Julien Duponchelle
9d8cb4521d
1.4.4 2016-02-23 14:38:26 +01:00
Julien Duponchelle
9dd09ccde1
1.4.4dev4 2016-02-22 13:06:56 +01:00
Julien Duponchelle
86ebb9b840
1.4.4dev3 2016-02-22 11:20:10 +01:00
grossmj
569da0ce3a Bump version to 1.4.4dev2 2016-02-20 18:41:38 -07:00
grossmj
f73b288a28 Check if VMware Fusion is correctly installed when retrieving the VM list. 2016-02-20 10:59:06 -07:00
grossmj
e34c266ee1 1.4.4dev1 2016-02-19 16:02:51 -07:00
grossmj
80e15c86dc 1.4.3 2016-02-19 14:17:54 -07: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
90109e04aa
1.4.3dev1 2016-02-18 17:46:38 +01:00
Julien Duponchelle
c36de3393d
1.4.3dev1 2016-02-17 19:40:23 +01:00
Julien Duponchelle
976154fd0b
1.4.2 2016-02-17 19:38:34 +01:00
Julien Duponchelle
9b1d513b03
Merge branch 'master' into 1.5 2016-02-16 19:07:17 +01:00
Julien Duponchelle
836023a1bc
Fix Docker error when deleting a running container
Fix #431
2016-02-16 17:42:35 +01:00
Julien Duponchelle
93020a940f
Fix Docker Server error: Not connected when deleting a node
Fix #430
2016-02-16 17:36:32 +01:00
Julien Duponchelle
c2b78400f2
Fix closing a docker console jump to 100% of CPU usage
Fix #427
2016-02-16 17:26:53 +01:00
Julien Duponchelle
1123047404
Catch 404 docker errors when GNS3 force close
Fix #1029
2016-02-12 16:48:19 +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
85b9620953
Fix error when a container has no volumes 2016-02-12 16:25:43 +01:00
Julien Duponchelle
1532b3ed9b
Support for mounting volumes
Fix #425
2016-02-12 11:57:56 +01:00
Julien Duponchelle
a581eeba54
Check docker minimum API version
Fix #423
2016-02-11 16:01:47 +01:00
Julien Duponchelle
9b0088728f
Catch docker namespace error
Fix #424
2016-02-11 15:49:28 +01:00
Julien Duponchelle
dea68bcb28
Fix missing format in IOU export 2016-02-11 09:15:48 +01:00
Julien Duponchelle
1fb4d191c9
Fix number of arguments to the UDP errors on VBOX 2016-02-11 09:02:38 +01:00
grossmj
167a0b8435 Add verification when UDP tunnel is created in a VirtualBox VM. Ref #899. 2016-02-10 19:08:34 -07:00
grossmj
5842487cd0 Fixes VMware linked clone cleanup bug. Fixes #420. 2016-02-10 11:26:40 -07:00
Julien Duponchelle
1995adf838
Fix Update a docker container is broken and raise a 400
Fix #403
2016-02-10 18:20:15 +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
942d07c8ce
Removed docker support from 1.4 (drop unused code) 2016-02-08 13:40:14 +01:00
Julien Duponchelle
f6fb0623be
Merge branch 'master' into 1.5 2016-02-08 13:14:30 +01:00
Julien Duponchelle
3fc64bced2
Fix a crash if you create a file named IOS in the image dir
Fix #419
2016-02-05 10:29:27 +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
grossmj
4f61443b20 Always look at the registry to find vmrun.exe on Windows. 2016-02-03 19:08:41 -07:00
grossmj
4673424da7 Check for VMware VIX library version. Fixes #413. 2016-02-03 18:15:33 -07:00
grossmj
40261ec99c Fixes VDE not working #345. 2016-02-03 16:26:15 -07: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
71c3bda0a5
Fix crash if you have a { in your user name
Fix #414
2016-02-02 10:05:08 +01:00
Julien Duponchelle
53d60bc71a
1.4.2dev1 2016-02-01 17:48:10 +01:00
Julien Duponchelle
ce7ac0505a
1.4.1 2016-02-01 17:46:05 +01:00
Julien Duponchelle
4a3322b822
Add HTTP status to docker error 2016-02-01 17:42:32 +01:00
Julien Duponchelle
98537a242a
Drop duplicate code when ubridge is too old
Fix #405
2016-02-01 16:05:37 +01:00
Julien Duponchelle
03414993dc
Merge branch 'master' into 1.5 2016-02-01 15:47:46 +01:00
Julien Duponchelle
bf316f35cc
VMware raise error if version is not found
Fix #972
2016-02-01 14:26:55 +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
grossmj
2e05290206 Fixes issue with packet capture on VMware VMs. Fixes #396. 2016-01-26 14:45:55 -07:00
grossmj
39ddc4e8c1 Fixes concurrency issue when closing multiple VMware linked clone VMs. Fixes #410. 2016-01-26 14:23:01 -07:00
grossmj
a279bfe1d9 Fixes "can only use tap interfaces that both already exist and are up". Fixes #399. 2016-01-26 13:48:58 -07:00
Julien Duponchelle
58b998600e Send machine stats via the notification stream
Fix #252
2016-01-26 16:35:00 +01:00