ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-25 07:21:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,957 Commits 5 Branches 205 Tags 76 MiB
3f7c4c0474
Commit Graph

722 Commits

Author SHA1 Message Date
grossmj
2ea0aa5ded Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
 2018-04-18 17:08:42 +08:00
grossmj
dd9c18b9f8 Use SO_REUSEADDR before calling bind() where missing. Fixes #1289. 2018-04-16 16:36:36 +08:00
grossmj
025441f027 Add default destination setting for traceng + some checks. 2018-04-16 15:03:22 +08:00
grossmj
2de182eff4 Grid size support for projects. 2018-04-13 16:54:57 +08:00
grossmj
ee5317948b Fix tests. 2018-04-06 14:32:06 +07:00
grossmj
7622c10cc9 Returns the ports' adapter types and mac addresses when available. 2018-04-06 13:19:17 +07:00
grossmj
395277d5c5 Support for console auto start. 2018-04-04 21:31:35 +07:00
grossmj
757c103c03 Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361. 
MAC addresses can customized for Qemu as well.
 2018-04-02 22:27:12 +07:00
grossmj
509b171b06 Allow to have projects with the same name in different locations. 2018-03-30 23:01:37 +07:00
grossmj
ea0009db6c Save state feature for VirtualBox and VMware. New "On close" setting to 
select the action to execute when closing/stopping a Qemu/VirtualBox/VMware VM.
 2018-03-30 21:18:44 +07:00
grossmj
64949f5d04 Fix bug with 'none' console type for Ethernet switch. 
Fix some tests related to traceng.
 2018-03-30 13:00:52 +07:00
grossmj
669d2ec038 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/schemas/node.py
 2018-03-30 12:14:09 +07:00
grossmj
297bbd91ec Fix traceng tests. 2018-03-30 12:10:57 +07:00
grossmj
898f180310 Fix issue with start all. 2018-03-29 13:32:56 +07:00
grossmj
b7780ba7cc Check for valid IP address and prevent to run on non-Windows platforms. 2018-03-29 13:26:43 +07:00
grossmj
d08c08617c Support for source and destination for traceNG. 2018-03-27 16:58:49 +07:00
grossmj
5d704aa478 Fix tests. 2018-03-24 18:25:09 +07:00
grossmj
e52775fa3a Support for console type "none". 2018-03-24 18:11:21 +07:00
grossmj
8b91894fa4 Improve suspend a link for Qemu and VirtualBox VMs. 
A suspended link will be unplugged allowing the VMs to be notified
of the change.
 2018-03-19 16:26:12 +07:00
