NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,783 Commits 5 Branches 229 Tags
ad6fb664a2936181f58d0853ec9bf70205684d1c
Commit Graph
988 Commits
Author SHA1 Message Date
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 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 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
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 5345fe8490 Minor code cleanup 2016-03-25 15:27:31 +01:00
Julien Duponchelle 2e455037e1 Fix crash when you start twice the same container 2016-03-24 18:35:15 +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 d2c32bb570 Merge branch 'master' into 1.5 2016-03-24 09:17:52 +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
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 174e7cccea Merge branch 'master' into 1.5 2016-03-16 16:35:03 +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
grossmj 93e2d4096d Dynamips uuid hypervisor command is no longer supported. 2016-03-12 22:15:36 -07:00
Bernhard Ehlers 1dd437ecdc updated docker command line processing 2016-03-03 09:12:36 +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 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 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