arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-27 09:18:09 +00:00
Code Issues Releases Wiki Activity
1,679 Commits 5 Branches 205 Tags 155 MiB
c2b78400f2
Commit Graph

926 Commits

Author SHA1 Message Date
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
grossmj
e63b9ff0e6 Option to drop nvram & disk files for IOS routers in order to save disk space. 2015-06-05 14:54:22 -06:00
Julien Duponchelle
02650fa490 Create a private config file if expected 
Fix #217
 2015-06-05 16:23:52 +02:00
Julien Duponchelle
d9de1718b7 Fix crash if a private config exist in IOS but no private config file 
Fix #217
 2015-06-05 15:30:30 +02:00
grossmj
37ddff9f07 Support for base MAC address for Qemu VMs. 2015-06-03 14:52:49 -06:00
Julien Duponchelle
d8fb33dba2 Fix merge conflict 2015-06-03 18:58:17 +02:00
Julien Duponchelle
a1204dca0a Merge branch 'master' into unstable 2015-06-03 18:34:46 +02:00
Julien Duponchelle
b344def887 Fix crash when virtualbox list of VMS return an empty line 
Fix #206
 2015-06-03 11:59:53 +02:00
grossmj
743f1392b5 ACPI shutdown support for Qemu VMs. 2015-06-02 22:33:38 -06:00
grossmj
933bc5a7b0 ACPI shutdown support for VirtualBox VMs. 2015-06-02 16:30:35 -06:00
grossmj
a0fe9bb498 Control vm command has to be used instead of modify vm. Fixes #205. 2015-06-02 09:00:37 -06:00
Julien Duponchelle
57f9d875ca Fix AttributeError: 'NIONAT' object has no attribute 'lport' for 
VirtualBox

Fix #205
 2015-06-02 16:27:48 +02:00
Julien Duponchelle
a2e51ac090 Avoid duplicate paths in qemu binary list 
Fix #204
 2015-06-02 15:35:14 +02:00
grossmj
edff447483 Catch exception in snapshot dialog. 2015-06-01 21:54:08 -06:00
Jeremy
9df290f192 Check if port or adapter is connected before starting/stopping a packet capture. Fixes #196. 2015-06-01 15:42:17 -06:00
Julien Duponchelle
05aafb9538 Revert "Start virtualbox VM one by one" because it doesn't fix the issue 
This reverts commit da72a9501a.
 2015-06-01 16:16:34 +02:00
Julien Duponchelle
da72a9501a Start virtualbox VM one by one 
Related to #190
 2015-06-01 11:40:42 +02:00
grossmj
a60389427b Support for VMware linked clones. 2015-05-30 20:26:38 -06:00
Julien Duponchelle
9442042d7a Merge branch 'master' into unstable 2015-05-28 12:04:01 +02:00
grossmj
98e01ff21d Serial console implementation for VMware VMs. 2015-05-27 21:06:18 -06:00
Vasil Rangelov
9ef4628cbc Added a method for getting qemu-img binaries, and moved the qemu folder into a separate method. 2015-05-28 00:11:36 +03:00
grossmj
0476f2932e Prevent users to add links to running Qemu VMs and start a capture on running VirtualBox VMs. 2015-05-27 13:56:27 -06:00
grossmj
91c0f05a4e Fixes bug: couldn't set PCMCIA disk1 size for IOS routers. 2015-05-27 10:17:46 -06:00
Julien Duponchelle
a86bac4214 Catch VPCS kill errors 
Fix #199
 2015-05-27 17:21:15 +02:00
Julien Duponchelle
7cad25eb1a Raise a VirtualBox error if adapter doesn't exists 
Fix #195
 2015-05-27 16:38:57 +02:00
Julien Duponchelle
ecf4e91e55 Ignore VirtualBox VM Name with a carriage return in name 
Add tests for get_list of VirtualBox

Fix #200
 2015-05-27 16:21:18 +02:00
Julien Duponchelle
c98bcedd39 Cleanup the temporary project after modules have been notified of the 
path change
 2015-05-26 15:20:14 +02:00
