1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-29 10:18:10 +00:00
Commit Graph

4236 Commits

Author SHA1 Message Date
grossmj
60f1d76eab Release v2.2.40.1 2023-06-10 20:06:40 +09:30
grossmj
d44038305f Add missing web-ui files. Fixes #2239 2023-06-10 15:50:28 +09:30
grossmj
3641742930 Development on v2.2.41.dev1 2023-06-06 12:43:20 +09:30
grossmj
aa79f4cb25 Release v2.2.40 2023-06-06 10:23:42 +09:30
grossmj
2602602193 Merge branch 'master' into 2.2 2023-06-06 10:20:07 +09:30
grossmj
8d969349c8 Bundle web-ui v2.2.40 2023-06-06 10:18:18 +09:30
grossmj
bf67fec242 Sync appliances 2023-06-06 10:07:50 +09:30
Raizo62
0b6436d2cb qemu : with network adapter_type equal to "virtio-net-pci", fix the speed to 10000 and duplex to full.
The values are actually fake.
	(https://github.com/GNS3/gns3-gui/issues/3476)
2023-06-03 11:48:55 +02:00
Jeremy Grossmann
088ae699de
Merge pull request #2223 from GNS3/fix/2214
Use proc.communicate() when checking for subprocess output
2023-06-02 20:29:40 +09:30
grossmj
cc4ead40e2 Fix unexpected indent 2023-06-02 20:08:21 +09:30
Mlastawi
045c0c4c14
Add missing comma 2023-06-02 10:38:42 +02:00
Maciej Łastawiecki
a0943b0b5a Parse name for request to node creation from template 2023-06-02 09:39:08 +02:00
grossmj
84c886b058 Remove left over Xvfb related code 2023-05-31 21:33:39 +09:30
grossmj
e59b5fb95b Remove Xvfb + x11vnc support 2023-05-31 21:28:06 +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
0f02cff5f2 Catch ConnectionResetError when waiting for the wrap console 2023-05-25 18:29:19 +08:00
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
af2fc8c111 Use proc.communicate() when checking for subprocess output
As recommended in https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process.stderr
2023-05-14 13:58:50 +08:00
grossmj
b4bfb24a80 Development on v2.2.40.dev1 2023-05-08 20:26:40 +08:00
grossmj
d6ea546ff7 Release v2.2.39 2023-05-08 19:17:02 +08:00
grossmj
68f9c55f3d Install web-ui v2.2.39 2023-05-08 19:10:22 +08:00
Jeremy Grossmann
9868c28bc6
Merge pull request #2219 from GNS3/install-qemu-empty-disks
Install empty Qemu disks
2023-05-08 16:58:26 +08:00
grossmj
f3f7921525 Add generic function to install resource files 2023-05-07 21:57:44 +08:00
grossmj
65cc12c850 Sync appliance files 2023-05-05 22:46:42 +08:00
grossmj
161f62d083 Install empty Qemu disks on first start 2023-05-05 22:40:58 +08:00
grossmj
d6141d4652 Fix checking for ":" in project dir on Windows for Docker containers 2023-03-23 22:17:29 -10:00
grossmj
f08ce9d3f1 Check for colon in project name. Fixes #2203 2023-03-19 18:26:26 +10:00
grossmj
3fb138b9a1 Allow ':' in project name when Docker containers are used 2023-03-19 17:29:29 +10:00
grossmj
267c4cbbbb Merge branch '2.2' into 3.0
# Conflicts:
#	README.md
#	gns3server/compute/base_node.py
#	gns3server/compute/dynamips/__init__.py
#	gns3server/compute/dynamips/hypervisor.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/schemas/qemu_template.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.11410ae4eaf4d4c08cd0.js
#	gns3server/version.py
#	requirements.txt
2023-03-17 17:44:32 +10:00
grossmj
42767eff56 Development on 2.2.39.dev1 2023-02-28 17:09:39 +10:00
grossmj
91dba66800 Release v2.2.38 2023-02-28 15:35:17 +10:00
grossmj
69b741a01e Sync appliance files 2023-02-28 15:31:02 +10:00
grossmj
8903ab8a47 Bundle web-ui v2.2.38 2023-02-28 15:29:17 +10:00
grossmj
2a66f67b5f Merge remote-tracking branch 'origin/2.2' into 2.2 2023-02-27 22:59:08 +10:00
grossmj
8ef59c7832 Fix c7200_i0_log.txt is created in the current directory. Fixes #2191 2023-02-27 22:58:52 +10:00
grossmj
7968ee7ff2 Check swtpm version and start swtpm before qemu 2023-02-26 20:51:24 +10:00
grossmj
1f85abb036 Fix broken websocket console with Python 3.11 2023-02-18 15:32:57 +08:00
grossmj
d867e1f1c1 Fix tests 2023-02-17 21:25:19 +08:00
grossmj
30c85703c8 Attempt to fix "cannot reopen console". Ref #2182 2023-02-13 19:32:44 +08:00
grossmj
aaa6ca9445 Mark VMware and VirtualBox support as deprecated 2023-02-05 10:09:55 +08:00
grossmj
0f49911432 Fix Qemu binary not set when adding appliance from template 2023-02-04 12:18:52 +08:00
grossmj
9c158848bd Make port name for custom adapters optional. Fixes https://github.com/GNS3/gns3-web-ui/issues/1430 2023-02-01 16:19:39 +08:00
grossmj
e5ecdd270d Development 2.2.38.dev1 2023-01-25 18:36:39 +08:00
grossmj
260ac44e87 Release v2.2.37 2023-01-25 15:06:12 +08:00
grossmj
a0cf711634 Bump version to 2.2.37.dev3 2023-01-25 14:13:07 +08:00
grossmj
b83645c531 Add web-ui v2.2.37 2023-01-24 15:06:21 +08:00
grossmj
a7daae1c6a Sync appliances 2023-01-24 14:57:58 +08:00
grossmj
a7d19fd89a Fix StreamWriter doesn't have the wait_closed() method in Python3.6. Fixes #2170 2023-01-20 13:14:57 +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
24d1aeee32 Bump version to 2.2.37.dev2 2023-01-17 13:30:09 +08:00
grossmj
90d7478679 Sync appliances 2023-01-17 13:11:18 +08:00
grossmj
c57b0cbb53 Find Dynamips version before hypervisor launch and do not require Dynamips v0.2.23 2023-01-16 18:04:46 +08:00
grossmj
ab1f9a4385 Handle Alembic CommandError exceptions 2023-01-13 12:52:31 +08:00
grossmj
a033080418 Support for database schema migrations using alembic 2023-01-11 10:15:04 +08:00
grossmj
2a392ef991 Merge branch '2.2' into 3.0 2023-01-06 20:09:41 +08:00
grossmj
535f89e29e Give udhcpc executable right. Fixes #2159 2023-01-06 20:09:17 +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
f8f5d7ec07 Development on 2.2.37.dev1 2023-01-05 09:13:30 +08:00
grossmj
8e2992fbc7 Release v2.2.36 2023-01-04 19:46:30 +08:00
grossmj
8986f10506 Install web-ui v2.2.36 2023-01-04 19:05:24 +08:00
grossmj
10f3adcb60 Sync appliance files 2023-01-04 18:28:14 +08:00
grossmj
5459543eb5 Fix issue when detecting Dynamips version (version is not set until after Dynamips has started) 2023-01-04 18:21:17 +08:00
grossmj
e15c36f05c Merge remote-tracking branch 'origin/2.2' into 2.2 2023-01-04 15:12:26 +08:00
grossmj
da7c7d16e4 Fix starting Dynamips on Windows 2023-01-04 15:12:09 +08:00
grossmj
297ada529c Prevent TPM to run on Windows 2023-01-04 12:57:48 +08:00
grossmj
ae200d9add Add Trusted Platform Module (TPM) support for Qemu VMs 2023-01-04 12:13:19 +08:00
grossmj
9132002b80 Fix typos 2023-01-04 09:08:40 +08:00
grossmj
771a9a5ddb Require Dynamips 0.2.23 and bind Dynamips hypervisor on 127.0.0.1 2023-01-02 15:26:59 +08:00
Jeremy Grossmann
04ba3b6549
Merge pull request #2154 from GNS3/fix/2069
Use a stock BusyBox for the Docker integration
2023-01-01 16:18:37 +05:45
grossmj
d2ad9dc5e2 Delete the built-in appliance directory before installing updated files 2023-01-01 17:49:00 +08:00
grossmj
e5c8ae4bde Use a stock BusyBox for the Docker integration 2023-01-01 17:04:48 +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
b3a6b9173b Fix reset console. Fixes #1619 2022-12-31 09:43:17 +08:00
grossmj
1148dbc48e Fix issue when calling reset_console with running VPCS and Qemu nodes. Ref #1619 2022-12-30 20:54:37 +08:00
grossmj
85679aaa94 Try importlib-resources for Python 3.9 2022-12-30 11:44:29 +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
2550fb3495 Support when the user field defined in Docker container is an ID. Fixes #2134 2022-12-28 11:05:22 +08:00
grossmj
f837912ebc Development on 3.0.0.dev7 2022-12-28 08:29:26 +08:00
grossmj
830cc108d0 Release v3.0.0a3 2022-12-27 15:22:16 +08:00
grossmj
36ffe2bb59 Sync appliances 2022-12-27 13:40:07 +08:00
grossmj
f8739eb5e1 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
2022-12-27 13:28:11 +08:00
grossmj
5bc030688e Sync web-ui v3.0.0a3 2022-12-27 13:17:12 +08:00
grossmj
3e29ae4276 Add config option to change the server name. Ref #2149 2022-12-27 10:05:13 +08:00
grossmj
c6e31d98db Option to disable image discovery and do not scan parent directory 2022-12-26 12:32:40 +08:00
grossmj
9a7b3bed25 Allow raw images by default. Fixes https://github.com/GNS3/gns3-server/issues/2097 2022-12-26 11:28:51 +08:00
grossmj
8ad7b3f613 Fix bug when creating Dynamips router with chassis setting 2022-12-24 18:03:00 +08:00
grossmj
17e0b2e259 Stricter checks to create/update an Ethernet switch and add tests 2022-12-24 08:20:51 +08:00
grossmj
5666b43ee0 Fix schema for removing WICs from Cisco routers. Fixes #3392 2022-12-22 20:02:28 +08:00
grossmj
5ba526e175 Development on v2.2.36.dev2 2022-11-11 00:36:47 +08:00
grossmj
d17c243b13 Release v2.2.35.1 2022-11-10 22:21:13 +08:00
grossmj
9e4ae6bc24 Sync appliance files 2022-11-10 22:10:21 +08:00
grossmj
b9e415b6fe Push missing file for Web-Ui v2.2.35 2022-11-10 13:09:10 +08:00
grossmj
d2d327cc76 Re-release Web-Ui v2.2.35 2022-11-10 12:38:33 +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
0a046e43d7 Development on 2.2.36.dev1 2022-11-09 20:02:20 +08:00
grossmj
1aca7dbe04 Release v2.2.35 2022-11-08 23:40:25 +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
d33fefa183 Merge branch 'master' into 2.2 2022-11-08 19:29:39 +08:00
grossmj
dfb48c884b Release web-ui v2.2.35 2022-11-08 19:29:21 +08:00
grossmj
f80aca7633 Sync appliance files 2022-11-08 18:40:27 +08:00
grossmj
84914ecfa4 Add debug messages to fix VMnet interface list refresh. Ref https://github.com/GNS3/gns3-gui/issues/3381 2022-11-08 12:54:47 +08:00
grossmj
5696d1ccb7 Fix issues with VMnet interface on macOS >= 11.0. Ref #3381 2022-11-07 23:59:33 +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
f04702d607 Fix console vnc don't use configured ports in some case. Fixes #2111 2022-11-06 19:36:31 +08:00
grossmj
9cf2e4f5a6 Make version PEP 440 compliant 2022-11-06 17:51:31 +08:00
grossmj
f3b8f43689 Fix creating asyncio task in Python 3.6 2022-10-30 22:21:28 +08:00
grossmj
2d74d1ad94 Fix tests for Python 3.11 2022-10-30 22:07:44 +08:00
grossmj
6b3d4feab8 Replace deprecated distro.linux_distribution() call 2022-10-11 23:28:11 +08:00
grossmj
19de2732f2 Upgrade to FastAPI 0.85.0 and check embedded web-ui index.html can be found. 2022-09-29 15:11:15 +02:00
grossmj
40c22e389e Merge branch 'master' into 2.2 2022-09-29 14:56:35 +02:00
Jeremy Grossmann
0419c081fe
Merge pull request #2083 from a60814billy/fix/binding-on-wrong-interface-in-windows
fix: binding to wrong interface in windows
2022-09-28 17:36:31 +02:00
grossmj
b0e646b97d Fix some issues with HTTP notification streams 2022-09-13 22:10:01 +02:00
grossmj
e8973b9c44 Development on 3.0.0dev5 2022-09-07 01:16:14 +02:00
grossmj
317e2b164c Release v3.0.0a2 2022-09-07 01:05:41 +02:00
grossmj
8976a751fa Add web-ui v3.0.0a2 2022-09-07 00:57:08 +02:00
grossmj
2976e220dc Return a boolean directly from API endpoint for project locked status 2022-09-03 23:08:13 +02: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
43e60c31c7 Remove empty files after merge 2022-08-30 12:21:05 +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
0d0a06799d Development on 2.2.35dev1 2022-08-29 11:14:44 +02:00
grossmj
8d4df08150 Release v2.2.34 2022-08-28 23:28:12 +02:00
grossmj
fd1d8d9d86 Update appliance files 2022-08-28 22:51:26 +02:00
Jeremy Grossmann
e96d8ae497
Merge pull request #2089 from SpikefishSolutions/spikefishjohn-patch-3
Update compute.py
2022-08-28 22:09:44 +02:00
grossmj
d996a87246 Require name for custom adapters. Fixes #2098 2022-08-28 17:33:33 +02:00
grossmj
b58a54ae7c Allow empty adapter slots for Dynamips templates. Ref https://github.com/GNS3/gns3-gui/issues/3373 2022-08-28 17:05:28 +02:00
grossmj
129f0a631c Use original $PATH in init.sh for Docker containers. Ref #2069 2022-08-28 12:06:56 +02:00
grossmj
d1c8f33fc5 Upgrade dev dependencies and fix issues after upgrading to pytest-aiohttp v1.0.4 2022-08-27 19:16:02 +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
93b71f806e Development on v3.0.0dev4 2022-08-04 12:29:49 +02:00
grossmj
3ddbd0de64 Release v3.0.0a1 2022-08-04 11:38:17 +02:00
grossmj
541e9702bf Bundle gns3-web-ui v3.0.0a1 2022-08-04 11:12:42 +02:00
grossmj
64c6000470 Update appliance files 2022-08-04 11:08:00 +02:00
grossmj
31ae70894e Fix enum use in schemas 2022-07-26 23:17:39 +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
b7f4a4cbda Fix VMware VM addition 2022-07-25 11:10:01 +02:00
grossmj
725942157e Optionally allow Qemu raw images 2022-07-22 12:39:52 +02:00
Jeremy Grossmann
da626d334f
Merge branch '3.0' into iou-user-loader-libraries 2022-07-20 16:44:48 +02:00