arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Code Issues Releases Wiki Activity
1,969 Commits 5 Branches 203 Tags 151 MiB
85136bc2e4
Commit Graph

1089 Commits

Author SHA1 Message Date
Julien Duponchelle
6f7b06e66f
Fix a crash when docker start command is None 
Ref #550
 2016-05-31 16:32:12 +02:00
grossmj
3f61fbeb0e Generate a MAC address using the project + node UUID. Ref #522. 2016-05-30 11:52:08 -06:00
grossmj
ea7754f1c8 Allow to block network traffic originating from the host OS for vmnet interfaces (Windows only). 2016-05-28 13:39:21 -06:00
grossmj
914fe7e750 Randomize the 4th and 5th bytes when provided with a base mac address. Fixes #522. 2016-05-27 23:00:05 -06:00
Julien Duponchelle
e497e98ca1 Warn if you can not export a file due to permission issue 
Fix #543
 2016-05-27 14:45:02 +02:00
grossmj
3fd0a6d638 Do not delete adapters when stopping a VMware VM. Ref #1066. 
Allocate a new vmnet interface if vmnet 0 1 or 8 is set to a custom adapter.
Set adapter type to all adapters regardless if already configured or added by GNS3.
 2016-05-23 15:53:03 -06:00
grossmj
851ba074e7 Set default VMware VM adapter type to e1000. 2016-05-23 14:14:42 -06:00
grossmj
7bc0570735 Allow an IOS router to stop even the Dynamips hypervisor command fail to be sent. Ref #488. 2016-05-21 19:13:36 -06:00
grossmj
1ae17b74df Extract private-config only when necessary (content is different than the default). Fixes #520. 2016-05-21 18:58:28 -06:00
grossmj
cb6df28f59 Fixes disabling the VPCS relay feature. Fixes #521. 2016-05-21 17:42:34 -06:00
grossmj
3e89543ab9 Fixes wrong exception in Docker VM implementation. 2016-05-21 15:19:32 -06:00
grossmj
a2ebbaa322 Force Npcap DLL to be used first for Dynamips and uBridge (instead of the one from Winpcap if installed). 2016-05-21 14:43:10 -06:00
grossmj
67e346ba92 Fixed startup-config is lost if you change any IOS router settings. Fixes #1233. 2016-05-21 13:20:18 -06:00
Julien Duponchelle
2bb062c61e
Fix ProcessLookupError X11VNC 
Fix #534
 2016-05-19 13:23:53 +02:00
Julien Duponchelle
a741662636
Force tag latest for docker image if no tag is specified 
Fix #533
 2016-05-19 13:09:07 +02:00
Julien Duponchelle
871fea33e0
Cleanup unbreakable space 2016-05-18 11:23:45 +02:00
Julien Duponchelle
8cb5cedb5d
Do not raise error if vmrun.exe is named vmrun.EXE 2016-05-17 09:28:05 +02:00
Julien Duponchelle
9e2043bfa8
Ensure that the connection to docker is closed when leaving server 
Fix https://github.com/GNS3/gns3-gui/issues/1227
 2016-05-10 12:14:48 +02:00
Julien Duponchelle
28f7c2a1cd
Ensure in all cases the docker console is closed before restart 
Fix https://github.com/GNS3/gns3-gui/issues/1226
 2016-05-10 11:39:59 +02:00
Jeremy Grossmann
c7d58eb3b3 Merge pull request #518 from GNS3/detect_eth 
Wait for all interfaces available in container
 2016-05-09 10:54:37 -06:00
grossmj
76cc1d2750 Fixes call to export project. 2016-05-07 10:39:32 -06:00
Julien Duponchelle
2cdfd6c0d7
Wait for all interfaces available in container 
Fix #511
 2016-05-06 19:07:18 +02:00
grossmj
16b5bb8810 Workaround for exception when using gns3server.utils.parse_version. Fixes #513. 2016-05-05 10:15:51 -06:00
Julien Duponchelle
9beca700a5
PEP8 2016-05-04 16:32:37 +02:00
Julien Duponchelle
8e429ee4c1
Ban port dissalowed by chrome and firefox 2016-05-03 21:07:01 +02:00
Julien Duponchelle
f3095d94c1
Replace port in HTTP flow for docker 2016-05-03 18:01:23 +02:00
Julien Duponchelle
5fd385159c
HTTP support for docker 
Fix #509
 2016-05-03 16:49:33 +02:00
Julien Duponchelle
dcbaa62df8
Better aux console for docker 
Fix #472
 2016-05-03 11:33:43 +02:00
Julien Duponchelle
e9fb7f4981
Make sure an image is not partially uploaded 
Fix #505
 2016-05-02 17:25:46 +02:00
Julien Duponchelle
d952718f30
Fix RuntimeWarning: You have iterated over the result of 
pkg_resources.parse_version. This is a legacy behavior

Fix #504
 2016-05-02 17:14:15 +02:00
Julien Duponchelle
c17e00204f
Auto reconnect to docker if connection was closed 
Fix #507
 2016-05-02 16:55:05 +02:00
Julien Duponchelle
815ef6066d
Merge branch 'master' into 1.5 2016-04-28 16:52:29 +02:00
Julien Duponchelle
85f571ee8b
Solve wintypes import 2016-04-28 16:35:58 +02:00
Julien Duponchelle
cf1b7ebe1f
Raise error if qemu can not create backing image 2016-04-27 15:12:15 +02:00
grossmj
4fc5364ab5 More robust save/restore for VirtualBox linked clone VM hard disks. 2016-04-26 15:44:11 -06:00
grossmj
4a91d8a6a5 Prevent non linked cloned hard disks to be detached when using VirtualBox linked cloned VMs. Fixes #1184. 2016-04-26 15:06:22 -06:00
grossmj
b408f29726 Stricter checks to match VMware version to the right vmrun (VIX library) version. 
Also checks the VIX library version when only using the GNS3 VM running in VMware.
 2016-04-26 13:12:42 -06:00
Julien Duponchelle
1d08d4a5fa
Merge branch 'master' into 1.5 2016-04-26 11:49:24 +02:00
Julien Duponchelle
75196b8a55
Fix incrementation of qemu mac address 
Fix #501
 2016-04-25 16:36:20 +02:00
Julien Duponchelle
7ffdd0fab1
Fix broken connectivity between containers 
Fix #502
 2016-04-25 16:09:04 +02:00
Julien Duponchelle
637a7326ec
Ignore captures during project export 2016-04-21 17:02:05 +02:00
Julien Duponchelle
7f77c66888
Support VMware VM in non standard location for fusion 2016-04-13 09:38:58 +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
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
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
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