arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-27 01:08:33 +00:00
Code Issues Releases Wiki Activity
3,235 Commits 5 Branches 205 Tags 155 MiB
873418dbbe
Commit Graph

2661 Commits

Author SHA1 Message Date
Julien Duponchelle
2a8911d19e
Keep DOCKER_MINIMUM_API_VERSION and DOCKER_MINIMUM_VERSION consistent 2017-05-23 11:00:15 +02:00
Bernhard Ehlers
8b7209ea78
Use docker version in error message of outdated docker installation 2017-05-23 10:41:42 +02:00
Bernhard Ehlers
7d48eba01b
Use versioned docker API 
Since docker v1.13 the unversioned docker API is deprecated.
Backport of gns3-server 2.0, commit effbe59
 2017-05-23 10:37:47 +02:00
Bernhard Ehlers
2191c487b6
Support images created by "docker commit". Fixes #1039 2017-05-23 10:23:11 +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
189ad994c8
Symbols are returned with a content length 2017-05-18 16:37:44 +02:00
Julien Duponchelle
a4245fcf44
Aiohttp 2.0 
Ref #1000
 2017-05-17 18:42:17 +02:00
grossmj
f338158654 Use 127.0.0.1 for local UDP tunnels to uBridge for Qemu. Ref #664. 2017-05-16 20:51:14 +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
c231e2bbf1
Merge branch '2.0' into 2.1 2017-05-16 09:30:07 +02:00
Julien Duponchelle
e24bfd5913
2.0.2dev1 2017-05-16 09:16:35 +02:00
Julien Duponchelle
f2d5eb0b27
2.0.1 2017-05-16 08:47:35 +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
3dc478385b
When connecting to a compute node ask for qemu images list 
The server start to compute qemu image list in background
because first time discovery could be slow due to the compute
time of md5sum.

Fix #996
 2017-05-15 15:35:48 +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
grossmj
70d34befb9 Merge remote-tracking branch 'origin/2.0' into 2.0 2017-05-12 21:04:39 +08:00
Jeremy Grossmann
8696a464ab Merge pull request #1027 from GNS3/fix_wic_numbering 
Fix wic numbering
 2017-05-12 21:03:05 +08:00
Julien Duponchelle
5721dd3f30
Fix port numbering for Wic slot 1 & 2 2017-05-12 14:12:24 +02:00
grossmj
bf38a8515e Fix typo. 2017-05-12 18:54:54 +08:00
grossmj
942cc09eda Fixes issue with connections when loading an ATM switch. 2017-05-12 18:00:58 +08:00
Julien Duponchelle
961dbb5162
Filter /settings from log 
Fix #1026
 2017-05-12 10:48:43 +02:00
Julien Duponchelle
19a6157f64
Fix wic numbering 
Fix #1011
 2017-05-12 09:48:05 +02:00
grossmj
18cfcaa081 Fixes ATM mapping. 2017-05-12 13:09:26 +08:00
grossmj
87d42f4eb9 Fixes Frame-relay VC mapping. 2017-05-12 12:39:01 +08: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
f31e46e8ed
Fix a race condition in logging when ubridge exit fast 
Fix #1025
 2017-05-11 17:26:18 +02:00
Jeremy Grossmann
633cdef0bc Merge pull request #987 from GNS3/nat_vmware 
NAT node can use the VMware NAT
 2017-05-11 14:03:34 +08: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
grossmj
48dae085aa Catch missing function listxattr on some Linux host. 2017-05-08 21:02:23 +07: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
6870749e50
Handle a race condition at project closing 
Fix #1015
 2017-05-05 19:39:06 +02:00
Julien Duponchelle
3070a68273
Fix unicode error when reading ios configuration 
Fix #1013
 2017-05-05 19:27:04 +02:00
Julien Duponchelle
bda36081a9
Fix AttributeError: 'NoneType' object has no attribute 'send' 
Fix #1014
 2017-05-05 17:16:07 +02:00
Julien Duponchelle
930e7089db
Fix a conversion issue with some 1.3 topologies 2017-05-04 12:09:56 +02:00
Julien Duponchelle
04220846b3
Fix an error with ethernetswitch when ethertype is null 
Fix #1007
 2017-05-04 10:33:02 +02:00
Julien Duponchelle
694a4e8068
Raise an error if we can't create the dynamips configuration directory 
Fix #992
 2017-05-03 17:55:13 +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
31d1696215
Catch a race condition in VirtualBox when editing and linking 
Fix #993
 2017-05-03 16:14:42 +02:00
Julien Duponchelle
078a6d8d34
Fix a race condition when editing a qemu vm and connecting it 
Fix #997
 2017-05-03 16:01:51 +02:00