Julien Duponchelle
528bb7a7c6 Do not return error if we can't remove the old project directory 2015-05-26 13:27:12 +02:00
Julien Duponchelle
f1ab682be9 Do not crash if module ioucon is loaded by tests on Windows 2015-05-26 11:55:30 +02:00
Julien Duponchelle
289b68e5c1 Use setter for the qemu_path (allow to pass only the binary name) 2015-05-26 10:06:10 +02:00
grossmj
a7dd0d3c51 Fixes TAP connection when using VPCS. 2015-05-26 10:06:10 +02:00
Julien Duponchelle
29ec07d166 Fix crash launching qemu on OSX from another location. 
It's append only when frozen an you launch the server by hand.

Fix #194
 2015-05-26 10:05:53 +02:00
Julien Duponchelle
6f9f004ebb API for list & download files of a project 2015-05-26 09:49:12 +02:00
Julien Duponchelle
8636d3e337 Use setter for the qemu_path (allow to pass only the binary name) 2015-05-26 09:48:36 +02:00
grossmj
c43b26d787 Merge remote-tracking branch 'origin/master' 2015-05-25 19:07:23 -06:00
grossmj
08f82e02a0 Fixes TAP connection when using VPCS. 2015-05-25 19:07:12 -06:00
grossmj
3c4a60cd0a Check for VMware lock file. 2015-05-25 15:49:28 -06:00
grossmj
3729a10783 VMware vmnets management almost complete. 2015-05-21 21:48:59 -06:00
Jeremy
0287b4607d Base for supporting VMnet adapters. 2015-05-20 19:05:26 -06:00
Julien Duponchelle
9fa873751d Fix crash launching qemu on OSX from another location. 
It's append only when frozen an you launch the server by hand.

Fix #194
 2015-05-18 11:58:56 +02:00
Jeremy
cb7b9e8190 Adapters for VMware VMs. 2015-05-15 19:09:48 -06:00
grossmj
0ac27c40da Merge remote-tracking branch 'origin/unstable' into unstable 2015-05-14 20:12:08 -06:00
grossmj
a386c5382c Starting VMware VM networking support. 2015-05-14 20:11:57 -06:00
Julien Duponchelle
743187bb2e Merge branch 'master' into unstable 2015-05-14 19:29:30 +02:00
Jeremy
b2457e0b3b Check for empty iourc path. 2015-05-13 16:05:54 -06:00
Jeremy
2531a05adc Merge remote-tracking branch 'origin/master' 2015-05-13 15:54:03 -06:00
Jeremy
dd9f62158f Fixes bugs with IOS router configs. Fixes #354. 2015-05-13 15:53:58 -06:00
Jeremy
25a6616cd0 Some wording changes. 2015-05-13 13:53:42 -06:00
Julien Duponchelle
1e38b11f34 Catch crash error in IOU in case of permission denied 
Fix #186
 2015-05-13 10:16:24 +02:00
grossmj
8e168dfbe0 Completes VMware VMs searching process. 2015-05-10 17:21:31 -06:00
Julien Duponchelle
bb4ebbfe64 Upload images API 
Conflicts:
	requirements.txt
	setup.py
 2015-05-10 21:06:31 +02:00
Jeremy Grossmann
61fb641215 Merge pull request #168 from GNS3/listen 
A notification stream with process monitoring.
 2015-05-09 17:15:58 -06:00
grossmj
13eb461dfe Update default VMware VM location path for OSX. 2015-05-08 18:30:41 -06:00
Julien Duponchelle
00fa1cc370 Merge branch 'master' into unstable 2015-05-08 14:45:07 +02:00
Jeremy
c197b39a68 Find VMware VMs using the inventory and alternatively using the default vm location (for VMware player). 2015-05-07 16:50:37 -06:00
Jeremy
d21469a916 Return an error if an adapter slot doesn't exist on an IOS router. 2015-05-06 17:22:07 -06:00
Jeremy
b57a023394 NIO NAT support for VirtualBox VMs. 2015-05-06 15:21:39 -06:00
grossmj
a929dfea38 Merge remote-tracking branch 'origin/master' 2015-05-06 14:59:35 -06:00
grossmj
fcff2d0813 NIO NAT support for QEMU VMs (user mode back-end is used). 2015-05-06 14:59:01 -06:00
Julien Duponchelle
ed39afbf3d Throw an error if user put an invalid port range in config file 
Fix #117
 2015-05-06 10:40:51 +02:00
