 grossmj
|
b7d43b29cd
|
Fix tests after merging
|
2024-12-02 13:02:08 +10:00 |
|
|
grossmj
|
cbaa563996
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.9297104511b6616fc55c.js
# gns3server/utils/images.py
# gns3server/version.py
# tests/api/routes/compute/test_dynamips_nodes.py
# tests/handlers/api/compute/test_qemu.py
# tests/utils/test_images.py
|
2024-12-02 12:16:34 +10:00 |
|
|
grossmj
|
83921a45df
|
Fix use project name instead of ID for fast duplication when running local server. Fixes #2446
|
2024-11-26 12:07:06 +10:00 |
|
|
grossmj
|
a00f53fbaa
|
Fix error 500 on PUT for cloud, nat, vmware and vpcs nodes. Fixes #2426
|
2024-11-19 12:21:35 +10:00 |
|
|
Jeremy Grossmann
|
8db81de153
|
Merge pull request #2445 from GNS3/bugfix/2426
Fix issue with asyncio.Queue
|
2024-11-18 14:00:20 +10:00 |
|
|
grossmj
|
bd813b0a53
|
Merge branch '2.2' into 3.0
# Conflicts:
# requirements.txt
# setup.py
|
2024-11-18 11:46:42 +10:00 |
|
|
grossmj
|
b37db57bb9
|
Fix tests
|
2024-11-17 15:00:13 +10:00 |
|
|
grossmj
|
31a2cb998d
|
Fix issue with asyncio.Queue which is not thread safe.
|
2024-11-17 14:39:22 +10:00 |
|
|
grossmj
|
a60e0d424d
|
Overwrite user resources when the originals have changed.
Excepting configs and disks which can be customized.
|
2024-11-09 12:17:06 +10:00 |
|
|
grossmj
|
74d07173c1
|
Upgrade aiohttp to v3.10.10. Fixes #2411
|
2024-10-31 13:48:22 +10:00 |
|
|
grossmj
|
ec300d19d4
|
Replace aiohttp.web.HTTPConflict()
|
2024-10-31 13:11:01 +10:00 |
|
|
grossmj
|
7e902726bf
|
Fix issues after merge
|
2024-10-31 13:06:17 +10:00 |
|
|
grossmj
|
c4fcb43e78
|
Merge branch '2.2' into 3.0
# Conflicts:
# .github/workflows/testing.yml
# CHANGELOG
# README.md
# dev-requirements.txt
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/export_project.py
# gns3server/controller/import_project.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.df8c319a3da6fb0e3629.js
# gns3server/version.py
# requirements.txt
# setup.py
# tests/compute/docker/test_docker_vm.py
# tests/controller/test_import_project.py
|
2024-10-31 12:54:35 +10:00 |
|
|
grossmj
|
24bfc205db
|
Symbolic links support for project export/import
|
2024-10-19 15:49:23 +10:00 |
|
|
grossmj
|
cafdb2522b
|
Add / update docstrings
|
2024-09-29 19:42:06 +07:00 |
|
|
grossmj
|
f7996d5e98
|
Fix tests
|
2024-09-27 20:05:06 +07:00 |
|
|
grossmj
|
996dad2f5c
|
Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.
|
2024-09-26 18:41:23 +07:00 |
|
 赵昕彧