Bernhard Ehlers
ecba758c58
Docker aux console is a VT100 terminal 
Without that program like nano can't work.

Signed-off-by: Julien Duponchelle <julien@gns3.net>
 2017-05-03 10:30:43 +02:00
Julien Duponchelle
6190b9c189
2.0.1dev1 2017-05-03 10:18:26 +02:00
Julien Duponchelle
c88886911e
2.0.0 2017-05-02 10:16:11 +02:00
Bernhard Ehlers
56d91b648c
Fix connection to websocket with last docker release 
Fix https://github.com/GNS3/gns3-gui/issues/1994

Signed-off-by: Julien Duponchelle <julien@gns3.net>
 2017-04-28 16:06:43 +02:00
Bernhard Ehlers
1b0f5c63b8
Fix connection to websocket with last docker release 
Fix https://github.com/GNS3/gns3-gui/issues/1994

Signed-off-by: Julien Duponchelle <julien@gns3.net>
 2017-04-28 16:03:26 +02:00
Julien Duponchelle
a6d085bf61
Fix server startup on windows 2017-04-28 11:06:39 +02:00
Julien Duponchelle
b0f45035a9
NAT node can use the VMware NAT 
On Windows and Mac OS this allow the NAT node to use the
VMware nat (it's always vmnet8). On Linux we still use the
libvirt NAT
 2017-04-27 15:26:58 +02:00
Julien Duponchelle
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +02:00
Julien Duponchelle
c3aecf935f
Add new appliances 2017-04-26 17:02:33 +02:00
Julien Duponchelle
629443a5e5
Sync appliances 2017-04-26 16:27:59 +02:00
Julien Duponchelle
1a90305baa
Docker minimum api is 1.25 2017-04-24 18:43:12 +02:00
Julien Duponchelle
effbe59414
Lock docker API to 1.27 
Fix https://github.com/GNS3/gns3-gui/issues/1994
 2017-04-24 17:51:55 +02:00
Julien Duponchelle
8b9f22c30c
Handling server disconnect error when docker daemon die 
Fix #985
 2017-04-24 17:37:41 +02:00
Julien Duponchelle
c9ceeee9de
Handle some invalid SVG images 
Fix #986
 2017-04-24 17:31:20 +02:00
Julien Duponchelle
78e030b7ab
2.0.0dev13 2017-04-20 10:55:36 +02:00
Julien Duponchelle
456a28304d
2.0.0rc4 2017-04-20 10:52:55 +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
d9b93ccd66
Fix an issue with editing network on windows 
Fix  #982
 2017-04-18 18:04:00 +02:00
Julien Duponchelle
36de30e25e
Fix various tests for windows 2017-04-18 14:23:29 +02:00
Julien Duponchelle
7302f65ffe
Catch timeout error on docker 
Fix #981
 2017-04-18 11:44:20 +02:00
Julien Duponchelle
f3a87d76ef
Fix import of some old topologies 
Fix #977
 2017-04-14 10:38:21 +02:00
Julien Duponchelle
57cdef6b02
Fix AttributeError: 'NoneType' object has no attribute 'returncode' 
Fix #976
 2017-04-14 10:33:19 +02:00
Julien Duponchelle
540ffdf5f3
Merge remote-tracking branch 'origin/master' into 2.0 2017-04-14 08:55:37 +02:00
Julien Duponchelle
a9b76c9656
1.5.5dev1 2017-04-14 08:46:31 +02:00
Julien Duponchelle
838680cb40
1.5.4 2017-04-13 17:30:25 +02:00
Julien Duponchelle
85136bc2e4
Fix VPCS tests for recent version 2017-04-13 15:56:12 +02:00
Bernhard Ehlers
3afe85ba3c
Fix 1.5: Error message, when stopping IOU router #769 
Signed-off-by: Julien Duponchelle <julien@gns3.net>
 2017-04-13 14:25:40 +02:00
Julien Duponchelle
878aee6e90
Correct version number 2017-04-13 09:55:22 +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
62cd5e4aa3
Fix ghost vmware vms 
Fix #975
 2017-04-11 15:05:31 +02:00
Julien Duponchelle
18835974fb
Fix required field in schema not use 
Fix #972
 2017-04-11 10:57:01 +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
fdd1084714
Fix bridge 'bridge0' already exist when we have trouble with a container 
Fix #973
 2017-04-10 16:58:00 +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
grossmj
5edb631b00 Fixes Qemu sata option. Ref #875. 2017-04-07 17:25:14 +08:00
Julien Duponchelle
ec6fdb7324
Catch GNS3 VM loading error at startup 2017-04-04 14:25:30 +02:00
Julien Duponchelle
8f33d9ab79
Update documentation links 
Fix #1977
 2017-04-03 16:27:08 +02:00
Julien Duponchelle
b7e1a56056
Catch a startup error due to the usage of some antivirus 2017-04-03 16:25:37 +02:00
Julien Duponchelle
b92f881921
2.0.0dev12 2017-03-31 10:08:56 +02:00
Julien Duponchelle
ef5714bd3e
2.0.0rc3 2017-03-31 10:07:25 +02:00
Julien Duponchelle
4f1b738ef5
Merge branch '2.0' into 2.1 2017-03-30 10:16:16 +02:00
Julien Duponchelle
cfe13e1929
Support IOU image without .bin at the end 2017-03-29 16:08:13 +02:00
Julien Duponchelle
935ca17d7a
Allow to change some properties of an already connected ethernet switch 
Fix https://github.com/GNS3/gns3-gui/issues/1970
 2017-03-29 13:22:24 +02:00
Julien Duponchelle
644616b69c
Ensure we start only one ubridge 
Fix https://github.com/GNS3/gns3-gui/issues/1964
 2017-03-28 16:27:09 +02:00
Julien Duponchelle
84da9b4c23
Remove unused module import 2017-03-28 14:51:55 +02:00
Julien Duponchelle
815820f692
Catch some broken hostname for compute node 
Fix #961
 2017-03-28 12:14:27 +02:00
Julien Duponchelle
2564740665
Fix limit of 20 docker containers 
Fix #963
 2017-03-28 11:54:16 +02:00
Julien Duponchelle
42f409d5f9
Fix race conditions in creation of Frame Relay Switch 2017-03-28 11:25:26 +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
132bc87081
Dissallow parallel pull of docker images 
Fix #962
 2017-03-27 20:46:25 +02:00
Julien Duponchelle
8d22f2930e
Fix a crash with missing size in the svg files 
Fix #960
 2017-03-27 10:41:28 +02:00
Julien Duponchelle
ac05db5d1b
Fix an utf8 error in auth code 2017-03-27 10:38:41 +02:00
Julien Duponchelle
80e361ff2e
Improve vmrun timeout message 
Ref https://github.com/GNS3/gns3-gui/issues/1967
 2017-03-27 09:00:58 +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
cb78eb4ee3
Fix Bug when delete fake-running VMBox 
Fix https://github.com/GNS3/gns3-gui/issues/1933
 2017-03-22 11:08:16 +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
1566d7f12a
Remove UDP server discovery because not use for the moment 2017-03-21 17:04:59 +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
34f5a6f82c
Fix Session is closed when listing docker images 
Fix #955
 2017-03-20 23:50:31 +01:00
Julien Duponchelle
78c154e376
Cleanup docker source code 2017-03-20 20:30:59 +01:00
Julien Duponchelle
a571b1a2f8
Use aiohttp session for docker queries 2017-03-20 19:46:50 +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
a62b791c68
Fix TypeError: http_query() got an unexpected keyword argument 'timeout' 
Fix #947
 2017-03-20 17:06:00 +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
c8b46bdcab
Fix return code check for SIGSEGV of IOU images 
Fix #948
 2017-03-20 09:46:07 +01:00
Julien Duponchelle
2ddb329a90
Prevent vmname change for VirtualBox linked clone 
Fix https://github.com/GNS3/gns3-gui/issues/1930
 2017-03-16 19:17:12 +01:00
Julien Duponchelle
7c318d477d
Handle some invalid svg 
Fix #944
 2017-03-16 18:39:07 +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
08bafc2dcc
Catch a timeout error in docker 
Fix #936
 2017-03-16 10:39: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
233a5fbed4
Fix a race condition when killing ubridge 
Fix #931
 2017-03-13 18:21:43 +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
1d5029e4e2
Catch a permission error on symbols 
Fix #930
 2017-03-13 17:50:39 +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
0dc38a3970
Fix an error when handling ubridge errors 
Fix #933
 2017-03-13 16:57:24 +01:00
Julien Duponchelle
9ef334331e
Fix crash when handling an error in project creation 
Fix #928
 2017-03-13 16:55:35 +01:00
Julien Duponchelle
5e2b619305
Merge branch 'master' into 2.0 2017-03-13 15:42:58 +01:00
Julien Duponchelle
3cfe83ae84
2.0.0rc2 2017-03-10 20:24:57 +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
78e5944e66
2.0.0dev10 2017-03-06 19:35:16 +01:00
Julien Duponchelle
5b217d2043
2.0.0rc1 2017-03-06 19:31:02 +01:00
Julien Duponchelle
8b7035b185
Enable show in file manager for cloud 
Fix https://github.com/GNS3/gns3-gui/issues/1900
 2017-03-06 14:25:53 +01:00