Commit Graph

1773 Commits

Author SHA1 Message Date
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
f8ffd078a8
Last aiohttp version 2016-04-05 17:41:37 +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
36dbcfa7f6
Do not block when ifup
-R --timeout=1 --tryagain=1 -b

Fix #469
2016-04-04 20:32:11 +02:00
Julien Duponchelle
a046a4c980
Bump aiohttp to use the same version as 2.0 branch 2016-03-31 18:13:37 +02: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
Jeremy Grossmann
7b25ce04e8 Merge pull request #470 from GNS3/import_export
Import export API
2016-03-30 14:11:58 -06: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
ec044f9210 Merge pull request #467 from ehlers/docker-init-update
Minor cleanup on docker-init
2016-03-30 14:59:54 +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
Jeremy Grossmann
e167a81080 Merge pull request #462 from GNS3/remote_improved
Add IOU support and install config in /etc
2016-03-25 12:24:50 -06:00
Julien Duponchelle
9f05b80d01
Add IOU support and install config in /etc 2016-03-25 19:08:14 +01:00
grossmj
58a360e535 Change server port in documentation. 2016-03-25 10:35:55 -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
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
Jeremy Grossmann
39c41336db Merge pull request #459 from GNS3/remote_install
Remote install on 14.04 ubuntu
2016-03-22 15:08:15 -06: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
Julien Duponchelle
dcc4ddf11b
Add a test for \r\n
Fix #458
2016-03-21 16:54:03 +01:00
Julien Duponchelle
e35ab1e8c0
Remote install on 14.04 ubuntu 2016-03-21 14:52:42 +01: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
Julien Duponchelle
75212cda3f
Improve tests on Travis 2016-03-16 16:34:36 +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
grossmj
c077f3b990 Restart NPF service after adding vmnet adapters on Windows. 2016-03-12 11:04:50 -07:00
Julien Duponchelle
60e9241857
Merge branch 'ehlers-docker-init' into 1.5 2016-03-04 09:09:09 +01:00