 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 |
|
|
grossmj
|
b194e48649
|
Forbid unsafe Qemu additional options
|
2024-07-06 12:24:22 +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
|
c076275bd0
|
Fix test create image with not supported characters by filesystem. Fixes #2375
|
2024-05-09 16:01:55 +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 |
|
|
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
|
09ff807055
|
Install Docker resources in writable location
|
2023-11-13 11:23:26 +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
|
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
|
c2783d355f
|
Fix test_create_vnc test
|
2023-08-27 18:41:25 +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
|
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 |
|
|
grossmj
|
c181df6935
|
Only fetch Qemu version once when starting Qemu + only add speed/duplex for virtio-net-pci with Qemu version >= 2.12
|
2023-07-06 16:29:55 +10:00 |
|
|
grossmj
|
6c8c5c1787
|
Ignore uefi test on Windows
|
2023-07-04 13:31:21 +10:00 |
|
|
grossmj
|
f541c03b94
|
Fix uefi test on Windows
|
2023-07-04 13:22:18 +10:00 |
|
|
grossmj
|
0a14a08d54
|
Use recent OVMF firmware (stable-202305) and use flash drives to configure Qemu command line
|
2023-07-04 13:06:34 +10:00 |
|
|
grossmj
|
d5cfb85de5
|
Backport UEFI boot mode support for Qemu VMs
|
2023-06-23 11:18:25 +09:30 |
|
|
grossmj
|
40c265152b
|
Add UEFI boot mode option for Qemu VMs
|
2023-06-21 17:56:34 +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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
|
grossmj
|
e5c8ae4bde
|
Use a stock BusyBox for the Docker integration
|
2023-01-01 17:04:48 +08: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 |
|