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

322 Commits

Author SHA1 Message Date
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
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
089d25c79d Forbid controller and compute servers to be different versions.
Report last compute server error to clients and display in the server summary.
2018-08-22 16:54:43 +07:00
grossmj
651d8280a7 Fix appliance template tests. 2018-08-19 19:35:45 +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
dac3ba19b7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/ports/port_factory.py
2018-08-13 22:06:44 +07:00
grossmj
23e83b730b Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:45:24 +07:00
grossmj
652d5788c3 Fix tests. 2018-08-09 18:14:38 +07:00
grossmj
033f005bde Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
2018-08-07 21:06:42 +07:00
ziajka
f3b4cc0160 Fix tests 2018-06-13 19:16:43 +02:00
grossmj
96d5e351f7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-10 21:19:55 +07:00
grossmj
45edc40948 Timeout for stream file. 2018-06-10 21:18:16 +07:00
grossmj
6caf38206c Fix tests. 2018-06-07 22:37:29 +07:00
grossmj
62f87de23a Add API endpoint to return all links attached to a node. 2018-06-06 20:46:44 +07:00
grossmj
d1ccf3bc84 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-04 22:46:52 +07:00
ziajka
c52342907a
Merge pull request #1332 from GNS3/global-vars
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
2018-05-15 09:23:54 +02:00
ziajka
7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
ziajka
0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +02:00
ziajka
f2700ed445 Support of supplier and variables in topology 2018-05-08 10:07:42 +02:00
ziajka
132c7c8f5b Fix tests 2018-05-07 12:55:32 +02:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02: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
a56d5b453f Fix project export tests. 2018-04-28 16:46:47 +07:00
grossmj
2ea0aa5ded Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
2018-04-18 17:08:42 +08:00
grossmj
801547983a Fix tests. 2018-04-13 17:04:19 +08:00
grossmj
adc2f69d5d Fix tests. 2018-04-04 21:51:31 +07:00
grossmj
757c103c03 Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361.
MAC addresses can customized for Qemu as well.
2018-04-02 22:27:12 +07:00
grossmj
5d704aa478 Fix tests. 2018-03-24 18:25:09 +07:00
grossmj
279b4d7b20 Fix link filters/suspend tests. 2018-03-19 18:25:56 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
ziajka
05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
ziajka
9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
ziajka
09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
grossmj
17422bc461 Fix appliance loading test (missing category). 2018-02-06 16:55:40 +08:00
grossmj
935b8981ea Fix appliance loading test. 2018-02-06 16:15:34 +08:00
grossmj
654aa18d09 Fix get_port test. 2018-02-02 22:14:50 +08:00
grossmj
3802a3d70b Fix more IOU tests. 2018-01-31 16:34:41 +07:00
ziajka
05983f2838 Fix test_open_auto_start test 2018-01-24 10:54:56 +01:00
grossmj
28f8216590 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-01-23 12:47:13 +07:00
ziajka
dadf11f69b Fix tests 2017-12-21 09:37:48 +01:00
grossmj
0a72e0db87 Fix more GNS3 VM related tests. 2017-12-05 20:38:48 -06:00
grossmj
e3b3427cc6 Fix GNS3 VM start test. 2017-12-05 20:30:28 -06:00
grossmj
dde2003168 Fix tests. 2017-12-05 16:56:50 -06:00
grossmj
6e2752648a Implement #1153 into 2.2 branch. 2017-11-27 15:16:46 +07:00
grossmj
745532bf23 Fix auto idlepc test. 2017-11-23 23:46:22 +07:00
ziajka
b48f5df53f iExport files from remote server, Fixes: gui/#2271 2017-11-20 10:47:03 +01:00
ziajka
44efab109e Set vhv.enable before run for VMWare 14. Fixes #1184 2017-10-18 10:32:56 +02:00
ziajka
b654d78ea6 Endpoint for obtaining direct action on compute 2017-10-13 11:03:56 +02:00
ziajka
e5a7eb74ed Fix project tests 2017-09-05 10:38:17 +02:00
ziajka
b0783eeccc Load meta of the project on loading time (Fixes #2225) 2017-08-22 09:36:52 +02:00