grossmj
|
6ed18c561f
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/qemu/qemu_vm.py
# gns3server/config_samples/gns3_server.conf
# gns3server/controller/export_project.py
# gns3server/controller/project.py
# gns3server/controller/snapshot.py
# gns3server/handlers/api/controller/project_handler.py
# tests/controller/test_export_project.py
# tests/controller/test_import_project.py
# tests/controller/test_snapshot.py
|
2024-07-07 19:04:50 +02:00 |
|
Jeremy Grossmann
|
90dce03da2
|
Merge pull request #2392 from GNS3/bugfix/2385
Forbid unsafe Qemu additional options
|
2024-07-06 17:18:59 +02:00 |
|
grossmj
|
d54c9db8c3
|
Option to keep the compute IDs unchanged when exporting a project
|
2024-07-06 17:08:16 +02:00 |
|
grossmj
|
b194e48649
|
Forbid unsafe Qemu additional options
|
2024-07-06 12:24:22 +02:00 |
|
grossmj
|
08154e43aa
|
Fix error when snapshot exists with an underscore in the name
|
2024-07-05 12:04:53 +02:00 |
|
grossmj
|
d3860ba84b
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# dev-requirements.txt
# gns3server/compute/qemu/__init__.py
# gns3server/compute/vmware/__init__.py
# gns3server/controller/snapshot.py
# gns3server/crash_report.py
# gns3server/handlers/api/compute/atm_switch_handler.py
# gns3server/run.py
# gns3server/static/web-ui/26.77d4bfd104f37c42e028.js
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/runtime.415291667f70565cd8ef.js
# gns3server/utils/__init__.py
# gns3server/utils/images.py
# gns3server/utils/interfaces.py
# gns3server/version.py
# gns3server/web/web_server.py
# pytest.ini
# requirements.txt
# scripts/update-bundled-web-ui.sh
# setup.py
# tests/api/routes/compute/test_dynamips_nodes.py
# tests/compute/builtin/nodes/test_cloud.py
# tests/compute/docker/test_docker.py
# tests/compute/docker/test_docker_vm.py
# tests/compute/dynamips/test_dynamips_manager.py
# tests/compute/dynamips/test_dynamips_router.py
# tests/compute/iou/test_iou_vm.py
# tests/compute/qemu/test_qcow2.py
# tests/compute/qemu/test_qemu_manager.py
# tests/compute/qemu/test_qemu_vm.py
# tests/compute/test_base_node.py
# tests/compute/test_manager.py
# tests/compute/test_project.py
# tests/compute/traceng/test_traceng_vm.py
# tests/compute/virtualbox/test_virtualbox_manager.py
# tests/compute/virtualbox/test_virtualbox_vm.py
# tests/compute/vmware/test_vmware_manager.py
# tests/compute/vmware/test_vmware_vm.py
# tests/compute/vpcs/test_vpcs_vm.py
# tests/conftest.py
# tests/controller/gns3vm/test_remote_gns3_vm.py
# tests/controller/gns3vm/test_virtualbox_gns3_vm.py
# tests/controller/gns3vm/test_vmware_gns3_vm.py
# tests/controller/test_export_project.py
# tests/controller/test_gns3vm.py
# tests/controller/test_import_project.py
# tests/test_config.py
# tests/utils/test_asyncio.py
# tests/utils/test_images.py
# tests/web/test_response.py
|
2024-05-16 17:53:39 +07:00 |
|
grossmj
|
46a9fdb61d
|
Remove event_loop
|
2024-05-09 17:53:02 +07:00 |
|
grossmj
|
9958b876cf
|
Do not run Docker VM tests on Windows
|
2024-05-09 17:36:58 +07:00 |
|
grossmj
|
33499be425
|
Fix warnings in tests
|
2024-05-09 17:11:12 +07:00 |
|
grossmj
|
3fd44f5260
|
Do not wait for the server to close when shutting down.
|
2024-05-09 16:37:45 +07:00 |
|
grossmj
|
c076275bd0
|
Fix test create image with not supported characters by filesystem. Fixes #2375
|
2024-05-09 16:01:55 +07:00 |
|
grossmj
|
081447ba2e
|
Fix tests. Ref #2376
|
2024-05-09 15:37:42 +07:00 |
|
grossmj
|
689d476b71
|
Fix tests
|
2024-04-28 18:03:06 +07:00 |
|
grossmj
|
2609849507
|
Fix tests after updating error message when busybox is not installed.
|
2024-04-23 18:00:37 +07:00 |
|
grossmj
|
e9827653ae
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/version.py
# tests/compute/docker/test_docker_vm.py
|
2024-03-05 01:05:46 +08:00 |
|
Jeremy Grossmann
|
52638a9a8d
|
Merge branch '2.2' into bugfix/3555
|
2024-02-26 16:22:15 +08:00 |
|
grossmj
|
9a5af82a28
|
Save empty directories when exporting a project
|
2024-02-24 19:02:16 +08:00 |
|
grossmj
|
0137688ba7
|
Test busybox is installed
|
2024-02-22 13:05:48 +08:00 |
|
grossmj
|
84db3b9996
|
Fix not all Docker resources are copied to a writable location
|
2024-02-22 12:59:44 +08:00 |
|
grossmj
|
1a53c9aabf
|
Backport from v3: install Docker resources in a writable location at runtime.
|
2024-02-14 16:13:45 +08:00 |
|
grossmj
|
0037f31553
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# docs/api/notifications/link.updated.json
# docs/api/notifications/log.warning.json
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
# docs/api/v2/compute/iou/projectsprojectidiounodes.rst
# docs/api/v2/compute/project/projects.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
# docs/api/v2/controller/link/projectsprojectidlinks.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
# docs/api/v2/controller/project/projects.rst
# docs/api/v2/controller/project/projectsprojectidduplicate.rst
# docs/controller_notifications.rst
# docs/curl.rst
# docs/gns3_file.json
# docs/project_notifications.rst
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/schemas/ethernet_hub.py
# gns3server/schemas/ethernet_switch.py
# gns3server/static/web-ui/3rdpartylicenses.txt
# gns3server/static/web-ui/index.html
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
# requirements.txt
# tests/controller/test_project.py
# tests/controller/test_topology.py
# tests/handlers/api/controller/test_project.py
|
2024-01-28 12:30:43 +11:00 |
|
grossmj
|
218522b08c
|
Fix issues when generating docs
|
2024-01-28 12:13:10 +11:00 |
|
grossmj
|
e3493870b2
|
Add project.created, project.opened and project.deleted controller notification stream.
Move project.updated and project.closed from project notification to controller notification stream.
|
2024-01-28 12:13:09 +11:00 |
|
grossmj
|
09ff807055
|
Install Docker resources in writable location
|
2023-11-13 11:23:26 +10:00 |
|
grossmj
|
303cbf3642
|
Fix tests
|
2023-11-12 18:11:41 +10:00 |
|
grossmj
|
d680bbbc77
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/schemas/qemu_template.py
# requirements.txt
# tests/compute/qemu/test_qemu_vm.py
# tests/handlers/api/compute/test_qemu.py
|
2023-10-24 18:31:51 +10:00 |
|
grossmj
|
34ee75e1f1
|
Fix tests running on Python 3.12
|
2023-10-23 16:12:12 +10:00 |
|
grossmj
|
44c066ac68
|
Fix compute authentication for websocket endpoints
|
2023-10-22 12:44:39 +10:00 |
|
grossmj
|
5092bd2fdf
|
List elements when a project is closed
|
2023-10-09 13:16:12 +10:00 |
|
grossmj
|
674381f1be
|
Fix tests
|
2023-09-25 21:08:23 +10:00 |
|
grossmj
|
7534718a1c
|
Remove privileges endpoint from roles
|
2023-09-14 22:41:08 +07:00 |
|
Jeremy Grossmann
|
63c1defd9a
|
Merge branch '3.0' into resource-pools
|
2023-09-14 22:38:52 +07:00 |
|
Sylvain MATHIEU OBS
|
10eeefc1f5
|
API: add endpoint to expose availables privileges to web UI
|
2023-09-12 15:24:54 +02:00 |
|
grossmj
|
a95dda0d1d
|
Complete resource pool support for projects
|
2023-09-11 18:15:03 +07:00 |
|
grossmj
|
d53ef175f8
|
DB and API for resource pools
|
2023-09-07 17:31:11 +07:00 |
|
grossmj
|
1ec056c1a6
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/__init__.py
# gns3server/controller/appliance_manager.py
# gns3server/web/route.py
# requirements.txt
# tests/compute/docker/test_docker_vm.py
|
2023-09-06 23:30:00 +07:00 |
|
grossmj
|
8aa9d1aae6
|
Upgrade dependencies and fix user group tests
|
2023-09-03 17:58:51 +07:00 |
|
grossmj
|
6ec97a704f
|
Put user, groups, roles and ACL under /access
|
2023-09-02 19:10:02 +07:00 |
|
grossmj
|
170f476733
|
Add more built-in roles
|
2023-09-02 18:15:00 +07:00 |
|
grossmj
|
0077fd98aa
|
Add required privileges to all endpoints
|
2023-09-02 17:54:24 +07:00 |
|
grossmj
|
c2783d355f
|
Fix test_create_vnc test
|
2023-08-27 18:41:25 +10:00 |
|
grossmj
|
60ce1172e0
|
Use an ACL table to check for privileges
|
2023-08-27 18:20:42 +10:00 |
|
grossmj
|
74cb3be910
|
Merge remote-tracking branch 'origin/3.0' into 3.0
|
2023-08-19 12:29:53 +10:00 |
|
grossmj
|
425ad845fc
|
Speed up tests
|
2023-08-19 12:29:25 +10:00 |
|
grossmj
|
1ce0c13fc9
|
Better mocking in Docker tests
|
2023-08-18 12:20:54 +10:00 |
|
grossmj
|
2f2aabeb5a
|
Fix tests when running Python 3.7
|
2023-08-11 17:58:00 +10:00 |
|
grossmj
|
d9eb61efc4
|
Fix tests with asyncio_patch
|
2023-08-11 17:37:11 +10:00 |
|
grossmj
|
1fd8444d22
|
Add tests for install_busybox()
|
2023-08-11 17:32:05 +10:00 |
|
grossmj
|
9c456532d0
|
Pydantic v2 migration
|
2023-08-04 18:20:06 +10:00 |
|
grossmj
|
3f691b60c9
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/qemu/qemu_vm.py
# gns3server/crash_report.py
# gns3server/schemas/qemu.py
# gns3server/schemas/qemu_template.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.1379a5647e8bc6d3e401.js
# gns3server/version.py
# tests/compute/qemu/test_qemu_vm.py
|
2023-07-13 10:09:26 +10:00 |
|