1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Commit Graph

65 Commits

Author SHA1 Message Date
ziajka
cbb6eccad8 Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2019-03-21 10:39:55 +01:00
ziajka
9edbd27b4f Serve WebUI via get_resource for freezed app 2019-03-21 10:39:49 +01:00
grossmj
1f1d93d078 Deactivate the embedded shell for Ethernet switch. Ref #1424 #1556 2019-03-20 16:23:30 +08:00
grossmj
f76b329cba Fix ConnectionResetError issues and switch to aiohttp version 3.4.4. Fixes #1474. 2018-12-03 19:14:22 +08:00
ziajka
78c693ff63 Disable CORS cache, Fixes: #1445 2018-11-06 13:31:14 +01:00
ziajka
bf1b801cc0 Remove static dir configuration 2018-10-24 09:04:05 +02:00
ziajka
fa5571ced1 FIX PUT CORS for nodes, Fixes: #1434 2018-10-23 11:09:38 +02:00
grossmj
86f87aec74 Fix installation with Python 3.7. Fixes #1414.
Fix deprecated use of aiohttp.Timeout. Fixes #1296.
Use "async with" with aiohttp.ClientSession().
Make sure websocket connections are properly closed, see https://docs.aiohttp.org/en/stable/web_advanced.html#graceful-shutdown
Finish to drop Python 3.4.
2018-10-16 15:56:06 +07:00
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
grossmj
9de13c570c Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
2018-10-04 15:44:13 +02:00
grossmj
0aa9ab53d1 Import encodings.idna to avoid LookupError when standard library is in a zip file. 2018-09-07 09:34:17 +02:00
grossmj
6822ff65a2 Disable static directory. Ref https://github.com/GNS3/gns3-gui/issues/2558. 2018-08-30 17:34:26 +07:00
grossmj
33e8710495 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
2018-08-29 15:57:54 +07:00
grossmj
00cf66fb0f Report GNS3 VM errors to the GUI server summary. Ref #1359. 2018-08-28 15:42:06 +07:00
grossmj
3560cda06c Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-08-24 18:57:18 +07:00
ziajka
1cc1ccd511 Re-enable static directory 2018-07-02 09:25:39 +02:00
ziajka
ec8cfcd0f9 Disable static/ dir, Ref: #2532 2018-06-29 14:31:19 +02:00
ziajka
0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02: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
ziajka
a393e7f723
Merge pull request #1205 from GNS3/aiohttp-2.3.1
aiohttp 2.3 support.
2017-12-18 11:09:16 +01:00
ziajka
b2c5e175d7 Enable debug loop only on debug mode 2017-10-27 11:19:06 +02:00
ziajka
a7412d1c87 aiohttp 2.3.1 dependency 2017-10-26 16:29:01 +02:00
ziajka
2171072ae4 Enable debug mode on async loop only in dev/debug mode 2017-10-26 12:24:01 +02:00
ziajka
6a87047c18 Added localhost and gns3.github.io CORS 2017-10-20 13:21:43 +02:00
grossmj
7269285b0f Add more information when qemu-img fails. 2017-10-02 00:47:16 +08:00
Julien Duponchelle
7c6ffb3f49
Update error message when invalid aiohttp 2017-07-12 10:57:03 +02:00
grossmj
5747aba83c Update error message to require aiohttp 2.2 2017-07-12 13:34:18 +07:00
Julien Duponchelle
357de50a1b
Upgrade to last aiohttp version 2017-07-11 15:59:09 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
Julien Duponchelle
6fa27c6885
Check aiohttp version 2017-05-31 16:56:46 +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
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
7b642552dd
Fix GNS3VM settings are lost at startup
Fix #926
2017-03-07 15:36:35 +01:00
Julien Duponchelle
3bc78f61df
Fix TypeError: __init__() got multiple values for argument 'handler' with recent aiohttp
Fix #841
2016-12-19 11:12:15 +01:00
Julien Duponchelle
d16e3bb37b
Catch cancelled error when you Ctrl-C during server initalisation
Fix #820
2016-12-12 10:17:45 +01:00
Julien Duponchelle
9a632fb823
Update the way we start controller to avoid hiding crash reports 2016-12-05 10:29:20 +01:00
Julien Duponchelle
eabe4eb97e
Improve remote server console host support when binding to 0.0.0.0
Fix https://github.com/GNS3/gns3-gui/issues/1574
2016-10-26 14:43:47 +02:00
Julien Duponchelle
a17ae316c7
Fix asyncio reactor on Windows
Fix #672
2016-09-08 17:21:38 +02:00
Julien Duponchelle
9bbb32400d
Try to have a better server close cleanup
Fix #669
2016-09-08 11:23:13 +02:00
Julien Duponchelle
f1fe7246e7
Remove --controller
This add too much complexity and it can work
without it.

Fix https://github.com/GNS3/gns3-vm/issues/80, #645
2016-09-07 10:04:28 +02:00
Julien Duponchelle
f216422d0f
Debug shell support command history 2016-09-01 13:45:56 +02:00
Julien Duponchelle
9fc23f07f1
Fix traceback when a server is already running 2016-08-31 09:57:37 +02:00
Julien Duponchelle
f93e443548
Prevent close server process to be started twice
Fix #652
2016-08-26 14:14:19 +02:00
Julien Duponchelle
21b99ad9f9
Support for sendings settings for the GNS3VM from the GUI
Ref https://github.com/GNS3/gns3-gui/issues/1441
2016-08-25 09:32:06 +02:00
Julien Duponchelle
2842904769
Clean exit when you Ctrl+C the server and client are still connected 2016-08-18 15:04:43 +02:00
Julien Duponchelle
9e81994adc
Reset project auto start, auto close, auto open at project import 2016-08-16 16:09:59 +02:00
Julien Duponchelle
ac085126fc
Support for auto open projects
Fix #1418
2016-08-16 16:04:20 +02:00
grossmj
a289c9c685 Change option from udp_discovery to server_discovery. 2016-06-16 11:27:10 -06:00