arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Code Issues Releases Wiki Activity
1,968 Commits 5 Branches 203 Tags 151 MiB
6d150bb62c
Commit Graph

1088 Commits

Author SHA1 Message Date
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
grossmj
6eca621b19 Clear warnings about using linked clones with VMware Player. 2016-04-04 12:10:48 -06: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
Julien Duponchelle
38815b3eaf
Merge branch 'master' into 1.5 2016-02-23 15:42:58 +01:00
grossmj
f73b288a28 Check if VMware Fusion is correctly installed when retrieving the VM list. 2016-02-20 10:59:06 -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
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
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
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
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
119a2a3b66 Add test for unicode char in images path 
Ref #401
 2016-01-26 15:32:40 +01:00
Julien Duponchelle
ee2104ba35 Check for /dev/kvm instead of kvm-ok 
Fix #411
 2016-01-26 13:58:29 +01:00
Julien Duponchelle
5617ddc4cc Show a warning when starting ASA8 2016-01-22 19:46:05 +01:00
Julien Duponchelle
179372936e Raise error if ubridge is missing 2016-01-22 10:07:55 +01:00
Julien Duponchelle
5deb584a03 Fix bug when reading docker images 
Fix #398
 2016-01-21 18:03:51 +01:00
Julien Duponchelle
c280fd5fb8 Merge branch 'master' into 1.5 2016-01-20 17:10:59 +01:00
Vasil Rangelov
a9eae691f6 Fixed the VMware default VM location on Windows, so that it doesn't assume the "Documents" folder is within the %USERPROFILE% folder, and also support Windows Server's folder (which is "My Virtual Machines" instead of "Virtual Machines"). 2016-01-18 00:48:24 +02:00
Julien Duponchelle
2938b97bd4 Improve dynamips startup_config dump 
Two change:
1) Dump the config when you stop the node. This avoid scenar
2) Disallow empty startup config. If it's empty send ! it's
avoid dynamips crash

Fix #914
 2016-01-15 18:02:52 +01:00
Julien Duponchelle
8225bad76b Fix usage of qemu 0.10 on Windows 
Fix #392
 2016-01-14 17:40:58 +01:00
Julien Duponchelle
ba4128f57b Show hostname when the hostname is missing in the iourc.txt 2016-01-13 16:37:50 +01:00
Julien Duponchelle
f92ac6e52e Fix a crash when docker is not available 2016-01-11 19:11:25 +01:00
Julien Duponchelle
758fb2a0e7 adapter_remove_nio_binding is a coroutine for all device type 
It's cleaner
 2016-01-11 15:19:15 +01:00
Julien Duponchelle
5a28b9409a Fix Crash at startup when docker is not installed 
Fix #384
 2016-01-06 15:13:22 +01:00
Julien Duponchelle
1f756c0d4f Merge branch '1.4' into 1.5 2016-01-06 14:35:48 +01:00
Julien Duponchelle
d184b65800 Improve PR #386 
* Add more test
* Check to kvmi-ok is asynchronous
 2016-01-04 16:30:06 +01:00
Julien Duponchelle
fba049767a Merge branch 'addCapabilities' of https://github.com/boenrobot/gns3-server into boenrobot-addCapabilities 2016-01-04 12:09:44 +01:00
Julien Duponchelle
fab8b3f46f Fix race condition when killing iouyap 
Fix #387
 2016-01-04 10:42:46 +01:00
Julien Duponchelle
884bfa4724 Merge branch '1.4' into 1.5 2016-01-04 09:21:14 +01:00
Julien Duponchelle
137cf59e97 Catch exception if we can't change process priority on Windows 
Fix #380
 2016-01-03 21:24:18 +01:00
Vasil Rangelov
d00efbfb0f Adds a handler for getting the Qemu related capabilities of the server. Currently includes just a check for KVM architectures. 2016-01-03 19:38:16 +02:00
Vasil Rangelov
a4d9f95c9b Fixed showing of Qemu hdb_disk_interface - it showed hda_disk_interface instead, which resulted in an odd visual glitch in the GUI. 2016-01-01 02:44:23 +02:00
Julien Duponchelle
061b459abe Prevent error when quick close of gns3 server after docker usage 
Fix #382
 2015-12-29 12:40:22 +01:00
Jeremy Grossmann
8cf55166cb Merge pull request #379 from GNS3/docker_cleanup 
Docker cleanup and improvements
 2015-12-24 14:56:24 -08:00
Julien Duponchelle
8de90d8236 Ubridge 0.9.3 is require 2015-12-22 17:33:47 +01:00
Julien Duponchelle
31046358cc Add more informations in the debug status page 
* Number of VM in a project
* Number of client connected
 2015-12-22 15:19:38 +01:00
