1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 16:58:28 +00:00
Commit Graph

599 Commits

Author SHA1 Message Date
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
Julien Duponchelle
41d7570b24
Load local server before anything else 2017-02-28 12:08:47 +01:00
Julien Duponchelle
da8811515d
Remove noise from log when VMware is not installed 2017-02-28 11:42:07 +01:00
Julien Duponchelle
ec6411f730
Fix an error with some SVG
Fix #919
2017-02-28 11:22:53 +01:00
Julien Duponchelle
8fd59c7967
If the GNS3 VM as failed to start reset his status 2017-02-27 12:03:26 +01:00
Julien Duponchelle
8e9c480d8d
Catch some invalid node name formatting
Fix #917
2017-02-27 11:24:06 +01:00
Julien Duponchelle
53dd1bd6e1
Ensure we dump a .gns3 before exporting it
Fix #915
2017-02-27 11:10:08 +01:00
Julien Duponchelle
3fb24dd895
Avoid a crash when the connection with the server close 2017-02-23 17:54:01 +01:00
Julien Duponchelle
5bfa864f0c
Increase timeout for detecting VirtualBox GNS3 VM 2017-02-23 16:19:20 +01:00
Julien Duponchelle
0d96471f29
Fix headless startup of the GNS3 VM 2017-02-23 15:35:30 +01:00
Julien Duponchelle
8aca3c7b99
Do not crash at startup if local server as the same name as remote server
Fix #910
2017-02-23 14:34:21 +01:00
Julien Duponchelle
6a91804116
Catch error when you provide an invalid port name formating
Fix #909
2017-02-22 18:03:26 +01:00
Julien Duponchelle
b132d95a04
Fix error when you delete the builtin symbols directory
Fix #908
2017-02-20 18:28:49 +01:00
Julien Duponchelle
7fea6f0e2e
Fix conversion issue for old IOU projects
Fix https://github.com/GNS3/gns3-gui/issues/1868
2017-02-20 10:48:03 +01:00
Jeremy Grossmann
5672b4b748 Merge pull request #890 from GNS3/base_config_server_side
Manage base configuration on server
2017-02-19 22:59:06 -08:00
Julien Duponchelle
e04eb44a15
Disallow export of project with VirtualBox linked clone
Fix https://github.com/GNS3/gns3-gui/issues/1824
2017-02-14 16:41:31 +01:00
Julien Duponchelle
a191029c4f
Fix linked_clone property lost during topology convert 2017-02-14 14:45:48 +01:00
Julien Duponchelle
a576c57873
Catch permission error when restoring a snapshot
Fix #899
2017-02-13 15:30:02 +01:00
Julien Duponchelle
5639cbe860
Fix a rare crash when closing a project
Fix #900
2017-02-13 15:24:22 +01:00
Julien Duponchelle
defcf82610
Fix a rare error when closing a project
Fix #897
2017-02-13 15:18:00 +01:00
Julien Duponchelle
2a840da462
Create an ApplianceTemplate class 2017-02-08 15:40:56 +01:00
Julien Duponchelle
f33e470601
Fix error when you have error on your filesystem during project convertion
Fix #894
2017-02-07 10:36:36 +01:00
Julien Duponchelle
94fd4bcbe9
Fix stacktrace display when connecting to remote server
Fix #891
2017-02-06 17:56:08 +01:00
Julien Duponchelle
6ded234681
Fix an error with Python 3.4 2017-02-06 17:19:02 +01:00
Julien Duponchelle
bcc71b5455
Fix a crash with Python 3.4
Fix https://github.com/GNS3/gns3-server/issues/876
2017-02-06 16:52:13 +01:00
Julien Duponchelle
08c2892295
If we can't resolve compute name return 0.0.0.0
It's not perfect, but it's rare in most cases it's
handle before.

