arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-15 21:08:55 +00:00
Code Issues Releases Wiki Activity
1,422 Commits 5 Branches 202 Tags 150 MiB
d853ffe791
Commit Graph

1155 Commits

Author SHA1 Message Date
Julien Duponchelle
b1f740c952 Merge branch 'master' into unstable 2015-06-17 14:09:32 +02:00
Julien Duponchelle
afa4ba9b55 Crash report key for 1.3.7 2015-06-17 09:30:56 +02:00
grossmj
7980ae9ab1 Update version_info. 2015-06-16 15:00:25 -06:00
grossmj
3495035dbf Bump version to 1.3.7.dev1 2015-06-16 14:39:20 -06:00
Julien Duponchelle
a2d4c2427d 1.3.6 2015-06-16 21:56:44 +02:00
Julien Duponchelle
0dae4b6930 1.3.6dev1 2015-06-16 19:32:53 +02:00
Julien Duponchelle
d88c5648de 1.3.5 2015-06-16 18:56:50 +02:00
Julien Duponchelle
94fbd3fac9 Ignore invalid characters when reading the output of a process 
It should happend only when user try to use another binary and
the code of VPCS, dynamips... Will detect it's not the
correct binary.

For example we detect this error after an user used SupperPutty
instead of VPCS.

Fix #235
 2015-06-16 15:48:59 +02:00
Julien Duponchelle
e2ef78a7c4 Ignore invalid characters when reading the output of a process 
It should happend only when user try to use another binary and
the code of VPCS, dynamips... Will detect it's not the
correct binary.

For example we detect this error after an user used SupperPutty
instead of VPCS.

Fix #235
 2015-06-16 15:48:09 +02:00
grossmj
8bcf749cd5 Adds an IP address for each interface returned by the interfaces API method. 2015-06-12 17:54:02 -06:00
Julien Duponchelle
f39f7be503 Add log when we didn't close a project due to another client 2015-06-12 15:14:30 +02:00
Julien Duponchelle
4e16433a08 Limit file size during upload 
Fix #86
 2015-06-12 10:10:46 +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
6e88ba4c25 Cleanup SSL certificate support 
Fix #208
 2015-06-11 17:07:13 +02:00
Julien Duponchelle
04e62e429c Merge branch 'master' into unstable 2015-06-11 16:55:09 +02:00
Julien Duponchelle
a2833cf276 Turn on / off authentication 2015-06-10 23:14:18 +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
Julien Duponchelle
b36c5f25d2 Improve memory consumption of file upload with the HTML form 
Fix #86
 2015-06-10 14:20:06 +02:00
Julien Duponchelle
7c7f8fe3ed Fix ethernet interfaces tests if eth0 doesn't exists 
Also on Windows and MacOS it return error if we try
to use a non existing interfaces.

Fix #230
 2015-06-09 16:35:21 +02:00
Julien Duponchelle
bd4b6396a8 Ensure in test we didn't load the local configuration 2015-06-09 16:32:36 +02:00
Julien Duponchelle
36d5049c61 More debug for the interfaces up crash debug 2015-06-09 10:10:06 +02:00
Julien Duponchelle
079715bc18 Ensure no colored output on Windows 
Fix #228
 2015-06-09 10:05:00 +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
b118f9a078 Replace RuntimeError by SystemExit. 2015-06-03 19:58:58 -06:00
grossmj
37ddff9f07 Support for base MAC address for Qemu VMs. 2015-06-03 14:52:49 -06:00
grossmj
9f15fdbc2b Fixes #181 (drop Python 3.3). 2015-06-03 12:08:11 -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
78891ae00e Basic Auth support 2015-06-03 15:38:34 +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
Julien Duponchelle
a1bc815f63 Update crash report key 2015-06-02 20:27:33 +02:00
Julien Duponchelle
668cc3f0a5 1.3.5dev1 2015-06-02 20:05:31 +02:00
Julien Duponchelle
42a8c7147a 1.3.4 release 2015-06-02 19:48:04 +02: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
ad27fdf8b9 Bump version to 1.3.4.dev2 2015-06-01 16:29:49 -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
ada94d486a Get server resource independant of working directory 2015-05-28 13:24:45 +02:00
Julien Duponchelle
85c185604e Merge branch 'master' into unstable 2015-05-28 12:18:24 +02:00
Julien Duponchelle
a2dfeab315 Load faulthandler module only for dev build 2015-05-28 12:17:56 +02:00
Julien Duponchelle
16cad8426a Enable faulthandler only for dev build 2015-05-28 12:17:25 +02:00
Julien Duponchelle
9442042d7a Merge branch 'master' into unstable 2015-05-28 12:04:01 +02:00
Julien Duponchelle
57a069b027 Support cacert.pem in the new frozen package 2015-05-28 11:31:23 +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
74ee73581a Fix crash if you pass an invalid hostname 
Fix #198
 2015-05-27 17:34:01 +02: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
