NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 01:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,975 Commits 5 Branches 202 Tags 85 MiB
d5895c3a47
Commit Graph

1620 Commits

Author SHA1 Message Date
Julien Duponchelle
c8c61f2ae8
Add endpoint to list the compute nodes 2016-04-19 16:53:41 +02:00
Julien Duponchelle
f5e5cf5059
Save the list of compute node 
Fix #494
 2016-04-19 15:35:50 +02:00
Julien Duponchelle
6463007ef1
Remove debug 2016-04-19 15:17:02 +02:00
Julien Duponchelle
d8005f6d4f
Cleanup unused code 2016-04-19 11:51:02 +02:00
Julien Duponchelle
ce5461aee8
Raise error if we try to controll a non controller server 
Fix #451
 2016-04-19 10:47:53 +02:00
Julien Duponchelle
9349bdc916
Fix documentation 2016-04-18 20:55:22 +02:00
Julien Duponchelle
6b9e46950c
Update VPCS and delete VPCS via controller 2016-04-18 18:56:03 +02:00
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
3185baff0d
Start / Stop / Suspend marche 2016-04-14 12:22:10 +02:00
Julien Duponchelle
2841b5769e
Lock for controller or compute 2016-04-14 12:15:45 +02:00
Julien Duponchelle
7f77c66888
Support VMware VM in non standard location for fusion 2016-04-13 09:38:58 +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
183d02ded5
Restore qcow2 module 2016-04-12 16:17:06 +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
9e8fcab65c
Merge branch '1.5' into 2.0 2016-04-08 17:40:27 +02:00
Julien Duponchelle
ae5468a2d3
When starting docker raise proper error if ubridge is not available 
Fix #484
 2016-04-08 16:13:42 +02:00
grossmj
ec6e5a6118 Do not send warnings back to the GUI when a console port not in range or is already taken. 2016-04-07 14:42:52 -06:00
Julien Duponchelle
f1737a6e43
Merge branch 'master' into 1.5 2016-04-07 14:44:56 +02:00
Julien Duponchelle
e3b95fe9ce
Just log debug if docker link we try to destroy is already closed 
Fix https://github.com/GNS3/gns3-gui/issues/1159
 2016-04-07 14:33:21 +02:00
Julien Duponchelle
dff74352f7
Allow multiple user connected to the same VNC for docker 2016-04-07 14:24:53 +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
Julien Duponchelle
ad6fb664a2
Fix detection of EOF in Docker telnet console 
Fix #476
 2016-04-07 10:58:37 +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
b335daf857
Cleanup 2016-04-06 18:27:30 +02:00
Julien Duponchelle
b93c85c390
Allow to change the number of adapters for Docker (server side) 2016-04-06 16:01:34 +02:00
Julien Duponchelle
cb197627b4
Fix an issue with VNC port range 2016-04-06 15:58:29 +02: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
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