grossmj
1cb433c5bc
New packaging relying only pyproject.toml
2023-08-10 22:44:37 +10:00
grossmj
fe90d2b146
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/controller/appliance_manager.py
# gns3server/crash_report.py
# gns3server/run.py
# gns3server/static/web-ui/index.html
# gns3server/utils/images.py
# gns3server/version.py
# requirements.txt
# scripts/update-bundled-web-ui.sh
2023-08-10 15:00:22 +10:00
grossmj
77744cc31d
Handle API version key in VirtualBox 7. Fixes #2266
2023-08-09 20:51:53 +10:00
grossmj
21d9d968c4
Revert "Use truststore in appliance_manager.py instead"
...
This reverts commit a2628042e8
.
2023-08-07 20:44:37 +10:00
grossmj
945a2c98cd
Revert "Use finer-grained control for truststore"
...
This reverts commit 5e1792ff4d
.
2023-08-07 20:44:33 +10:00
grossmj
5e1792ff4d
Use finer-grained control for truststore
2023-08-07 19:15:14 +10:00
grossmj
a2628042e8
Use truststore in appliance_manager.py instead
2023-08-07 19:04:55 +10:00
grossmj
e616b09028
Use truststore
2023-08-07 18:40:03 +10:00
grossmj
7f595b089b
Use certifi to get SSL root certificates
2023-08-06 20:37:10 +10:00
grossmj
533c4544ea
Use certifi on Windows and macOS
2023-08-06 18:09:56 +10:00
grossmj
5da742394e
Use bundled cacert file on Windows and macOS
2023-08-05 22:21:08 +10:00
grossmj
962c5eed8e
Add log message for comparing controller version with config version. Ref https://github.com/GNS3/gns3-gui/issues/3486
2023-08-05 20:24:11 +10:00
grossmj
9c456532d0
Pydantic v2 migration
2023-08-04 18:20:06 +10:00
grossmj
1d59afa9fb
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/crash_report.py
# gns3server/handlers/api/controller/node_handler.py
# gns3server/utils/images.py
2023-08-02 18:26:50 +10:00
grossmj
c51d71a4fa
Fix version check when installing appliances. Ref https://github.com/GNS3/gns3-gui/issues/3486
2023-08-02 17:58:53 +10:00
grossmj
21049d73a5
Allow computes to be dynamically or manually allocated
2023-06-21 22:28:09 +09:30
grossmj
1ff23348d3
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/__init__.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/compute.py
# gns3server/controller/gns3vm/virtualbox_gns3_vm.py
# gns3server/controller/node.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/handlers/api/controller/template_handler.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.8448c96e4facbe79a613.js
# gns3server/version.py
# tests/compute/iou/test_iou_vm.py
# tests/compute/qemu/test_qemu_vm.py
# tests/handlers/api/controller/test_template.py
2023-06-20 16:06:53 +09:30
grossmj
e45467af57
Use the correct VirtualBox host-only type
2023-05-31 20:39:25 +09:30
grossmj
c6d6fcfe66
Search for correct VirtualBox network type
2023-05-31 20:19:13 +09:30
grossmj
73bcd019cc
Require a Host-Only Network to start the VirtualBox GNS3 VM on macOS with VirtualBox 7
2023-05-30 21:22:57 +09:30
grossmj
2361e138ec
Properly catch aiohttp client exception. Ref #2228
2023-05-30 16:17:12 +09:30
grossmj
72af145a23
Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448
2023-05-22 19:42:01 +08:00
grossmj
b3dfb87622
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js
# gns3server/utils/images.py
# gns3server/version.py
# requirements.txt
# tests/compute/docker/test_docker_vm.py
# tests/controller/test_controller.py
2023-05-22 15:11:17 +08:00
grossmj
f3f7921525
Add generic function to install resource files
2023-05-07 21:57:44 +08:00
grossmj
161f62d083
Install empty Qemu disks on first start
2023-05-05 22:40:58 +08:00
grossmj
3c2ae5363c
Install built-in appliances when no previous version has been detected. Fixes #2168
2023-01-17 13:39:01 +08:00
grossmj
72e3d8f0c1
Fix tests after merge
2023-01-05 12:57:00 +08:00
grossmj
27d9063e56
Merge 2.2
2023-01-05 12:38:00 +08:00
grossmj
9132002b80
Fix typos
2023-01-04 09:08:40 +08:00
grossmj
d2ad9dc5e2
Delete the built-in appliance directory before installing updated files
2023-01-01 17:49:00 +08:00
grossmj
5bccf4841d
Overwrite built-in appliance files when starting a more recent version of the server
2023-01-01 15:57:41 +08:00
grossmj
5bcc247881
Make gns3server.appliances a package
2022-12-30 11:37:34 +08:00
grossmj
b8d595928b
Try to fix tests
2022-12-30 10:35:29 +08:00
grossmj
3804249d89
Fix tests
2022-12-30 10:01:43 +08:00
grossmj
c56a8ef8f7
Only use importlib_resources for Python < 3.9. Fixes #2147
2022-12-30 09:15:40 +08:00
grossmj
3e29ae4276
Add config option to change the server name. Ref #2149
2022-12-27 10:05:13 +08:00
grossmj
7643185fa2
Add missing importlib_resources
2022-11-09 23:14:38 +08:00
grossmj
263febecbc
Merge branch '2.2' into 3.0
...
# Conflicts:
# .github/workflows/testing.yml
# CHANGELOG
# appveyor.yml
# dev-requirements.txt
# gns3server/compute/base_node.py
# gns3server/controller/__init__.py
# gns3server/controller/appliance_manager.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/utils/get_resource.py
# gns3server/version.py
# gns3server/web/route.py
# requirements.txt
# tests/handlers/api/compute/test_qemu.py
# win-requirements.txt
2022-11-09 20:30:28 +08:00
grossmj
c80a55b18c
Install appliances and configs without importlib_resources for Windows only
2022-11-08 23:07:45 +08:00
grossmj
284a4b62fb
Fix copying appliances and configs when app is frozen
2022-11-08 22:50:59 +08:00
grossmj
a4b24eaceb
Use importlib_resources instead of pkg_resources and install built-in appliances in config dir.
2022-11-07 20:12:03 +08:00
grossmj
27debfff8d
API endpoint to get the locked status of a project
2022-09-03 22:58:44 +02:00
grossmj
ca3bf592d6
Global project lock and unlock
2022-08-30 22:49:47 +02:00
grossmj
426c16e296
Merge branch '2.2' into 3.0
...
# Conflicts:
# .github/workflows/testing.yml
# CHANGELOG
# appveyor.yml
# dev-requirements.txt
# gns3server/controller/compute.py
# gns3server/crash_report.py
# gns3server/version.py
# gns3server/web/route.py
# pytest.ini
# requirements.txt
# tests/compute/dynamips/test_dynamips_router.py
# tests/compute/test_base_node.py
# tests/compute/vmware/test_vmware_manager.py
# tests/compute/vmware/test_vmware_vm.py
# tests/controller/gns3vm/test_virtualbox_gns3_vm.py
2022-08-30 11:53:12 +02:00
grossmj
6fa3f85b83
Custom adapters should not be in node (compute) properties returned to clients. Fixes https://github.com/GNS3/gns3-gui/issues/3366
2022-08-06 12:37:05 +02:00
grossmj
6d0c375323
Use default symbol theme if none is provided when loading appliances
2022-07-25 20:39:03 +02:00
grossmj
72eb13d941
Allow default symbol theme to be configured
2022-07-25 20:22:12 +02:00
grossmj
bfbac2e93a
Use generic symbol names
2022-07-25 12:33:40 +02:00
grossmj
725942157e
Optionally allow Qemu raw images
2022-07-22 12:39:52 +02:00
John Fleming
7277d526e3
Update compute.py
...
Remove check for open project. Without this check a remote can be rebooted and will be usable once the main server polls it again. Without this the main server would need to open a project that already uses the remote server or restart the main server's gns3 process.
2022-07-18 18:43:57 -04:00