50d7a4f335 Catch encoding errors in windows logger 2015-05-26 13:05:37 +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
b62efa3bae I'm stupid... Remove fake segfault 2015-05-26 10:05:53 +02:00
Julien Duponchelle
c5171b887f Add the fault handler in order to try to get a proper crash stack 2015-05-26 10:05:21 +02:00
grossmj
f169455ad4 Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-26 10:04:22 +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
Julien Duponchelle
8c9758d16b I'm stupid... Remove fake segfault 2015-05-17 23:10:50 +02:00
Julien Duponchelle
0c5b753211 Add the fault handler in order to try to get a proper crash stack 2015-05-17 12:47:04 +02:00
Jeremy
cb7b9e8190 Adapters for VMware VMs. 2015-05-15 19:09:48 -06:00
grossmj
221a35baae Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-14 20:54:38 -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
Julien Duponchelle
5bb870dc0f New crash report key 2015-05-14 19:28:26 +02:00
Julien Duponchelle
76be91d544 1.3.4dev1 2015-05-14 19:23:21 +02:00
Julien Duponchelle
078b72cafd Version 1.3.3 2015-05-14 18:57: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
Julien Duponchelle
a3c0f0754e Fix crash 2015-05-13 23:27:51 +02:00
Jeremy
25a6616cd0 Some wording changes. 2015-05-13 13:53:42 -06:00
Julien Duponchelle
157bc18ebd Use a temporary directory as egg cache 
We have use with broken permission on their
system. We try to workaround the issue.

Fix #182
 2015-05-13 14:29:03 +02: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
bebdadc465 Bump version to 1.3.3.dev3 2015-05-07 11:52:17 -06:00
Julien Duponchelle
b0ce091a4c 1.3.3rc1 2015-05-07 16:03:51 +02: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
3ba4789ba6 New crash report key 
Fix #180
 2015-05-06 09:55:14 +02:00
grossmj
17b93e6a89 Bump version to 1.3.3dev2 2015-05-05 14:49:03 -06:00
Julien Duponchelle
4b21135ba7 Turn off configuration parser interpolation 2015-05-05 11:53:33 +02:00
Julien Duponchelle
a3f00e1f45 Catch configuration file parsing errors 
Fix #176
 2015-05-05 11:44:35 +02:00
Julien Duponchelle
b7dac1bec4 Force closing the event loop to avoid warning with Python 3.4.3 
Fix #177
 2015-05-05 11:33:47 +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
Julien Duponchelle
22efc7488f Catch BrokenPipeError for OSX frozen server 
Fix #166
 2015-05-05 10:46:09 +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
Jeremy
c4054cf810 Catch the "WinError 0 The operation completed successfully" exception at a higher level. 2015-05-04 12:14:04 -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
65103e9332 Merge remote-tracking branch 'origin/master' 2015-05-03 11:41:09 -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
151788e48a Force utf-8 configuraton files reading 
Fix #170
 2015-05-01 17:49:16 +02:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Julien Duponchelle
57f5e7a7d9 Merge branch 'master' into unstable 2015-05-01 13:20:09 +02:00
Julien Duponchelle
6b70fa9794 Do not list file starting with a . in upload handler 2015-05-01 10:55:08 +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
Julien Duponchelle
e75fbc9d73 Catch connection reset errors 
Fix #162
 2015-04-29 11:15:32 +02:00
grossmj
0311a0086e Fixes typo. 2015-04-28 22:16:15 -06:00
Julien Duponchelle
461e3ce53f 1.3.3dev1 2015-04-28 21:49:48 +02:00
Julien Duponchelle
1b4613fbaf Version 1.3.2 2015-04-28 21:06:04 +02: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
Jeremy
b6a935aeb8 Return an explicit error when a NIO type is not supported by a VM. 2015-04-27 14:19:17 -06:00
Julien Duponchelle
324a4f73d0 Do not erase the IOU config 2015-04-27 18:22:54 +02:00
Julien Duponchelle
d5ae4750e9 Do not load IOU handler on Windows during tests 
Fix #159
 2015-04-27 16:21:56 +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