Julien Duponchelle
18c4154376 Catch error when you can't mark a project as no longer temporary 
Fix #172
 2015-05-05 10:51:51 +02:00
grossmj
9eeb8910fb Match how IOU initial-config is set for VPCS VM. 2015-05-04 21:54:56 -06:00
Jeremy
71e2586e17 Refactors how startup-config and private-config are handled for IOS routers. 2015-05-04 18:42:32 -06:00
Julien Duponchelle
d2d91ebdea Fix temporary project not cleanup with save as 2015-05-04 14:04:57 +02:00
Julien Duponchelle
0dea63c9ea If image is not found in VM directory look in images folder 2015-05-04 10:57:08 +02:00
grossmj
3467b42ab5 Ordered MAC addresses for QEMU based VMs. 2015-05-03 13:18:18 -06:00
grossmj
f6bc823b58 Fixes #171. 2015-05-03 11:40:55 -06:00
grossmj
a260377f0e List all available VMware VMs. 2015-05-01 18:47:46 -06:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Jeremy
ab60d7929b Basic VMware support (start & stop a VM). 2015-04-30 19:05:37 -06:00
Julien Duponchelle
359abb0286 Revert "Merge branch 'unstable'" 
This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
 2015-04-30 16:43:30 +02:00
grossmj
d18293ae7c Fixes list images in VirtualBox. 2015-04-29 22:17:17 -06:00
Jeremy
929c337e8b Merge branch 'unstable' 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
 2015-04-29 16:29:45 -06:00
Julien Duponchelle
f8f6f5dc5d Merge branch 'master' into unstable 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
 2015-04-29 14:25:44 +02:00
Julien Duponchelle
b9bc73fd01 Do not crash when closing a project if VirtualBox is not accessible 
Fix #164
 2015-04-29 14:24:27 +02:00
grossmj
0311a0086e Fixes typo. 2015-04-28 22:16:15 -06:00
grossmj
cc03017739 Cleanup the VirtualBox Media Manager after closing a project. Fixes #145. 2015-04-28 12:02:21 -06:00
Julien Duponchelle
5f6d1bfdd6 Merge branch 'master' into unstable 
Conflicts:
	tests/modules/test_manager.py
 2015-04-28 10:46:59 +02:00
grossmj
a884af983f Avoid Cygwin warning with VPCS on Windows. 2015-04-27 22:23:27 -06:00
Jeremy Grossmann
4f021054e0 Merge pull request #158 from GNS3/keep_iou_config 
Do not erase the IOU initial-config if there is one when creating the IOU VM.
 2015-04-27 18:37:17 -06:00
Jeremy
8503472c77 Close VirtualBox VM linked clone disks after the VM is unregistered. Fixes #145. 2015-04-27 17:10:32 -06:00
Julien Duponchelle
77f54848e3 Fix some tests on Windows 2015-04-27 23:12:13 +02:00
Jeremy
f208b472a1 TAP interface support for QEMU VMs. Fixes #153. 2015-04-27 14:38:15 -06:00
Julien Duponchelle
324a4f73d0 Do not erase the IOU config 2015-04-27 18:22:54 +02:00
Julien Duponchelle
4df95efdec Skip IOU test on Windows 
Fix #159
 2015-04-27 15:09:42 +02:00
grossmj
271cb527d4 Explicit utf-8 decoding. 2015-04-26 21:19:39 -06:00
grossmj
6edf1e3649 Check NIO exists when stopping an IOU capture. 2015-04-26 21:15:15 -06:00
grossmj
017997e0a3 Fixes c7200 NPE setting. 2015-04-26 18:35:12 -06:00
grossmj
3e6996903f Fixes VPCS process termination. 2015-04-26 12:57:06 -06:00
grossmj
da2b895c99 Catch FileNotFoundError exception in os.getcwd() 2015-04-26 12:49:29 -06:00
grossmj
683a512917 Fixes #150. 2015-04-25 15:20:15 -06:00
grossmj
80a0e0ebf7 Explicit utf-8 encoding where necessary to avoid Unicode errors on Windows (we require/set an utf-8 locale on other systems). 2015-04-25 11:58:34 -06:00
grossmj
d68bf1c263 Removes unnecessary sleep in VirtualBox VM. 2015-04-25 09:36:28 -06:00