Fix #892
2017-02-06 16:47:40 +01:00
Julien Duponchelle
9c7d2e9915
Raise an error if you put an invalid key in node name
Fix https://github.com/GNS3/gns3-gui/issues/1833
2017-02-06 15:05:29 +01:00
Julien Duponchelle
0d7157c295
Improve a lot project loading speed
Fix #893
2017-02-06 11:57:56 +01:00
Julien Duponchelle
fbe26d11cf
Fix a potential crash 2017-02-06 11:07:35 +01:00
Julien Duponchelle
d06af526b2
Fix the server don't start if a remote is unavailable 2017-02-06 10:49:09 +01:00
Julien Duponchelle
959c08449e
Do not crash if you pass {name} in name 2017-02-03 14:56:55 +01:00
Julien Duponchelle
e892e5dfab
Manage base configuration on server
Fix #786
2017-02-03 13:19:14 +01:00
Julien Duponchelle
46d405c8b3
Simplify conversion process from 1.3 to 2.0
This could avoid some corruption issue.
2017-02-02 11:52:55 +01:00
Julien Duponchelle
dc6756d5ae
Embed the appliances in the server.
This add a /appliances call
2017-02-01 11:30:14 +01:00
Julien Duponchelle
267a5ae3a8
Do not crash when you broke permission on your file system during
execution

Fix #878
2017-01-27 10:52:17 +01:00
Julien Duponchelle
b9bd6aa501
Do not try to start the GNS3 VM if the name is none
Fix #881
2017-01-27 10:41:39 +01:00
Julien Duponchelle
dc40b0296e
Correct link are not connected to the correct ethernet switch port after conversion
Fix https://github.com/GNS3/gns3-gui/issues/1797
2017-01-23 13:34:11 +01:00
Julien Duponchelle
f90e6f2f5b
Fix an error if you don't have permissions on your symbols directory
Fix #872
2017-01-23 10:23:18 +01:00
Julien Duponchelle
a1a677fcd3
Fix an error when converting some topologies from 1.3
Fix #871
2017-01-23 10:18:35 +01:00
Julien Duponchelle
89d98bc528
Fix sometimes you have an exception when closing GNS3
Fix #869
2017-01-18 18:38:25 +01:00
Julien Duponchelle
d74769c824
Fix duplicate node names
Fix https://github.com/GNS3/gns3-gui/issues/1796
2017-01-18 18:28:50 +01:00
Julien Duponchelle
3c0bdd12b5
Do not raise an error if no VM is selected for remote GNS3 VM 2017-01-18 09:49:59 +01:00
Julien Duponchelle
47c58bb400
Fix UnboundLocalError: local variable 'vmname' referenced before assignment
Fix #868
2017-01-18 09:39:27 +01:00
Julien Duponchelle
304d92764c
Fix capture stop with Wireshark
Fix https://github.com/GNS3/gns3-gui/issues/1763
2017-01-16 20:31:55 +01:00
Jeremy Grossmann
ec0181a5ad Merge pull request #856 from GNS3/dynamips_directory_layout
Change directory layout for dynamips.
2017-01-12 20:30:10 -08:00
Julien Duponchelle
b1ae884bf0
Drop NAT port from cloud from old topologies
It was almost not used (only one occurrence in the whole
beta test).

Fix #844
2017-01-11 19:20:12 +01:00
Julien Duponchelle
1bf54bcaeb
Fix Port labels for docker VMs incorrect 2017-01-11 18:38:28 +01:00
Julien Duponchelle
69d8ed5636
Catch Timeout error from VirtualBox GNS3 VM
Fix #864
2017-01-11 15:49:36 +01:00
Julien Duponchelle
e0071f5b59
Catch error when a file is deleted during the compression of project
Fix #860
2017-01-10 10:16:45 +01:00
Julien Duponchelle
41d32a5f71
Fix Wrong slot numbering on IOS router
Fix #1762
2017-01-09 18:04:54 +01:00
Julien Duponchelle
58287b3638
Fix wrong short label for ethernet switch, hub & VPCS
Fix https://github.com/GNS3/gns3-gui/issues/1764
2017-01-09 16:48:42 +01:00
Julien Duponchelle
5c8193556d
Do not dump local compute configuration when saving topology
Fix #855
2017-01-09 10:14:21 +01:00
Julien Duponchelle
a2fdc92fcb
Change directory layout for dynamips.
This create a directory by node to allow feature like save as
to work when running on multiple compute. Benefits now dynamips work
like other nodes. Old topologies are migrated.

