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

672 Commits

Author SHA1 Message Date
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
Julien Duponchelle
19a6157f64
Fix wic numbering
Fix #1011
2017-05-12 09:48:05 +02:00
Julien Duponchelle
766456014b
Fix export project is looking into the wrong directory
Fix #1010
2017-05-11 17:59:57 +02:00
Julien Duponchelle
fb6a95f7bb
Fix conversion issue with old topology with C3640
Fix #1019
2017-05-10 13:50:19 +02:00
Julien Duponchelle
93fe66a253
Fix error when you have a directory in your symbols directory
Fix #1006
2017-05-10 13:40:49 +02:00
Julien Duponchelle
e870b0cfa0
Catch VMWare errors when getting status after GNS3 VM start
Fix #1008
2017-05-09 19:16:47 +02:00
Julien Duponchelle
050f6876ce
Fix KeyError: 'filename'
Fix #1018
2017-05-09 12:25:15 +02:00
Julien Duponchelle
bfee08459d
Test image sorting
Ref https://github.com/GNS3/gns3-gui/issues/2030
2017-05-05 20:09:51 +02:00
Julien Duponchelle
8a6584d90f
Sort image list
Fix https://github.com/GNS3/gns3-gui/issues/2030
2017-05-05 19:52:45 +02:00
Julien Duponchelle
930e7089db
Fix a conversion issue with some 1.3 topologies 2017-05-04 12:09:56 +02:00
Julien Duponchelle
7ba351c888
Catch timeout error when loading virtualbox VM
Fix #999
2017-05-03 17:44:55 +02:00
Julien Duponchelle
ae3e25b03b
Handle broken compute at server startup
Fix #1001
2017-05-03 17:40:58 +02:00
Julien Duponchelle
fa1450cb24
Catch error when we can't backup the topology
Fix #998
2017-05-03 17:35:10 +02:00
Julien Duponchelle
8e5f7d0838
Catch error when writting the topology file on read only device
Fix #1003
2017-05-03 17:28:47 +02:00
Julien Duponchelle
a6d085bf61
Fix server startup on windows 2017-04-28 11:06:39 +02:00
Julien Duponchelle
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +02:00
Julien Duponchelle
2962649dc8
Fix a race condition when handling error at project opening
Fix #983
2017-04-19 09:17:32 +02:00
Julien Duponchelle
f3a87d76ef
Fix import of some old topologies
Fix #977
2017-04-14 10:38:21 +02:00
Julien Duponchelle
9dc6f0f486 Embed the appliances in the server. (#927)
This add a /appliances call
2017-04-12 14:35:49 +02:00
Julien Duponchelle
ab2af5ceab
Catch error and log them when we can't write the config
Fix #974
2017-04-10 17:44:09 +02:00
Julien Duponchelle
03a134af75
Catch an error at startup when the remote GNS3 VM is not a real GNS3 VM 2017-04-07 15:34:18 +02:00
Julien Duponchelle
ec6fdb7324
Catch GNS3 VM loading error at startup 2017-04-04 14:25:30 +02:00
Julien Duponchelle
4f1b738ef5
Merge branch '2.0' into 2.1 2017-03-30 10:16:16 +02:00
Julien Duponchelle
815820f692
Catch some broken hostname for compute node
Fix #961
2017-03-28 12:14:27 +02:00
Julien Duponchelle
aae37034e1
Fix conversion of project from 1.X with custom symbol for cloud 2017-03-28 09:12:36 +02:00
Julien Duponchelle
541afe9660
Support utf-8 characters in user and password for auth
Fix #959
2017-03-23 15:50:02 +01:00
Julien Duponchelle
9fd5e4cbc9
Handle password configuration change on remote servers
Fix https://github.com/GNS3/gns3-gui/issues/1942
2017-03-22 18:29:08 +01:00
Julien Duponchelle
8712866489
Fix Can't connect to compute local on some computers
Chicken and egg problem we try to connect to compute
before http was available. I rewrote the code to prevent
erase of settings and rollback the beta4 code for init.

Fix #946
2017-03-21 18:06:45 +01:00
Julien Duponchelle
cc6f4c0510
Add a modification uuid to settings returned by the server
Ref #1949
2017-03-21 13:35:02 +01:00
Julien Duponchelle
55563b9808
Escape special characters from SVG text
Ref https://github.com/GNS3/gns3-server/issues/952
2017-03-20 19:14:07 +01:00
Julien Duponchelle
5409d9c3f8
Fix some port short name display issues
Fix https://github.com/GNS3/gns3-gui/issues/1940
2017-03-20 18:10:00 +01:00
Julien Duponchelle
95f864c871
Catch server disconnected errors from computes
Fix #953
2017-03-20 17:13:37 +01:00
Julien Duponchelle
bc0e4c1174
Generate a node uuid if the uuid is missing in the .gns3
Fix #950
2017-03-20 16:21:09 +01:00
Julien Duponchelle
0997998064
Ensure to dump project before exporting it
Fix #951
2017-03-20 14:57:20 +01:00
Julien Duponchelle
490576fedc
Try to fix some 1.3 topology with corrupted data
Fix #945
2017-03-16 18:29:02 +01:00
Julien Duponchelle
31ed2a4c96
Fix ComputeError: Can't connect to Main server
Fix #942
2017-03-16 12:05:30 +01:00
Julien Duponchelle
6a015fffeb
Catch error when the server as trouble to access to itself
Fix #940
2017-03-16 10:50:08 +01:00
Julien Duponchelle
2c0fb0d016
Raise error if image are not avaible on main server during export
Fix https://github.com/GNS3/gns3-gui/issues/1928
2017-03-14 18:00:16 +01:00
Julien Duponchelle
84a6ed7684
If your settings from 1.X are broken with skip them at import
Fix #932
2017-03-13 18:17:17 +01:00
Julien Duponchelle
d60597ca0d
Catch unicode error when you try to duplicate a project with invalid characters
Fix #934
2017-03-13 17:11:37 +01:00
Julien Duponchelle
886329a978
Catch error when you try to put an invalid server url
Fix #929
2017-03-13 16:59:42 +01:00
Julien Duponchelle
99ee40df3d
Do not return broken appliances like ASA 8 2017-03-09 15:44:48 +01:00
Julien Duponchelle
5036079deb
Merge branch '2.0' into 2.1 2017-03-07 16:48:31 +01:00
Julien Duponchelle
7b642552dd
Fix GNS3VM settings are lost at startup
Fix #926
2017-03-07 15:36:35 +01:00
Julien Duponchelle
6017ebbd97
Merge branch '2.0' into 2.1 2017-03-07 11:16:05 +01:00
Julien Duponchelle
d89ea83746
When we receive settings from the client save them on disk 2017-03-07 11:12:51 +01:00
Julien Duponchelle
94d285301a
Improve error log when you have trouble to load a topology 2017-03-06 12:15:52 +01:00
Julien Duponchelle
e828c9068a
Fix an issue with some node name format
Fix #922
2017-02-28 18:03:10 +01:00
Julien Duponchelle
5a399b90fe
Merge branch '2.1' into embed_appliances 2017-02-28 14:55:33 +01:00
Julien Duponchelle
1ab9ca2333
Merge branch '2.0' into 2.1 2017-02-28 14:25:38 +01:00
Julien Duponchelle
39106ac36b
Do not prevent the creation of a local server on a machine named gns3vm
Fix #920
2017-02-28 13:11:03 +01:00