|
3a896b6964
|
Duplicate faster - 2
|
2024-09-26 08:26:08 +08:00 |
|
|
grossmj
|
441f0fb1b5
|
Merge remote-tracking branch 'z5241248/master' into fork/z5241248/master
|
2024-09-25 19:45:44 +07:00 |
|
|
grossmj
|
a02b57698a
|
Add missing imports
|
2024-09-25 19:45:14 +07:00 |
|
|
Jeremy Grossmann
|
7582107ae5
|
Merge branch '2.2' into master
|
2024-09-25 19:41:40 +07:00 |
|
|
赵昕彧
|
2dbde5df22
|
Copying project files directly, rather than copying them in an import-export fashion, can make copying projects many times faster
|
2024-09-25 20:27:46 +08:00 |
|
|
grossmj
|
8ce0cbf7f7
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/dynamips/nodes/c1700.py
# gns3server/compute/dynamips/nodes/c2600.py
# gns3server/compute/dynamips/nodes/c2691.py
# gns3server/compute/dynamips/nodes/c3600.py
# gns3server/compute/dynamips/nodes/c3725.py
# gns3server/compute/dynamips/nodes/c3745.py
# gns3server/compute/dynamips/nodes/c7200.py
# gns3server/compute/dynamips/nodes/router.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/node.py
# gns3server/controller/topology.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/schemas/docker.py
# gns3server/schemas/docker_template.py
# gns3server/schemas/dynamips_template.py
# gns3server/schemas/dynamips_vm.py
# gns3server/schemas/node.py
# gns3server/schemas/qemu.py
# gns3server/schemas/qemu_template.py
|
2024-09-23 13:28:56 +07:00 |
|
|
grossmj
|
7b5d123ad8
|
Improve error message when a project cannot be parsed.
|
2024-09-23 13:23:03 +07:00 |
|
|
Jeremy Grossmann
|
af6f34b2ca
|
Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"
|
2024-09-23 13:10:58 +07:00 |
|
|
grossmj
|
c41c11eb34
|
Backport auxiliary console support for Qemu, Docker and Dynamips nodes
|
2024-09-22 18:29:04 +07:00 |
|
|
grossmj
|
3214f52e9e
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/schemas/docker.py
# gns3server/schemas/docker_template.py
# tests/compute/docker/test_docker_vm.py
|
2024-09-18 17:29:06 +07:00 |
|
|
grossmj
|
3792901dc7
|
Support for configuring MAC address in Docker containers
|
2024-09-18 16:30:22 +07:00 |
|
|
赵昕彧
|
5ffe5fd9b3
|
Copying project files directly, rather than copying them in an import-export fashion, can make copying projects many times faster
|
2024-08-23 14:31:21 +08:00 |
|
|
grossmj
|
2416069a6e
|
Update _convert_2.2.0() with correct comments
|
2024-07-20 17:55:38 +02:00 |
|
|
grossmj
|
999f41b03e
|
Convert topologies < 3.0 to have valid node hostnames
|
2024-07-20 17:22:24 +02:00 |
|
|
grossmj
|
3f7f5a3cda
|
Fix to access resources_path and install_builtin_appliances settings
|
2024-07-09 12:28:39 +02:00 |
|
|
grossmj
|
59ad5c55ec
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# gns3server/config_samples/gns3_server.conf
# gns3server/controller/__init__.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.b65e52314df938ebe652.js
# gns3server/version.py
|
2024-07-09 12:14:44 +02:00 |
|
|
grossmj
|
ca1d99b112
|
Add 'install_builtin_appliances' and 'resources_path' settings in the server config
|
2024-07-08 18:06:33 +02:00 |
|
|
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
|
d54c9db8c3
|
Option to keep the compute IDs unchanged when exporting a project
|
2024-07-06 17:08:16 +02:00 |
|
|
grossmj
|
08154e43aa
|
Fix error when snapshot exists with an underscore in the name
|
2024-07-05 12:04:53 +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
|
259d3a0155
|
Fix cannot import UTC
|
2024-05-09 17:23:32 +07:00 |
|
|
grossmj
|
33499be425
|
Fix warnings in tests
|
2024-05-09 17:11:12 +07:00 |
|
|
grossmj
|
35b75f0f7f
|
Fix link capture for ATM switch. Fixes https://github.com/GNS3/gns3-gui/issues/3570
|
2024-04-23 18:35:36 +07:00 |
|
|
grossmj
|
1c37e8bd32
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/controller/symbol_themes.py
# gns3server/controller/template_manager.py
|
2024-04-22 19:08:45 +07:00 |
|
|
grossmj
|
b6e68ba1a8
|
Add NAT symbols
|
2024-04-22 18:51:29 +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 |
|
|
Jeremy Grossmann
|
52638a9a8d
|
Merge branch '2.2' into bugfix/3555
|
2024-02-26 16:22:15 +08:00 |
|
|
grossmj
|
9a5af82a28
|
Save empty directories when exporting a project
|
2024-02-24 19:02:16 +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
|
0037f31553
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# docs/api/notifications/link.updated.json
# docs/api/notifications/log.warning.json
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
# docs/api/v2/compute/iou/projectsprojectidiounodes.rst
# docs/api/v2/compute/project/projects.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
# docs/api/v2/controller/link/projectsprojectidlinks.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
# docs/api/v2/controller/project/projects.rst
# docs/api/v2/controller/project/projectsprojectidduplicate.rst
# docs/controller_notifications.rst
# docs/curl.rst
# docs/gns3_file.json
# docs/project_notifications.rst
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/schemas/ethernet_hub.py
# gns3server/schemas/ethernet_switch.py
# gns3server/static/web-ui/3rdpartylicenses.txt
# gns3server/static/web-ui/index.html
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
# requirements.txt
# tests/controller/test_project.py
# tests/controller/test_topology.py
# tests/handlers/api/controller/test_project.py
|
2024-01-28 12:30:43 +11:00 |
|
|
grossmj
|
e3493870b2
|
Add project.created, project.opened and project.deleted controller notification stream.
Move project.updated and project.closed from project notification to controller notification stream.
|
2024-01-28 12:13:09 +11:00 |
|