Commit Graph

28 Commits

Author SHA1 Message Date
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
e4a6db8ebc Fix some typos. 2018-10-04 15:22:42 +02: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
b7dd8b5176 Catch asyncio.CancelledError when shutting down the server. 2018-08-28 17:10:24 +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
grossmj
7f72b90b0e The server has now 2 notification streams
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
2018-08-16 21:31:57 +07:00
grossmj
21a1800edc Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py
2018-04-28 19:41:12 +07:00
grossmj
50a922f83e Offload slow file operations to threads for snapshots and project "save as". Ref #1187 #1307. 2018-04-28 16:01:43 +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
6fee543ce7 Fix more client/server version tests. 2018-01-18 16:14:09 +08:00
Julien Duponchelle
108a659ca4
Fix bug when exporting debug information with multiple remote servers
Fix #1100
2017-07-27 11:59:20 +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
7e1e63cd09
Catch error when we can't save the settings
Fix #921
2017-02-28 14:31:52 +01:00
Julien Duponchelle
d99ec92210
Fix a rare race condition when exporting debug informations
Fix #880
2017-01-27 10:48:07 +01:00
Julien Duponchelle
794dac31f5
UDP tunnel debuging
Fix #1562
2016-11-25 15:11:31 +01:00
Julien Duponchelle
8ad5670eeb
For security reason debug informations can only be exported from local server
Ref #1562
2016-11-18 16:38:27 +01:00
Julien Duponchelle
59dcdcc141
When exporting debug information export GNS3 VM vmx content
Fix #740
2016-10-25 11:56:24 +02:00
Julien Duponchelle
4815904737
/debug for exporting debug informations
Ref #740, https://github.com/GNS3/gns3-gui/issues/1562
2016-10-25 11:40:57 +02:00
Julien Duponchelle
22f9effede
Save to disk when config change 2016-06-29 15:15:22 +02:00
Julien Duponchelle
c4d7a0b8fc
A settings API
Ref #589
2016-06-29 14:16:29 +02:00
Julien Duponchelle
411ca56b94
Fix Exception when closing local server (started by GUI)
Fix #578
2016-06-16 15:00:32 +02:00
grossmj
f47eb326c7 Revert move "/version" endpoint to "/server/version".
Move "/server/shutdown" endpoint to "/shutdown".
2016-06-01 18:21:07 -06:00
grossmj
cd07a99118 Some cleaning + move "/version" endpoint to "/server/version". 2016-06-01 17:50:31 -06:00
Julien Duponchelle
87f15eafe0
Shutdown on controller
Ref https://github.com/GNS3/gns3-gui/issues/1191
2016-06-01 15:41:13 +02:00
Julien Duponchelle
6fa2491255
Rename /controller/servers to /controller/hypervisors 2016-03-08 16:04:12 +01:00
Julien Duponchelle
b2ce7ee8d7
API V2 2016-03-07 17:57:12 +01:00
Julien Duponchelle
664cec97ba
Create /hypervisor and /controller namespace 2016-03-07 15:01:35 +01:00