arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 16:58:28 +00:00
Code Issues Releases Wiki Activity
1,841 Commits 5 Branches 205 Tags 155 MiB
ad7ca86f32
Commit Graph

1506 Commits

Author SHA1 Message Date
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