grossmj
fb3bcf3b8f Basic project stats. 2018-03-15 15:21:29 +07:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
grossmj
a4626a2b79 Custom icons and small fixes for TraceNG integration. 2018-03-14 16:56:37 +07:00
grossmj
397c1322b4 Base support for TraceNG. 2018-03-12 17:57:13 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
grossmj
38f458db7c Delete old pcap file when starting a new packet capture. 2018-03-08 16:00:05 +07:00
grossmj
233e41d006 Fix export project test. 2018-03-08 00:39:08 +07:00
grossmj
22db13d2bf Fix bug preventing to export portable projects with IOU images. 2018-03-08 00:13:35 +07:00
grossmj
d911e82dc4 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-03-07 16:42:12 +07:00
grossmj
c93d0d8d12 Make sure we don't try to read when opening a file in binary more. Fixes #1301. 2018-03-07 16:39:04 +07:00
ziajka
53a229f8e9 Fix never reached condition 2018-03-05 11:16:03 +01:00
ziajka
05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
ziajka
9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
ziajka
09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
grossmj
fff593b358 Fix error when appliance template is broken (missing fields). Fixes #1287. 2018-02-06 16:07:23 +08:00
grossmj
abbe3d3a31 Fix "Change of linked base VM doesn't work with templates migrated from 2.0" 2018-02-05 16:42:29 +08:00
grossmj
519df3ab35 Let a project be opened when a port cannot be found (can happens if a project is corrupted). 2018-02-02 22:05:51 +08:00
grossmj
e5c76750b1 Fix issue when running multiple project containing IOU nodes on the same server. Ref #1239. 2018-01-31 15:51:29 +07:00
grossmj
008baad86a Update link state and save project when a link is suspended or filters are added/removed (without node properties set). 2018-01-30 17:39:33 +07:00
ziajka
eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
ziajka
d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
grossmj
28f8216590 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-01-23 12:47:13 +07:00
grossmj
7ded71142f Fix same MAC address for duplicated Qemu nodes. 2018-01-17 14:13:06 +08:00
grossmj
c281f55fb2 Fix same base MAC for duplicated IOS routers. Fixes #1264. 2018-01-17 14:01:44 +08:00
grossmj
e5e2b7a8ac Fix "Creating multiple IOU nodes at once assigns the same application id". Fixes #1239. 2018-01-15 18:09:05 +07:00
grossmj
ffc7024b64 Fix error while getting appliance list. Fixes #1258. 2018-01-14 20:29:17 +07:00
grossmj
88989cc274 Default symbol must be computer.svg 2018-01-12 21:46:48 +07:00
grossmj
ab6fe6da1d Compatibility for old node templates (those with default_symbol and hover_symbol properties). 2018-01-12 17:34:37 +07:00
grossmj
f9c7c15f95 Fixing race condition when starting the GNS3 VM. 2018-01-10 16:22:55 +07:00
grossmj
5f14f8eb46 Default VPCS name format is now PC-{0}. 2018-01-09 23:40:35 +07:00
ziajka
f48420af58 Increase timeout for creation of image, Ref. #2239 2017-12-21 08:46:20 +01:00
ziajka
a393e7f723
Merge pull request #1205 from GNS3/aiohttp-2.3.1 
aiohttp 2.3 support.
 2017-12-18 11:09:16 +01:00
grossmj
3e3e1df051 Allow users to see an error when the server cannot stream a PCAP file. 2017-12-07 12:28:01 -06:00
grossmj
cfe8e9e85c Warn users if the GNS3 VM and local server are not in the same subnet. Fixes #1231. 2017-12-05 16:43:44 -06:00
grossmj
6e2752648a Implement #1153 into 2.2 branch. 2017-11-27 15:16:46 +07:00
grossmj
e54d574e47 Fix auto idle-pc from preferences. 2017-11-23 23:00:31 +07:00
grossmj
061af38b5a Make sure connected links are removed when a node is deleted. 2017-11-23 11:19:41 +07:00
ziajka
fe59c937d5
Merge branch '2.1' into improved-export-project 2017-11-20 11:15:04 +01:00
ziajka
b48f5df53f iExport files from remote server, Fixes: gui/#2271 2017-11-20 10:47:03 +01:00
grossmj
035a078b5e Show qemu-img stdout in case of an error. 2017-11-17 18:13:34 +07:00
ziajka
009677f019 Fix typo in vcpus on VirtualBoxVM, fixes: #1213 2017-11-07 11:15:49 +01:00
ziajka
255dc7ed9b Fix GNS3VM vCPUs control on VMware, fixes: #2324 2017-11-06 15:15:37 +01:00
ziajka
a7412d1c87 aiohttp 2.3.1 dependency 2017-10-26 16:29:01 +02:00
Jeremy Grossmann
c7015435c9 Update vmware_gns3_vm.py 2017-10-18 15:53:37 +07:00
ziajka
44efab109e Set vhv.enable before run for VMWare 14. Fixes #1184 2017-10-18 10:32:56 +02:00
Jeremy Grossmann
4cae6b678a Merge pull request #1194 from GNS3/direct-file-uploads 
Endpoint for obtaining direct action on compute
 2017-10-16 17:27:35 +08:00
