Commit Graph

4023 Commits

Author SHA1 Message Date
grossmj
53f3821d41 Change test that randomly fails on Travis. 2018-11-17 23:23:28 +07:00
grossmj
3512fde841 Fix small bugs when using the new appliance management API. 2018-11-17 22:16:18 +07:00
grossmj
74e1463015 Fix bug with custom adapters and categories for Docker VM. Fixes https://github.com/GNS3/gns3-gui/issues/2613 2018-11-17 21:50:00 +07:00
grossmj
aa4593c993 Handle custom adapters in schemas. 2018-11-17 20:09:34 +07:00
Jeremy Grossmann
82140c082c
Merge pull request #1458 from GNS3/appliance-default-settings
Apply default settings when adding an appliance via API. Fixes #1456
2018-11-17 19:39:34 +07:00
grossmj
499ab9844a Reorganize how appliance creation is validated against JSON schemas.
This allows for clearer error messages when validation fails.
2018-11-17 18:12:46 +07:00
grossmj
71fcf855b4 Add tests for all appliance types. 2018-11-17 15:37:20 +07:00
grossmj
627c7e9cfe Use schema to set appliance default values and better schema validation error messages. 2018-11-16 23:02:10 +07:00
pyup-bot
f486f07a61 Update pytest-timeout from 1.2.1 to 1.3.3 2018-11-16 13:11:49 +01:00
Jeremy Grossmann
1acc7777f9
Merge pull request #1455 from GNS3/appliance-api
New appliance management API. Fixes #1427
2018-11-15 22:52:18 +07:00
grossmj
1184f29b90 Add appliance API tests. Ref #1427. 2018-11-15 21:34:36 +07:00
grossmj
9aafa4e62f Schema validation for appliance API. Ref #1427. 2018-11-15 17:28:17 +07:00
pyup-bot
bb3edfe779 Update pytest from 3.8.1 to 4.0.0 2018-11-15 00:57:47 +01:00
grossmj
98f04365b7 Remove generic controller settings API endpoint. 2018-11-14 16:24:30 +08:00
grossmj
cebb56387a Fix tests. 2018-11-13 15:40:18 +08:00
grossmj
f91d3c9dbb Merge branch '2.2' into appliance-api 2018-11-13 14:59:55 +08:00
grossmj
089fdff4f1 Working dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-13 14:59:18 +08:00
grossmj
e7b8309a80 Fix Docker VNC tests. Ref #1438 2018-11-11 23:25:23 +08:00
grossmj
d45d52f15c Support Xtigervnc restart. 2018-11-11 23:23:30 +08:00
grossmj
029344da14 Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438 2018-11-11 22:33:58 +08:00
grossmj
36474f7bab Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
2018-11-11 22:31:29 +08:00
grossmj
d0bab9947e Support tigervnc in Docker VM. Ref #1438 2018-11-11 21:07:33 +08:00
grossmj
f0fe9d39fa Base for dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-11 20:13:58 +08:00
grossmj
887b32c4bc Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-11 20:08:37 +08:00
grossmj
f03ba5ca0b Update appliance templates. 2018-11-11 20:08:13 +08:00
pyup-bot
97758a09f4 Update sphinx from 1.7.1 to 1.8.2 2018-11-11 12:59:41 +01:00
ziajka
41fbbf7a56 Reorder routes in order to get working CORS 2018-11-08 11:47:09 +01:00
ziajka
fcd102317a
Merge pull request #1448 from GNS3/disable-cors-cache
Disable CORS cache, Fixes: #1445
2018-11-06 13:38:43 +01:00
ziajka
7bc67cb41f
Merge pull request #1447 from GNS3/wrong-cors-response
Fix CORS response on node deletion, Fixes: #1446
2018-11-06 13:38:01 +01:00
ziajka
249b2255f6 Fix CORS response on node deletion, Fixes: #1446 2018-11-06 13:37:03 +01:00
ziajka
78c693ff63 Disable CORS cache, Fixes: #1445 2018-11-06 13:31:14 +01:00
grossmj
2764828f38 Refactor how clients access PCAP capture files. Fixes https://github.com/GNS3/gns3-gui/issues/2438.
* The PCAP file is directly accessed if controller and client are on the same host.
* The PCAP file is streamed from the compute server to the client with the controller as a proxy when the controller is remote for the client.
2018-10-27 14:47:17 +07:00
ziajka
bf1b801cc0 Remove static dir configuration 2018-10-24 09:04:05 +02:00
ziajka
4158edf8e2
Merge pull request #1435 from GNS3/fix-put-cors-for-nodes
FIX PUT CORS for nodes, Fixes: #1434
2018-10-23 12:41:14 +02:00
ziajka
fa5571ced1 FIX PUT CORS for nodes, Fixes: #1434 2018-10-23 11:09:38 +02:00
grossmj
df36d8377d Fix more tests. 2018-10-17 17:40:25 +07:00
grossmj
ab8dc52ece Fix tests to work with new version of aiohttp (>= 3.0) 2018-10-17 17:32:10 +07:00
grossmj
9ae9209881 Update appliance templates. 2018-10-16 16:20:37 +07: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
8217f65e97 Do not test with Python 3.4 on Travis. 2018-10-15 17:08:18 +07:00
grossmj
de5934f818 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-10-15 17:06:25 +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
Jeremy Grossmann
93b6c0e49d
Merge pull request #1421 from kazkansouh/2.2-update-docker-init-path
Support for using other dhcp clients in docker init.sh
2018-10-07 04:35:48 +02:00
Karim
14fb64b941 Added "/sbin" to init script PATH variable so that its possible to
use more sophosticated dhcp clients (compared to the udhcpc that is
provided by busybox) by installing them into the docker image in
the normal way.
2018-10-06 16:06:24 +01:00
grossmj
8baa480b79 Fix tests. 2018-10-06 21:57:03 +08:00
grossmj
97c68f56bf Notify users if x11vnc process has crashed. Fix #1401. 2018-10-06 21:30:39 +08:00
grossmj
22f7ca0243 Return compute port information via API. Ref #1420. 2018-10-05 12:48:20 +02:00
grossmj
eb97ebf311 Fix platform.linux_distribution() is deprecated. Fixes https://github.com/GNS3/gns3-gui/issues/2578 2018-10-04 16:32:49 +02:00
grossmj
de5a6ca8c7 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-10-04 15:44:29 +02: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