Julien Duponchelle
61cf91d83c Fix tests on Windows 
Fix #377
 2015-12-22 13:16:30 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
480ca037cd Fix test on Windows 
Sadly python crash on my Windows and I can't run the full test
suite.

Fix #377
 2015-12-14 16:06:51 +01:00
Jeremy Grossmann
a9e1801e7d Merge pull request #374 from GNS3/patch_used_port 
Replace by another TCP port if port is already used
 2015-12-09 21:24:04 -08:00
Julien Duponchelle
7dfb386a66 Add log about wher iou capture packet 2015-12-08 16:11:40 +01:00
Julien Duponchelle
2aaad4749b Replace by another TCP port if port is already used 
Another version of #370

This time we replace a free TCP port if port is used and raise
a warning to the user.
 2015-12-07 12:26:46 +01:00
Julien Duponchelle
f3b71dcdef Fix ProcessLookupError in Qemu 
Fix #373
 2015-12-07 10:50:34 +01:00
grossmj
a67b218bde Increase vmrun timeout to 120 seconds. Ref #360. 2015-12-05 18:37:34 -07:00
grossmj
1071b6366f Fixes termination notification to indicate the right process name (IOU vs iouyap). Ref #359. 2015-12-05 18:24:08 -07:00
grossmj
19d5c1c05b Fixes error with non initialized uBridge. Fixes #367. 2015-12-05 17:36:55 -07:00
Julien Duponchelle
a6826fe0bf Remove debug that can crash qemu 
Fix #365
 2015-12-01 19:30:39 +01:00
Julien Duponchelle
42a4df5079 Support VM usage for qemu 
Ref https://github.com/GNS3/gns3-gui/issues/829
 2015-12-01 10:54:51 +01:00
Julien Duponchelle
5b347fe48f Raise error if server received windows path 2015-11-12 15:38:47 +01:00
Julien Duponchelle
c7cc155b78 Merge branch 'master' into unstable 2015-11-12 10:55:19 +01:00
grossmj
11cf2294da Remove NIO FIFO and Mcast (unused). Fixes #348. 2015-11-11 16:20:28 -07:00
Julien Duponchelle
3f4da9050c Support VPCS 0.6.1 2015-11-11 21:57:58 +01:00
Julien Duponchelle
63edcc1c34 Fix duplicate of -no-kvm options 
Fix #356
 2015-11-10 16:25:02 +01:00
Julien Duponchelle
caade47e16 Fix tests about images paths security 2015-11-10 15:21:10 +01:00
Julien Duponchelle
390c88d7cd Raise an error if user send a non local path to remote server 2015-11-09 19:02:10 +01:00
Julien Duponchelle
da240f21ba Apply pep8 fix 2015-11-09 12:28:00 +01:00
Julien Duponchelle
1248584841 Cleanup unused and duplicates 2015-11-09 12:14:25 +01:00
Julien Duponchelle
58d2a5d4b0 Support VPCS 0.6.1 
Fix #347
 2015-11-09 10:26:16 +01:00
grossmj
bd47c21514 Sets console end port to 7000. Fixes #343. 2015-11-08 18:14:55 -07:00
grossmj
c3e99bfc1d Drop netifaces (replaced by psutil). Fixes #344. 2015-11-08 13:34:27 -07:00
grossmj
9ca72f3bbc Correctly display log messages. 2015-11-08 12:01:25 -07:00
grossmj
e4735308f8 Merge remote-tracking branch 'origin/master' 2015-11-07 12:18:05 -07:00
grossmj
13a3e8f324 Tentative fix for "WinError 64 The specified network name is no longer available" issues. 2015-11-07 12:17:53 -07:00
Julien Duponchelle
6fbc84c0dc Return relative path for dynamips images 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:47:37 +01:00
Julien Duponchelle
7ee12edb5c Fix add existing IOS not working 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:28:11 +01:00
Julien Duponchelle
d9f94e653b Allow vpcs 0.8b 2015-11-04 14:37:27 +01:00
Julien Duponchelle
7967a922bc Merge branch 'master' into unstable 2015-11-03 12:39:01 +01:00
Julien Duponchelle
bd54c55ae1 Fix minor errors reported by codacy.com 2015-11-03 12:34:22 +01:00
Julien Duponchelle
69c38c6414 Use pytest 2.8 so it's work with Python 3.5 without warning 2015-11-02 16:35:12 +01:00
grossmj
32f9baf682 Fixes Windows named pipe issue. Fixes #340. 2015-11-01 18:51:12 -07:00
Julien Duponchelle
6edb41ded7 Merge branch 'master' into unstable 2015-10-30 15:17:17 +01:00
Julien Duponchelle
42c8fb7c29 Raise an error when you use a port outside the ranges 
Fix #739
 2015-10-30 15:15:28 +01:00