grossmj
4f13c63a52 Do not use builtin name. 2017-10-13 17:51:19 +08:00
grossmj
02ad98664f Fix creation of an VMware VM failed with invalid JSON. Fixes #2282. 2017-10-13 17:50:23 +08:00
ziajka
b654d78ea6 Endpoint for obtaining direct action on compute 2017-10-13 11:03:56 +02:00
grossmj
e1c8df170a Allow projects to be opened even when a node port is already used. 2017-09-14 17:57:58 +07:00
grossmj
4a2dfb0037 Do not prevent a project to be deleted. Fixes #2237. 2017-09-06 18:12:22 +07:00
grossmj
90e3a8d612 Round-robin nodes across all available compute resources. Fixes #1165. 2017-09-03 22:51:51 +07:00
grossmj
c22229101f Try to improve error reporting when streaming a PCAP file. Ref #2235. 2017-09-01 17:10:24 +07:00
ziajka
b0783eeccc Load meta of the project on loading time (Fixes #2225) 2017-08-22 09:36:52 +02:00
ziajka
e15d1cd350 Fixes loading project when link_id is not set (#1159) 2017-08-10 10:02:18 +02:00
ziajka
3fd86f5807 Return platform value on appliances list (Fixes #2211) 2017-08-08 13:58:43 +02:00
ziajka
3a1fd892ac Fixes not known category in Appliances (Fixes #1156) 2017-08-07 10:00:46 +02:00
Julien Duponchelle
211f48d981
Catch error when something that is not the GNS3 server answer to virtualbox requests 
Fix #1155
 2017-08-03 16:31:28 +02:00
Julien Duponchelle
3bb8cdafb2
Catch KeyError: <aiohttp.connector._TransportPlaceholder 
Fix #1152
 2017-08-02 10:16:49 +02:00
Julien Duponchelle
6996b7094f
Handle invalid appliances files 
Fix #1150
 2017-07-28 15:21:35 +02:00
Julien Duponchelle
283b08c2a1
Fix naming of node with a number in the name 
Fix #1149
 2017-07-27 16:06:52 +02:00
Julien Duponchelle
7683a79bb1
Fix OSError when uploading images 
Fix #1101
 2017-07-27 11:42:10 +02:00
Julien Duponchelle
103be13ba4
Fix an error when a symbol is not available on filesystem 
Fix #1102
 2017-07-27 11:39:25 +02:00
Julien Duponchelle
cc89099ea5
Fix ServerDisconnectedError for stop_all 
Fix #1089
 2017-07-27 11:33:27 +02:00
Julien Duponchelle
27582bb68c
Fix IOU image upload 
Fix #1141
 2017-07-25 14:59:55 +02:00
grossmj
47e8392ceb Use uuid4() for temporary node name while duplicating a node. 2017-07-24 15:52:14 +07:00
Julien Duponchelle
0854c04687
API for duplication a Node 
Support:
* VPCS
* Dynamips router
* Ethernet switch

Ref #1065
 2017-07-24 10:08:22 +02:00
Julien Duponchelle
b37a282475
Raise a NotImplementedError for IPV6 support in old UDP cloud 
Fix #1093
 2017-07-20 16:23:32 +02:00
Julien Duponchelle
c96694105c
Handle broken appliance files 
Fix #1135
 2017-07-20 16:10:56 +02:00
Julien Duponchelle
46e5e8ac68
Log error if you invalid character in auth login 
Fix #1088
 2017-07-20 15:42:07 +02:00
Julien Duponchelle
8354beaa86
Return computer symbol if an appliance don't have symbol 
Fix #1087
 2017-07-20 15:13:58 +02:00
Jeremy Grossmann
27f733736e Merge pull request #1133 from GNS3/appliances_dir 
Add an appliance templates directory
 2017-07-19 22:10:13 -07:00
grossmj
ca3f6fb4b8 Update some sentences related to suspending a link. 2017-07-20 11:11:44 +07:00
Julien Duponchelle
5fd842e54d
Suspend link 2017-07-19 17:30:25 +02:00
Julien Duponchelle
7d123f334f
Add an appliance templates directory 
Fix https://github.com/GNS3/gns3-gui/issues/2133
 2017-07-19 11:44:05 +02:00
Jeremy Grossmann
c2fbe4f313 Merge pull request #1130 from GNS3/vmware_filters 
Filters support for VMware
 2017-07-19 14:59:25 +07:00
Julien Duponchelle
fa211a82eb
Filters support for VMware 
Fix #1108
 2017-07-18 18:04:03 +02:00
Julien Duponchelle
54faaf5f6f
Packet filters support for VirtualBox 
Fix #1107
 2017-07-18 14:59:47 +02:00
Julien Duponchelle
873418dbbe
Fix a merge error 2017-07-18 09:24:36 +02:00
Julien Duponchelle
08d4c1a000
Merge branch '2.1' into filters_iou 2017-07-17 17:51:17 +02:00
Julien Duponchelle
536c708c16
Filter implementation for cloud & Nat 
Fix #1111
 2017-07-17 17:27:07 +02:00
Julien Duponchelle
5b839c22e9
Filters support for IOU 
Fix #1113
 2017-07-17 11:21:54 +02:00
Julien Duponchelle
23c3d32e06
Filter support for Docker 
Fix #1110
 2017-07-12 19:44:15 +02:00
Julien Duponchelle
03f8c747cc
Qemu support for packet filtering 
Fix #1112
 2017-07-12 14:50:33 +02:00
Julien Duponchelle
86f1201276
Support packet filtering for dynamips 
Fix #1109
 2017-07-12 12:08:02 +02:00
Jeremy Grossmann
2e592d3199 Merge pull request #1121 from GNS3/bfp_filter 
BPF filter support
 2017-07-12 16:22:01 +07:00
grossmj
b37f9eb4f0 Update schema for BPF filter. 2017-07-12 16:21:11 +07:00
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +02:00
Julien Duponchelle
8a8de1e2df
BPF filter support 
Fix https://github.com/GNS3/gns3-gui/issues/765
 2017-07-11 17:30:29 +02:00
Julien Duponchelle
450c089b6d
Test if a snapshot name already exists 
This fix random test failure when testing snapshots. It
seem under high load sometimes the previous snapshot folder
was not visible on disk. Perhaps a test isolation issue but
I don't see how.

But in any case it's better to test if the name is not already
use.

Fix #1118
 2017-07-11 15:28:01 +02:00
Jeremy Grossmann
339ed8ab57 Merge pull request #1106 from GNS3/idlepc_apicall 
Implement an api call for computing the IDLE PC
 2017-07-10 11:33:16 +07:00
Jeremy Grossmann
5bdc239064 Merge pull request #1104 from GNS3/filters_api 
Support packet filtering for VPCS
 2017-07-08 18:50:00 +07:00
Julien Duponchelle
3eadbb9adb
Implement an api call for computing the IDLE PC 
Fix https://github.com/GNS3/gns3-gui/pull/2153
 2017-07-07 17:50:40 +02:00
grossmj
8f260e0a83 Update field names for filters. 2017-07-06 16:53:05 +07:00
Julien Duponchelle
4097bab565
Apply feedback from @grossmj 2017-07-05 16:36:39 +02:00
Julien Duponchelle
08423eff96
Support packet filtering for VPCS 
https://github.com/GNS3/gns3-gui/issues/765
 2017-07-04 15:12:26 +02:00
ziajka
dadbb0ab09 More options for drawing area 2017-07-03 10:01:22 +02:00
ziajka
cc34f45677 Additional drawing options for Project 2017-06-30 14:31:25 +02:00
grossmj
5b19ef4862 Remove forgotten debug message. 2017-06-28 16:11:46 +08:00
Jeremy Grossmann
799a2d376e Merge pull request #1092 from GNS3/fix_vpcs_name 
Fix the initial startup for VPCS is not used
 2017-06-28 16:09:54 +08:00
Julien Duponchelle
0a6dc55645
Fix appliance properties lost when you create two node from template 2017-06-28 09:37:19 +02:00
Julien Duponchelle
617868402f
Fix the initial startup for VPCS is not used 
The default VPCS template didn't provide the base
startup config setting. This prevent the replacement
of the hostname in the configuration file.

Fix https://github.com/GNS3/gns3-gui/issues/2123
 2017-06-27 18:44:31 +02:00
ziajka
931018b877 Fix passing tests 2017-06-27 11:11:07 +02:00
ziajka
6aa2afcf54 Fix #557 - mac addess collision when running IOU on multiple GNS3 servers 2017-06-27 10:09:21 +02:00
ziajka
1d09f423e5 Disable checking if IOU is on the same server 2017-06-23 12:20:49 +02:00
Julien Duponchelle
734ca7d2f9
Fix linked base & linked clone settings in appliance 2017-06-19 10:49:23 +02:00
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-19 10:44:52 +02:00
Julien Duponchelle
c8c991af78 Fix the error about appliance ID not found (#1075) 
* Fix the error about appliance ID not found

* Copy appliance data before editing it
 2017-06-19 08:47:50 +02:00
ziajka
64a852f38f Fixes #1068 - handle zipfile encoding issues at project duplication 2017-06-09 15:32:25 +02:00
ziajka
e0b519eced Fix when config file doesn't have computes section (#1062) 2017-06-07 10:50:40 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
Julien Duponchelle
39879ca92b
Duplicate project on remote server use UUID 
Ref https://github.com/GNS3/gns3-server/issues/1040
 2017-05-23 17:20:51 +02:00
Julien Duponchelle
d765d02f06
Fix error in logging of error during starting GNS3 VM 2017-05-23 13:39:41 +02:00
Julien Duponchelle
59488e8064 Fix tests on python 3.4 (#1046) 2017-05-23 12:15:04 +02:00
Jeremy Grossmann
82f1ab2be2 Merge pull request #1036 from GNS3/aiohttp_2.0 
Aiohttp 2.0
 2017-05-22 22:41:01 +02:00
Julien Duponchelle
7d30da5d4e
Do not wait auto start to finish in order to complete project opening 
Fix https://github.com/GNS3/gns3-gui/issues/2074
 2017-05-22 20:18:07 +02:00
Julien Duponchelle
4dc55a5af4
Improve logging for remote server connection lost 
Ref https://github.com/GNS3/gns3-gui/issues/2074
 2017-05-22 13:57:32 +02:00
Julien Duponchelle
bdd980d6a2
Ignore console_hsot when loading topologie 2017-05-22 11:42:50 +02:00
Julien Duponchelle
51d6152a5c
Fix support for some old topologies 
Fix #1042
 2017-05-19 18:27:20 +02:00
Julien Duponchelle
bdcadcc335
Fix support from some old topologies 
Fix #1038
 2017-05-19 17:49:39 +02:00
Julien Duponchelle
624a2c02c5
FIX iou creation 
Fix https://github.com/GNS3/gns3-gui/issues/2065
 2017-05-18 17:13:40 +02:00
Julien Duponchelle
a4245fcf44
Aiohttp 2.0 
Ref #1000
 2017-05-17 18:42:17 +02:00
Julien Duponchelle
e9fef928b0
Fix dynamips node creation error 2017-05-16 10:49:45 +02:00
Julien Duponchelle
5c5caf8418
Add comment about why we change linked_base to linked_clone 2017-05-16 10:38:58 +02:00
Julien Duponchelle
aff5554528
Rename old properties from gui linked_base to linked_clone 
Fix #1034
 2017-05-16 10:33:37 +02:00
Julien Duponchelle
2a159c06c5
Fix forwarding properties 
Fix #2005, #2002
 2017-05-16 10:22:55 +02:00
Julien Duponchelle
bef1b2e8f1
Merge branch '2.0' into 2.1 2017-05-16 08:38:13 +02:00
Julien Duponchelle
39419462db
Handle HTTP 504 errors from compute node 
Fix #1032
 2017-05-16 08:37:54 +02:00
Julien Duponchelle
cd17ef6b12
Merge branch '2.0' into 2.1 2017-05-15 15:46:50 +02:00
Julien Duponchelle
851d6e1db8
When importing portable project NAT node is loaded on GNS3 VM 
Fix #1030
 2017-05-15 10:21:37 +02:00
Julien Duponchelle
5721dd3f30
Fix port numbering for Wic slot 1 & 2 2017-05-12 14:12:24 +02:00