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

3944 Commits

Author SHA1 Message Date
Jeremy Grossmann
df0f0c5b83
Merge branch '2.2' into pyup-update-sphinx-1.7.1-to-1.8.2 2018-11-20 17:06:42 +07:00
grossmj
2e79da5fe1 Fix broken examples in API documentation. 2018-11-20 16:24:59 +07:00
grossmj
4e2b8bfe7c Add more information about appliances to the API documentation. 2018-11-20 16:21:33 +07:00
grossmj
68ecbffcf1 Use Python3.6 to build the API documentation. 2018-11-20 15:35:46 +07:00
grossmj
1289d20a14 Add missing files for API documentation. 2018-11-20 15:19:44 +07:00
grossmj
53928b884f Bump version to 2.2.0dev5 2018-11-20 14:37:38 +07:00
grossmj
bc5eda8259 Restore previously removed test. 2018-11-20 14:36:18 +07:00
grossmj
ff5ba3742e Update API documentation for appliance endpoints. Ref https://github.com/GNS3/gns3-gui/issues/2630 2018-11-20 13:04:27 +07:00
grossmj
e5950674f8 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-20 00:22:35 +07:00
grossmj
5cb0957f35 Require privileged access for uBridge when using VMware VMs and Docker containers. Fixes #1461. 2018-11-20 00:22:16 +07:00
Jeremy Grossmann
7385d67c39
Merge pull request #1457 from GNS3/pyup-update-pytest-timeout-1.2.1-to-1.3.3
Update pytest-timeout to 1.3.3
2018-11-19 17:49:46 +07:00
Jeremy Grossmann
e8cb8d29d8
Merge pull request #1454 from GNS3/pyup-update-pytest-3.8.1-to-4.0.0
Update pytest to 4.0.0
2018-11-19 17:49:10 +07:00
grossmj
3fae6ada95 Only require privileged access for uBridge when connecting a cloud to an Ethernet/TAP interface. Fixes #1461. 2018-11-19 17:33:17 +07:00
Jeremy Grossmann
ca6a0708a8
Merge pull request #1462 from GNS3/use-files-as-disk-images
Allow virtual machines to use files in project directory as disk images.
2018-11-19 16:41:36 +07:00
grossmj
3727487730 Fix test on Windows. 2018-11-19 16:09:39 +07:00
grossmj
3497deaa31 Allow virtual machines to use files in project directory as disk images. 2018-11-19 15:53:43 +07:00
Jeremy Grossmann
3861d6a274
Merge pull request #1459 from GNS3/duplicate-appliance
Support to duplicate an appliance via API. Fixes https://github.com/GNS3/gns3-gui/issues/2618
2018-11-18 17:57:10 +07:00
grossmj
bd657c0167 Support to duplicate an appliance. 2018-11-18 17:05:16 +07:00
grossmj
9b83b087cb Fix mac address schema validation for Qemu VM appliance. Fixes https://github.com/GNS3/gns3-gui/issues/2629 2018-11-18 16:20:50 +07:00
grossmj
a33b8eac3a Support "L1 keepalives" in IOU appliance schema. 2018-11-18 16:04:08 +07:00
grossmj
c7b8c347d7 Remove problematic test when run on Travis. 2018-11-18 00:08:40 +07:00
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