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 |
|
Jeremy Grossmann
|
998fe6d8a4
|
Merge branch 'master' into release-v2.2.40
|
2023-06-06 12:28:30 +09:30 |
|
grossmj
|
71d1aefb65
|
Test Qemu command with virtio-net-pci adapter
|
2023-06-03 20:57:23 +09:30 |
|
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
|
21dc2a8dbc
|
Fix tests
|
2023-06-02 20:25:33 +09:30 |
|
grossmj
|
4338afab7f
|
Fix tests
|
2023-06-02 20:16:06 +09:30 |
|
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
|
d03e7ac9c5
|
Fix tests
|
2023-05-14 14:20:45 +08:00 |
|
grossmj
|
f3f7921525
|
Add generic function to install resource files
|
2023-05-07 21:57:44 +08:00 |
|
grossmj
|
f08ce9d3f1
|
Check for colon in project name. Fixes #2203
|
2023-03-19 18:26:26 +10:00 |
|
grossmj
|
f347e21100
|
Fix Docker tests
|
2023-03-19 17:56:07 +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
|
7968ee7ff2
|
Check swtpm version and start swtpm before qemu
|
2023-02-26 20:51:24 +10:00 |
|
grossmj
|
d867e1f1c1
|
Fix tests
|
2023-02-17 21:25:19 +08:00 |
|
grossmj
|
af9b883c08
|
Fix and adjustments after merge
|
2023-01-10 12:09:36 +08:00 |
|
grossmj
|
f09594ae4c
|
Merge branch '2.2' into 3.0
# Conflicts:
# README.md
# README.rst
# tests/handlers/api/compute/test_nat.py
|
2023-01-10 11:52:58 +08:00 |
|
grossmj
|
5a3b502024
|
Fix NIO update UDP test
|
2023-01-10 11:39:18 +08:00 |
|
grossmj
|
997e0ad6ee
|
Fix more tests
|
2023-01-10 11:22:12 +08:00 |
|
grossmj
|
eb3fc1bb3a
|
Fix more tests
|
2023-01-10 11:09:27 +08:00 |
|
grossmj
|
e9c95ff299
|
Fix tests
|
2023-01-10 10:07:26 +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
|
ae200d9add
|
Add Trusted Platform Module (TPM) support for Qemu VMs
|
2023-01-04 12:13:19 +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
|
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
|
17e0b2e259
|
Stricter checks to create/update an Ethernet switch and add tests
|
2022-12-24 08:20:51 +08:00 |
|
grossmj
|
93449c942f
|
Fix tests
|
2022-12-22 09:24:17 +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
|
2e550d839e
|
Fix tests
|
2022-11-07 20:33:02 +08:00 |
|
grossmj
|
9ff302592c
|
Upgrade to aiohttp 3.8.3
|
2022-10-12 21:40:23 +08: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
|
46b022f726
|
Restore missing loop
|
2022-08-27 23:45:30 +02:00 |
|
grossmj
|
8f296e54f4
|
Add back loop
|
2022-08-27 23:41:52 +02:00 |
|
grossmj
|
fc7d5be736
|
Use pytest-asyncio auto mode
|
2022-08-27 21:10:17 +02:00 |
|
grossmj
|
600c18f04b
|
Remove pytest.ini from tests dir
|
2022-08-27 21:00:31 +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
|
86c44cd6e7
|
Upgrade dev dependencies and fix tests to support pytest-asyncio strict mode
|
2022-08-24 21:03:16 +02:00 |
|
grossmj
|
bfbac2e93a
|
Use generic symbol names
|
2022-07-25 12:33:40 +02:00 |
|
Jeremy Grossmann
|
da626d334f
|
Merge branch '3.0' into iou-user-loader-libraries
|
2022-07-20 16:44:48 +02:00 |
|
grossmj
|
80f5ca0c3f
|
Checks for valid hostname on server side for Dynamips, IOU, Qemu and Docker nodes
|
2022-07-17 11:51:29 +02:00 |
|
grossmj
|
f5e1956dfa
|
Support user defined loader/libraries to run IOU
|
2022-07-16 11:38:51 +02:00 |
|
grossmj
|
f4b67f2e59
|
Allow auth token to be passed as a URL param
|
2022-07-11 14:19:47 +02:00 |
|
grossmj
|
149d086fd8
|
Reactivate project importation
|
2022-07-05 23:01:44 +02:00 |
|
grossmj
|
410f062721
|
Fix config option to disable built-in templates.
|
2022-06-21 17:17:44 +02:00 |
|
grossmj
|
d8b928f1c1
|
Fix tests.
|
2022-06-21 16:52:25 +02:00 |
|
grossmj
|
d303d13045
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/iou/iou_vm.py
# gns3server/controller/template_manager.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/iou_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/handlers/api/compute/virtualbox_handler.py
# gns3server/handlers/api/compute/vmware_handler.py
# gns3server/handlers/api/compute/vpcs_handler.py
# gns3server/handlers/api/controller/node_handler.py
# gns3server/version.py
# requirements.txt
# tests/controller/test_controller.py
# tests/controller/test_project.py
# tests/handlers/api/controller/test_node.py
|
2022-06-21 16:45:25 +02:00 |
|
grossmj
|
ec3c36d6da
|
Fix Docker tests
|
2022-06-19 21:18:54 +02:00 |
|