Ref https://github.com/GNS3/gns3-gui/issues/1761
2017-01-06 17:43:47 +01:00
Julien Duponchelle
955a466be5
Ensure we can't connect to occupy port
Ref https://github.com/GNS3/gns3-gui/issues/1759
2017-01-06 10:29:56 +01:00
Julien Duponchelle
51aef2b9c7
Fix handling of UTF-8 in large SVG files
Fix #854
2017-01-06 09:42:56 +01:00
Julien Duponchelle
c06d2e3118
Fix short label diplay instead of custom interface labels
Fix https://github.com/GNS3/gns3-gui/issues/1742, https://github.com/GNS3/gns3-gui/issues/1752
2017-01-05 16:55:31 +01:00
Julien Duponchelle
ef54367bf7
Fix crash when converting topology with broken link
Fix #845
2016-12-21 14:39:44 +01:00
Julien Duponchelle
e53db1ed81
Replace JSONDecodeError by ValueError (Python 3.4 compatibility)
Fix #847
2016-12-21 09:45:24 +01:00
Julien Duponchelle
7ba7c89594
Support UDP cloud from 1.5
Fix #822
2016-12-19 09:46:34 +01:00
Julien Duponchelle
3259ec1220
Close project if one one the compute of the project is down
Fix #836
2016-12-15 21:57:59 +01:00
Julien Duponchelle
60eea1f171
Fix error when you upload an empty file
Fix #838
2016-12-15 17:12:54 +01:00
Julien Duponchelle
b79235afb7
Fix KeyError: 'color' when converting some 1.3 topologies
Fix #837
2016-12-15 16:52:01 +01:00
Julien Duponchelle
74a7e630d3
Fix export of projects with docker with a / in the image name
Fix #834
2016-12-14 18:57:59 +01:00
Julien Duponchelle
668c479ef6
Temporary fix for tunnel binding for Daniel from SWI 2016-12-13 16:46:09 +01:00
Julien Duponchelle
89537204df
Fix delete project on remote compute server
Fix https://github.com/GNS3/gns3-gui/issues/1714
2016-12-12 22:41:43 +01:00
Julien Duponchelle
e2fd339f35
Catch auth errors when adding a compute
Fix #813
2016-12-12 11:27:18 +01:00
Julien Duponchelle
897a94f343
Do not block server startup if one project use non implemented conversion
Ref #822
2016-12-12 11:18:17 +01:00
Julien Duponchelle
063087f6fb
Fix an error when deleting a compute already deleted
Fix #815
2016-12-12 11:09:07 +01:00
Julien Duponchelle
4cd08c8955
Handle OSerror when listing images
Fix #823
2016-12-12 10:14:34 +01:00
Julien Duponchelle
4bb990bf0c
Fix JSONDecodeError
Fix #814
2016-12-12 10:03:40 +01:00
Julien Duponchelle
846041a59c
Fix configuration lost during save as on remote server
Fix https://github.com/GNS3/gns3-gui/issues/1704, https://github.com/GNS3/gns3-gui/issues/1705
2016-12-08 16:55:16 +01:00
Julien Duponchelle
bd1560ae50
Fix error when controller config file is corrupted
Fix #812
2016-12-08 10:52:21 +01:00
Julien Duponchelle
52260cba53
Fix crash if at controller loading the remote server is not a GNS3 server
Fix #810
2016-12-07 11:01:26 +01:00
Julien Duponchelle
95e944257a
AttributeError: 'Project' object has no attribute 'emit'
Fix #804
2016-12-01 10:27:05 +01:00