Jeremy
fa544ef888 Fixes #270. Relative paths management with empty ones. 2015-04-24 17:27:32 -06:00
Jeremy
8f6e5b4ad8 Merge branch 'unstable' into daemon 
Conflicts:
	gns3server/main.py
 2015-04-24 16:37:56 -06:00
Julien Duponchelle
24bfd8ab53 New crash report key and doesn't send report for developers 2015-04-24 18:30:31 +02:00
Jeremy
40ce22222e Merge branch 'unstable' into api_list_images 
Conflicts:
	gns3server/handlers/api/iou_handler.py
 2015-04-23 17:19:37 -06:00
Jeremy Grossmann
7e991cc404 Merge pull request #154 from GNS3/wireshark_remote_capture 
Support for Wireshark remote packet captures.
 2015-04-23 16:17:44 -06:00
Julien Duponchelle
83f2509cfe Cleanup exceptions 2015-04-23 16:56:46 +02:00
Julien Duponchelle
6b862b8397 Correctly show the host in templates 
Fix #157
 2015-04-23 14:32:10 +02:00
Julien Duponchelle
fac0f5ecd9 Proper daemon support 2015-04-23 11:10:02 +02:00
grossmj
3680c40e23 Catch COM errors when connecting to WMI. 2015-04-23 00:03:44 -06:00
grossmj
30f6263146 Don't assume the PATH environment variable exists. 2015-04-22 21:42:36 -06:00
grossmj
161adb781b Use UUIDs instead of the VM names for VirtualBox pipe paths. 2015-04-22 20:29:52 -06:00
Julien Duponchelle
2e39265da1 Merge branch 'master' into unstable 2015-04-22 17:34:17 +02:00
Julien Duponchelle
9c549b175f Add --log options for daemon support 2015-04-22 17:28:58 +02:00
Julien Duponchelle
bf618d321c Max 100 thread executor 2015-04-22 10:39:43 +02:00
Julien Duponchelle
8b879c0614 Support wireshark remote capture 2015-04-20 19:27:07 +02:00
Julien Duponchelle
cf0adf56a8 Merge branch 'master' into unstable 2015-04-20 19:26:27 +02:00
Julien Duponchelle
531e95463c Add qemu-kvm to the list of binary 2015-04-20 10:12:17 +02:00
Julien Duponchelle
3926390d30 Fix tests broken by a previous commit 2015-04-18 09:22:37 +02:00
grossmj
343e007809 Ignore the "OSError: [WinError 0] The operation completed successfully" exception in Windows. 2015-04-16 20:17:06 -06:00
grossmj
c6dbf296cf Merge remote-tracking branch 'origin/master' 2015-04-16 13:24:48 -06:00
Julien Duponchelle
dfdc18b20c Merge branch 'master' into unstable 2015-04-16 18:38:59 +02:00
Julien Duponchelle
bca90bc563 API in order to get the list of IOU, Dynamips, Qemu images 2015-04-16 18:32:12 +02:00
Julien Duponchelle
b5e01f7560 Fix IOU licence check flag 2015-04-16 09:51:02 +02:00
grossmj
4136c29b0f Config paths are not used when updating Dynamips or IOU VM settings. 2015-04-15 19:50:40 -06:00
grossmj
aeab9780d8 Fixes initial-configs that were not restored when opening a project containing IOU VMs. 2015-04-15 19:49:40 -06:00
Julien Duponchelle
789e24795e Merge branch 'master' into unstable 2015-04-15 16:29:54 +02:00
Julien Duponchelle
26a7f83db2 Remove the workaround for dynamips OSX 2015-04-15 15:58:31 +02:00
Julien Duponchelle
def453c116 Restore "iourc_path" until I speak with jeremy about it 2015-04-15 15:50:34 +02:00
Julien Duponchelle
997f7cbd6f Fix noise in logs 2015-04-15 15:40:07 +02:00
grossmj
aab4a7243b Merge remote-tracking branch 'origin/master' 2015-04-14 18:21:42 -06:00
Julien Duponchelle
aa2472fb30 Rewrote image search 
This code is more generic and support all cases. Previously
we had bug where the user lost his image path if the image
was not located in image directory.
 2015-04-14 18:46:55 +02:00
Julien Duponchelle
e51a129216 Prevent parallel execution of VBox commands 
In theory it should not be a problem.
But It's create issues like this one:

Fix: https://github.com/GNS3/gns3-gui/issues/261
 2015-04-14 15:00:45 +02:00