arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Code Issues Releases Wiki Activity
5,664 Commits 5 Branches 203 Tags 151 MiB
48dab4af61
Commit Graph

984 Commits

Author SHA1 Message Date
grossmj
67be4259ff Fix tests 2023-11-15 11:57:14 +10:00
grossmj
4e9bc190a4 Upgrade to aiohttp v3.9.0rc0 2023-11-15 11:47:48 +10:00
grossmj
09ff807055 Install Docker resources in writable location 2023-11-13 11:23:26 +10:00
grossmj
87960f1ff0 Merge branch '2.2' into 3.0 
# Conflicts:
#	README.md
 2023-10-18 17:48:09 +10:00
grossmj
3b0d89be5a Merge branch 'master' into 2.2 2023-10-18 17:46:51 +10:00
grossmj
6ca15cbcff Merge branch '2.2' into 3.0 
# Conflicts:
#	.github/workflows/testing.yml
#	requirements.txt
#	setup.py
 2023-10-18 14:49:49 +10:00
grossmj
722512d851 Remove model validator. Fixes https://github.com/GNS3/gns3-gui/issues/3522 
Default port name and port segment size are already set in the code when a new node is created.
 2023-10-15 11:16:05 +10:00
grossmj
999a47f747 Fix issue with importlib.resources.files() and Python 3.9 2023-09-23 20:44:00 +10:00
grossmj
d9214a3c67 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/virtualbox/__init__.py
#	gns3server/controller/gns3vm/virtualbox_gns3_vm.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
 2023-09-23 15:54:54 +10:00
Jeremy Grossmann
ffb58a4ed2
Merge branch 'master' into Inappropriate_Logic-5node.py11635999804432162276.diff 2023-09-20 14:17:58 +07:00
munahaf
4d7b3fb9d6 Comment: Updated a test expression to remove a logical short circuit. 2023-09-20 06:51:41 +00:00
grossmj
702fea89fb Automatically add vboxnet and DHCP server if not present for VirtualBox GNS3 VM. Ref #2266 2023-09-12 16:14:44 +07:00
grossmj
c11b3c3911 Fix tests after merge 2023-09-06 23:42:50 +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
709aa46074 Fix issue with controller config saved before checking current version with previous one 2023-09-06 16:48:24 +07:00
grossmj
0c12849d0d Use controller vars file to store version and appliance etag 2023-09-06 16:28:46 +07:00
grossmj
60ce1172e0 Use an ACL table to check for privileges 2023-08-27 18:20:42 +10:00
grossmj
a69feb3682 Use an older version of platformdirs 2023-08-12 19:15:29 +10:00
grossmj
090d1c8c84 Only use platformdirs with Python >= '3.7' 2023-08-12 19:04:14 +10:00
grossmj
df2f96828e Use the user data dir to store built-in appliances 2023-08-12 18:48:43 +10:00
grossmj
ca48efa5be Upgrade SQLAlchemy to v2.0.18 and fix async_timeout warning 2023-08-11 22:52:29 +10:00
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