1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-10-11 18:38:55 +00:00
Commit Graph

918 Commits

Author SHA1 Message Date
Julien Duponchelle
da7f910482 glob.escape is available with Python 3.4 2015-10-07 10:27:42 +02:00
Julien Duponchelle
4c13f8e6ea Merge branch 'master' into unstable 2015-10-07 10:27:06 +02:00
Julien Duponchelle
4232ea8a00 Protect dynamips against bad glob
Fix #332
2015-10-07 10:26:37 +02:00
Julien Duponchelle
ec7a9615ac Fix issue with Qemu networking following merge 2015-10-07 09:01:17 +02:00
Julien Duponchelle
5e3ce48a52 Merge branch 'master' into unstable 2015-10-06 19:19:56 +02:00
Julien Duponchelle
3d7d8682ee OVA file support 2015-10-06 17:50:54 +02:00
Julien Duponchelle
034ac392b7 Support listing images in subdirectories
It's a part of the OVA support:
https://github.com/GNS3/gns3-gui/issues/700
2015-10-05 11:07:15 +02:00
grossmj
fc5afa6676 Catch ProcessLookupError in Qemu VM. 2015-10-04 14:20:44 -06:00
grossmj
3f86df5169 Fixes uncalled coroutine. 2015-10-04 07:00:47 -06:00
grossmj
970f22a83e Use the correct UDP tunnel Qemu syntax for version > 1.1.0 when legacy networking is enabled. 2015-10-04 06:41:39 -06:00
Julien Duponchelle
dd7f6eb021 Fix crash 2015-10-02 15:04:42 +02:00
Julien Duponchelle
d19b3f15ed VMware player linux support
Fix #326
2015-10-02 11:04:54 +02:00
grossmj
80d99ec395 Fixes some minor issues. 2015-09-29 14:15:01 -06:00
grossmj
9737783eb6 Do not require a TAP interface to already exist. Fixes #321. 2015-09-26 10:09:50 -06:00
grossmj
09aa31fb43 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-23 13:42:37 +02:00
Julien Duponchelle
e7ea9e8047 Merge branch 'master' into unstable 2015-09-22 14:40:13 +02:00
Julien Duponchelle
bfe3b12342 Fix dynamips configuration lost when you delete a node
Fix #316
2015-09-22 14:39:21 +02:00
Julien Duponchelle
bf0813b4b9 Merge branch 'master' into unstable 2015-09-22 13:46:08 +02:00
Julien Duponchelle
c43960fbfd Clarify error message when we got UTF-8 chars in the iourc file
Fix #307
2015-09-22 13:45:10 +02:00
Julien Duponchelle
6a6beb752a Merge remote-tracking branch 'origin/master' into unstable 2015-09-22 11:03:41 +02:00
grossmj
5bcabc705f Use custom VMnet interfaces without host adapter when uBridge is not used. Fixes #673. 2015-09-20 13:19:57 -06:00
grossmj
b90df5806d Automatically add the -no-kvm option if -icount is detected to help with the migration of ASA VMs created before version 1.4 2015-09-18 15:40:56 -06:00
Julien Duponchelle
b1f3210a4c Fix a crash at vmware stop
Fix https://github.com/GNS3/gns3-gui/issues/665
2015-09-17 15:51:46 +02:00
Julien Duponchelle
bb080fa96a Fix a crash when starting a VMware vm
Fix #314
2015-09-17 15:46:06 +02:00
Julien Duponchelle
e236f63162 Add how to add vmnet interfaces explantion in the error message 2015-09-17 15:18:55 +02:00
Julien Duponchelle
3e71529702 Fix path of VMinventory for fusion
Fix #313
2015-09-17 11:04:24 +02:00
grossmj
958274e8f6 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-16 06:09:14 -06:00
grossmj
59f5de5de2 Throw an error if ubridge as incorrect permissions. Fixes #312. 2015-09-14 15:05:25 -06:00
grossmj
a9ac0d3380 This may fix "The semaphore timeout period has expired" error on Windows. #311. 2015-09-13 15:47:43 -06:00
grossmj
65fa4036c6 Fixes bug with VMware VM connections + moves some uBridge code to BaseVM. 2015-09-13 14:52:25 -06:00
grossmj
0ee31361c0 Support for packet capture on VMware VM links. 2015-09-13 09:40:09 -06:00
Julien Duponchelle
22e4fec2e2 Fix ProcessLookupError on _checkAlive Qemu
Fix #308
2015-09-11 14:16:56 +02:00
grossmj
cc7fe1a477 VMware Fusion support with uBridge. 2015-09-10 03:44:56 -06:00
grossmj
46698924fd Merge remote-tracking branch 'origin/unstable' into unstable 2015-09-09 02:39:06 -06:00
grossmj
8e29ad4493 Updates vmnet script to support Windows. 2015-09-09 02:38:11 -06:00
Julien Duponchelle
5aa9d4d7b9 Do not block on .lock for VMware OSX 2015-09-08 21:31:21 +02:00
grossmj
1e722254f7 Merge remote-tracking branch 'origin/unstable' into unstable 2015-09-08 03:03:38 -06:00
grossmj
8031cf1030 Require Dynamips version 0.2.16 to change the default QinQ Ethernet type. 2015-09-08 03:03:11 -06:00
Goran Cetusic
0fa300cb99 Initial Docker support from Google Summer of Code 2015-09-08 10:57:28 +02:00
Goran Cetusic
9ee1d9d71a fixed the way docker containers are terminated 2015-09-08 10:54:27 +02:00
grossmj
0ab95ae043 basic docker container support 2015-09-08 10:54:27 +02:00
grossmj
0ddef78127 Merge branch 'qinq_ethertype' of https://github.com/Bevaz/gns3-server into Bevaz-qinq_ethertype 2015-09-08 02:27:21 -06:00
grossmj
2c5b2a19f6 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:07:06 -06:00
grossmj
a779fa7462 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:00:39 -06:00
grossmj
c992cabb28 VirtualBox VMs can only be started if powered off. Fixes #299. 2015-09-08 01:20:46 -06:00
Julien Duponchelle
4d6626e849 Support of VPCS 0.8
Fix #306
2015-09-07 17:35:21 +02:00
grossmj
4efec03448 Allows VMware VMs to use vmnet interfaces for connections without using uBridge. Fixes #295. 2015-09-05 14:38:11 -06:00
grossmj
fda33c56de Catch exception when a process cannot be killed. Fixes #296. 2015-09-03 16:18:27 -06:00
Julien Duponchelle
b1ef49672e Qemu user options are at the end. It's allow user to add his own net
interfaces
2015-08-27 18:46:02 +02:00
Julien Duponchelle
d853ffe791 Change the way we look for Qemu path
Fix #302
2015-08-27 18:27:17 +02:00
Julien Duponchelle
c361d27531 Lock qemu vm during start / stop operations
Fix #301
2015-08-27 16:06:11 +02:00
Julien Duponchelle
699647dbda In the error message explain how to turn off KVM support 2015-08-26 17:17:40 +02:00
Julien Duponchelle
4cc66a3801 Fix when you stop qemu on windows you have an error
Fix #625
2015-08-26 17:01:16 +02:00
Julien Duponchelle
8085080e41 Merge branch 'master' into unstable 2015-08-26 14:36:55 +02:00
Julien Duponchelle
fea7a8a9ab Fix Qemu cannot be used on Windows
Fix #291
2015-08-26 13:47:12 +02:00
Julien Duponchelle
34e64fe5d8 Catch UnicodeEncodeError when passing unicode char as qemu options
Fix #292
2015-08-24 18:09:01 +02:00
Anton Fedotov
1283f8bde8 EthernetSwitch: Allow to choose ethertype for QinQ outer tag. 2015-08-20 09:42:30 +03:00
grossmj
eb5f9c48f2 Backport: fixes NAT NIO for Qemu VMs (do not launch any legacy scripts) 2015-08-14 22:16:02 -06:00
grossmj
98112f7fac Fixes NAT NIO for Qemu VMs (do not launch any legacy scripts) 2015-08-14 22:15:01 -06:00
grossmj
a16d6ac88f Lower VMware requirements to Workstation version 10 and Player version 6. 2015-08-14 20:35:04 -06:00
grossmj
83a7e25389 Fixes Unicode error. Fixes #290. 2015-08-13 20:15:50 -06:00
grossmj
ab3700854c Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:23:05 -06:00
grossmj
2ce01fafc0 Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:22:21 -06:00
Julien Duponchelle
0018658f60 Fix ram setting for Qemu 2015-08-07 17:08:22 +02:00
Julien Duponchelle
55f7c79918 Explicit set qemu memory as MB 2015-08-07 17:03:06 +02:00
Julien Duponchelle
323674ba5c Turn off KVM for non x86 architectures
Fix #289
2015-08-07 16:49:45 +02:00
grossmj
05ab18f295 Send an error when vmware executable cannot be found on Linux. Fixes #288. 2015-08-06 23:05:10 -06:00
grossmj
5121753232 Support for CPUs setting for Qemu VMs. 2015-08-05 17:17:55 -06:00
Julien Duponchelle
1613999689 Quote command in qemu debug logs so you can copy/paste them 2015-08-04 17:06:42 +02:00
grossmj
0923ed5d85 Support for Qemu disk interfaces, cd/dvd-rom image and boot priority. Fixes #278. 2015-08-02 23:02:02 -06:00
grossmj
7bccf9e554 Check for VMware Player version >= 7 and VMware Workstation >= 11. Fixes #286. 2015-08-01 13:49:02 -06:00
grossmj
06a6287dff Backport: removes code that deletes IOS router instance files. 2015-07-31 14:37:23 -06:00
grossmj
87ec90cdaf Removes code that deletes IOS router instance files. 2015-07-30 18:50:59 -06:00
Julien Duponchelle
e92d9ca5ff Raise error if qemu image already exist when creating disk 2015-07-28 16:15:01 +02:00
Jeremy
f761fb77f8 Fixes UnicodeDecodeError when reading a VMware file. 2015-07-27 16:29:02 -06:00
Jeremy
a721d7d910 Fixes KeyError: "ethernet0.connectiontype". Fixes #276. 2015-07-27 15:50:09 -06:00
Jeremy
1419b7c8dc Fixes replace errors. Fixes #284. 2015-07-27 15:31:42 -06:00
Jeremy
2ed0ef770e Catch ProcessLookupError when updating iouyap config. Fixes #255. 2015-07-27 11:41:13 -06:00
Jeremy
5986849b67 Catch ProcessLookupError when updating iouyap config. Fixes #255. 2015-07-27 11:40:01 -06:00
Julien Duponchelle
5b0c36c0d6 API for creating a qemu disk image 2015-07-27 19:18:36 +02:00
Julien Duponchelle
5d8c90d138 Rename qemu image type to qemu image format 2015-07-27 17:32:27 +02:00
Julien Duponchelle
b94a4e2308 Add code for creating qemu image on server side
Ref https://github.com/GNS3/gns3-gui/issues/558
2015-07-27 16:27:14 +02:00
Jeremy
fcd4fda68e Prevent starting different hypervisors that leverage hardware virtualization (VT-x/AMD-V). Fixes #548. 2015-07-26 19:21:30 -06:00
Jeremy
eb5e019a26 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:52:43 -06:00
Jeremy
76fe0cb316 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:51:55 -06:00
Jeremy
5f5d9347b9 Makes sure the loop is running when closing the app. 2015-07-26 15:27:47 -06:00
Jeremy
31b168aa42 Catch Permission denied when writing to VMX file while closing VMware VM. Fixes #277. 2015-07-25 17:09:10 -06:00
Jeremy
382747a2f2 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:55:37 -06:00
Jeremy
64bf935222 Fixes missing chipset info for VirtualBox VM (maybe some older VirtualBox version don't have it). Fixes #254. 2015-07-25 16:54:31 -06:00
Jeremy
7b001e4d36 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:46:23 -06:00
Jeremy
cf5af8a6f7 Fixes missing chipset info for VirtualBox VM (maybe some older VirtualBox version don't have it). Fixes #254. 2015-07-25 16:39:38 -06:00
Jeremy
8a257b3b2e Changes how to look for the vmrun.exe location. 2015-07-24 16:50:36 -06:00
Julien Duponchelle
3f25bfcb27 Fix qemu tests 2015-07-23 10:46:43 +02:00
Jeremy
2655d426c2 Backport: option to drop nvram & disk files for IOS routers in order to save disk space. 2015-07-22 16:02:08 -06:00
Jeremy
8e236a7045 Prevent using different hypervisors that leverage hardware virtualization.
- Implemented for Qemu when a VMware or VirtualBox VM with hardware virtualization is already running.
- Implemented for VirtualBox only when a Qemu VM with KVM is already running.
2015-07-21 22:58:28 -06:00
Jeremy
fc0409286b Check for uBridge version and catch uBridge errors. 2015-07-21 17:58:53 -06:00
Jeremy
f0649b4ac3 Remove default FLASH when no hda disk for Qemu VMs. Fixes #535. 2015-07-21 16:45:44 -06:00
Jeremy
8cc46f66c6 Fixes indentation mistakes. 2015-07-21 16:04:55 -06:00
Jeremy
abd9c1dc48 Use the registry to find vmrun if the default VMware install path does not exist. 2015-07-21 15:59:29 -06:00
Jeremy
439e0df058 Bind host on 0.0.0.0 when checking for a free UDP port. 2015-07-20 19:27:14 -06:00
Jeremy
d5c0584d25 Bind host on 0.0.0.0 when checking for a free UDP port. Fixes #265. 2015-07-20 19:22:20 -06:00
Jeremy
6ee94331d4 Fixes RuntimeError: Event loop is closed. Fixes #266. 2015-07-20 16:02:28 -06:00
grossmj
1f890b4cad Implements uBridge hypervisor. 2015-07-19 22:55:10 -06:00
Jeremy
ccd29ab500 Take VMware file encoding into account. Fixes #261. 2015-07-12 20:58:58 -06:00
Jeremy
e785baaa29 Take VMware file encoding into account. Fixes #261. 2015-07-12 19:03:15 -06:00
grossmj
1e04e1e123 Fixes bug with vmrun VIX path. 2015-07-09 10:32:23 -06:00
grossmj
2fc63601bf Merge remote-tracking branch 'origin/unstable' into unstable 2015-07-08 21:39:14 -06:00
grossmj
27532cd037 Add debug to help resolve https://community.gns3.com/thread/9193 2015-07-08 21:38:58 -06:00
Jeremy
32e0d49e1e VMware VMs always have a working directory (to store the ubrige.ini and ubrige.log files). 2015-07-08 17:48:34 -06:00
Jeremy
37f4ff2f63 Do not monitor the ubridge process because it creates an issue on Windows. 2015-07-08 13:00:54 -06:00
Jeremy
78d847e9ac ubridge source Ethernet interface must be quoted on Windows. 2015-07-06 18:32:01 -06:00
Julien Duponchelle
dfe95cce63 Fix qemu binary lookup in frozen OSX application
https://github.com/GNS3/gns3-gui/issues/496
2015-07-05 21:53:47 +02:00
Jeremy
83929119be Return stdout when a process crash for IOU, Dynamips, uBridge and VPCS. 2015-07-04 14:08:03 -06:00
Jeremy
9235c3a913 Adds -no-kvm to the ASA template and ignore -no-kvm on platforms other than Linux. Should resolve #472. 2015-07-03 23:35:42 -06:00
Jeremy
442aa31065 Make sure VNC ports are between 5900 and 6000. Fixes #490. 2015-07-03 16:06:25 -06:00
Jeremy
8e652778f9 Remove running VBoxManage as another user option (root for instance). See #248. 2015-07-03 14:37:07 -06:00
Jeremy
731d24f497 Get Windows interfaces for VMware support. 2015-07-02 20:10:20 -06:00
grossmj
4171aebfdb List only valid existing IOS images (for IOS router wizard). 2015-06-30 17:37:46 -06:00
Jeremy
be85d95ff7 Checks if IOS image exist at startup and not during node creation. Fixes #240. 2015-06-29 16:30:57 -06:00
Julien Duponchelle
6e3ebb714d Return vm_directory for VirtualBox and VMware
Fix #246
2015-06-26 17:09:19 +02:00
Julien Duponchelle
feefb075d4 Make the qemu event crash more future proof 2015-06-26 15:10:41 +02:00
Julien Duponchelle
90b0dfebbd Merge branch 'master' into unstable 2015-06-26 14:42:43 +02:00
Julien Duponchelle
e8805d3fdc When a qemu VM crash send the log to the client.
Fix #243
2015-06-26 14:41:58 +02:00
Julien Duponchelle
2ccb30eeb5 Fix Incorrect vboxmanage sudo command
Fix #247
2015-06-26 10:47:52 +02:00
Julien Duponchelle
ccd3224490 Add a vm_directory field to Dynamips / VPCS / IOU
Fix #246
2015-06-25 11:17:32 +02:00
Julien Duponchelle
2b36746d52 Return the working directory of a Qemu VM 2015-06-25 09:53:16 +02:00
grossmj
d9745644cd Check for /dev/kvm. Fixes #245. 2015-06-24 23:03:04 -06:00
grossmj
ed95bcee97 Moves KVM setting to Qemu server preferences. Fixes #244. 2015-06-24 22:47:30 -06:00
grossmj
f20ee06181 VNC console support for Qemu VMs. 2015-06-24 19:09:17 -06:00
Julien Duponchelle
4aadfa3b67 Test all IOU requirements at VM startup
This allow user to create the node and upload the image after
2015-06-19 16:35:19 +02:00
Jeremy
f398d15025 Completes #239 (Makes VMX keys reading case insensitive). 2015-06-18 17:53:08 -06:00
Jeremy Grossmann
797b45b1f9 Merge pull request #239 from GNS3/vmx_case_insensitive
Makes VMX keys reading case insensitive.
2015-06-18 14:08:40 -07:00
Jeremy
11e96e6521 ACPI shutdown support for VMware VMs. Fixes #436. 2015-06-18 15:02:31 -06:00
Julien Duponchelle
a577fe9fdb Make VMX reading case insensitive
Fix #237
2015-06-18 16:28:13 +02:00
Jeremy
6d1f060791 Reloads ubridge when connecting or disconnecting VMware VM links. 2015-06-17 17:36:52 -06:00
Jeremy
d779392d7f Find vmrun on Windows. 2015-06-17 17:05:58 -06:00
Julien Duponchelle
f041697311 Compute a md5sum of images for futur purpose
Fix #234
2015-06-17 17:11:25 +02:00
Julien Duponchelle
04aac2f3dc Convert old -enable-kvm to kvm settings for Qemu
Fix #233
2015-06-12 09:40:38 +02:00
Julien Duponchelle
75267f9d53 Merge branch 'master' into unstable 2015-06-10 16:30:30 +02:00
Julien Duponchelle
2da0b36ee7 Support a platform parameter for Qemu
I'm sure we will discover a distribution with a different
naming conventions...

Fix #220
2015-06-10 15:49:24 +02:00
grossmj
d518ac45f5 Enable KVM acceleration option. 2015-06-08 14:51:06 -06:00
grossmj
c7ea8517a1 Do not stop saving IOS router or IOU configs when there is an exception while a project is committed. 2015-06-08 11:32:00 -06:00
grossmj
5a32d8a779 Merge remote-tracking branch 'origin/master' 2015-06-08 11:28:58 -06:00
grossmj
9f1705a4f1 Do not stop saving IOS router configs when there is an exception while a project is committed. 2015-06-08 11:28:48 -06:00
grossmj
815b7d226c Sync with IOU tools (nvram import/export). 2015-06-08 10:07:54 -06:00
grossmj
65e7f61f96 Fixes issues when setting MAC address for a Qemu VM or IOS router. 2015-06-07 22:18:41 -06:00
grossmj
042472f02c Check interface is up before connecting a NIO (Linux only). Fixes #277. 2015-06-07 13:51:33 -06:00
grossmj
81d417a2b3 Fixes too many arguments to socket.getaddrinfo() 2015-06-07 09:25:54 -06:00
grossmj
81e56e035b IPv6 support. 2015-06-06 21:37:34 -06:00
grossmj
ca331ae2a5 Import/Export support for IOU nvrams. 2015-06-06 15:15:03 -06:00