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

1023 Commits

Author SHA1 Message Date
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
Julien Duponchelle
55fed02299 Fix a crash when in some cases you can't access to VBOX state 
Fix #137
 2015-04-14 14:35:48 +02:00
Julien Duponchelle
45ca995dea Fix crash if VirtualBox doesn't return API version 
Fix #136
 2015-04-14 14:32:44 +02:00
Julien Duponchelle
af942dc419 Fix a crash in VirtualBox vm creation 
Fix #138
 2015-04-14 14:24:13 +02:00
Julien Duponchelle
1d5dc2ecf0 1.4.0 dev1 2015-04-13 10:48:14 +02:00
grossmj
443842e9b8 Allocate random names for Dynamips NIOs. 2015-04-12 18:14:45 -06:00
grossmj
78bc6e29a8 Explicitly delete Dynamips NIOs and unmap VCs for ATM and Frame-Relay switches. 2015-04-12 18:09:53 -06:00
grossmj
de5e8f852d Cleaner and generic way to set Qemu & IOU VM settings. 2015-04-12 15:09:37 -06:00
Julien Duponchelle
c99998d73c Fix version 2015-04-12 11:08:30 +02:00
Julien Duponchelle
c4963abcba 1.3.2 dev1 2015-04-11 13:59:22 +02:00
Julien Duponchelle
1ba9a2fcfa Prepare 1.3.1 2015-04-11 09:34:20 +02:00
Julien Duponchelle
eac751948e Prepare RC4 2015-04-09 10:57:25 +02:00
Julien Duponchelle
b2e53a94d4 Initial config file content can be empty 2015-04-09 10:53:18 +02:00
Julien Duponchelle
2d507fd17a Fix crash if IOU initial config is emtpy 
Fix #147
 2015-04-09 10:27:50 +02:00
Julien Duponchelle
202032f334 Fix error messages in JSON schema 2015-04-09 10:24:11 +02:00
Julien Duponchelle
1d997d9da5 Return more informations about bad requests for crash reports 2015-04-09 10:22:25 +02:00
Julien Duponchelle
9b79cce488 Dev4 version 2015-04-09 09:22:04 +02:00
grossmj
7e8b0a48ab Merge remote-tracking branch 'origin/master' 2015-04-08 11:17:49 -06:00
grossmj
7d7972afb3 Some spring cleaning. 2015-04-08 11:17:34 -06:00
Julien Duponchelle
f799fc1ab7 Prepare 1.3.1rc3 2015-04-07 16:16:19 +02:00
Julien Duponchelle
3b4a060ae9 Fix missing IOU documentation 
Fix #143
 2015-04-07 16:09:27 +02:00
Julien Duponchelle
1c4a059982 Look in old IOU images location in order to smooth transition 
Fix #141
 2015-04-07 15:25:53 +02:00
Julien Duponchelle
4189089e1b Prepare 1.3.1rc2 2015-04-06 21:34:32 +02:00
Julien Duponchelle
7efb7c2978 Do not overwrite initial-config IOU if client send an empty 
Fix #140
 2015-04-06 21:30:57 +02:00
Julien Duponchelle
e3239b7e36 Prepare 1.3.1rc1 2015-04-05 11:47:56 +02:00
grossmj
1c4202187a Fixes TAP interface use with VPCS. 2015-04-03 19:11:28 -06:00
grossmj
631d7a1e25 Avoid disconnecting valid VirtualBox VM adapter backends. 2015-04-03 19:08:29 -06:00
Jeremy Grossmann
19c5fdb1fd Merge pull request #135 from GNS3/fix_virtualbox_adapters 
Fixes missing adapters in VBox Virtual Machines.
 2015-04-04 00:13:58 +00:00
Julien Duponchelle
b46e2cf013 Fix issues with macos X dynamips not freeing UDP port 
Fix #133
 2015-04-03 13:32:07 +02:00
Julien Duponchelle
1acc9398d5 Fix encoding error when saving dynamips configuration 
Fix #134
 2015-04-03 12:13:07 +02:00
Julien Duponchelle
8fc256da6d Fix missing adapters in VBox Virtual Machines 
If you have 4 network adapter and attach only ethernet 1 and 4.
You will see eth0, eth1, eth2 and eth3 with eth0 and eth3 attached.

https://github.com/GNS3/gns3-gui/issues/255
 2015-04-03 12:08:18 +02:00
Julien Duponchelle
b330b2c157 The upload web page return a 200 in case of error 
Otherwise IE doesn't display error messages...

Fix #132
 2015-04-01 21:46:23 +02:00
Julien Duponchelle
990f243f15 Do not crash if dynamips config contain non ascii chars 
But I don't know why user can want to do that.

Fix #123
 2015-04-01 19:55:11 +02:00