grossmj
|
f8a83e7ff9
|
Merge branch '2.2' into 3.0
# Conflicts:
# dev-requirements.txt
# gns3server/compute/qemu/qemu_vm.py
# gns3server/version.py
# requirements.txt
|
2022-03-13 14:50:02 +10:30 |
|
grossmj
|
f963e63d16
|
Merge branch 'master' into 2.2
|
2022-02-25 14:45:47 +10:30 |
|
grossmj
|
7490be6d5e
|
Support GNS3 variables in Docker environment variables. Fixes #2033
|
2022-02-23 14:33:30 +10:30 |
|
grossmj
|
74c675d5b0
|
Drop Windows support
|
2022-01-19 22:28:36 +10:30 |
|
John Fleming
|
511ac73d4f
|
qemu_vm.py Linked node test.
Include project name in error. This should help identify which project the none linked node is located in.
|
2022-01-17 14:19:49 -05:00 |
|
grossmj
|
296446189f
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/appliances/Simulator.gns3a
# gns3server/compute/docker/__init__.py
# gns3server/compute/docker/docker_vm.py
# gns3server/version.py
|
2021-12-02 19:57:04 +10:30 |
|
grossmj
|
b1a62dfdc2
|
Fix unhandled KeyError exception when starting Docker container. Ref #1991
|
2021-11-04 16:59:35 +10:30 |
|
grossmj
|
eab4c8c770
|
Remove Qemu legacy networking support
|
2021-10-19 15:32:27 +10:30 |
|
Jeremy Grossmann
|
9ac6bd1e59
|
Merge pull request #1908 from GNS3/busybox-docker
Use a stock BusyBox for the Docker Integration
|
2021-10-16 19:47:24 +10:30 |
|
grossmj
|
0b200def88
|
Merge branch 'master' into 3.0
# Conflicts:
# .github/workflows/testing.yml
# Dockerfile
# gns3server/version.py
|
2021-10-09 12:16:50 +10:30 |
|
grossmj
|
5eb5658a74
|
Fix memory percentage left warning. Fixes #1966
|
2021-09-20 18:08:02 +09:30 |
|
grossmj
|
a324459152
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/qemu/qemu_vm.py
# gns3server/handlers/api/compute/server_handler.py
# gns3server/utils/path.py
# gns3server/version.py
# requirements.txt
# tests/compute/qemu/test_qemu_vm.py
# tests/compute/test_manager.py
|
2021-09-09 16:36:17 +09:30 |
|
grossmj
|
611570a863
|
Fix qemu-img rebase code to support Qemu 6.1. Ref https://github.com/GNS3/gns3-server/pull/1962
|
2021-09-05 22:18:46 +09:30 |
|
grossmj
|
99d7d0c769
|
Merge branch 'master' into 2.2
# Conflicts:
# gns3server/compute/qemu/qemu_vm.py
|
2021-09-05 21:53:36 +09:30 |
|
grossmj
|
ed336da304
|
Qemu 6.1 support
Handle the deprecated use of backing file without explicit backing format issue.
|
2021-09-05 18:34:37 +09:30 |
|
Brian Candler
|
21e9f38437
|
Reinstate qemu-img rebase
This allows importing portable projects with images and/or snapshots,
regression introduced by #1927.
Fixes #1955
|
2021-09-04 12:34:22 +01:00 |
|
grossmj
|
75bb06563a
|
Fix tests
|
2021-08-30 13:04:24 +09:30 |
|
grossmj
|
afdda427d2
|
Merge branch 'master' into 3.0
# Conflicts:
# .github/workflows/testing.yml
# gns3server/compute/builtin/nodes/nat.py
# gns3server/compute/qemu/__init__.py
# gns3server/controller/link.py
# gns3server/utils/asyncio/embed_shell.py
# gns3server/utils/asyncio/raw_command_server.py
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
|
2021-08-29 19:23:51 +09:30 |
|
grossmj
|
6005e89181
|
Fix issue when searching for image with relative path. Fixes #1925
|
2021-08-25 17:23:21 +09:30 |
|
grossmj
|
363fdb7d10
|
Fix wrong error when NAT interface is not allowed. Fixes #1943
|
2021-08-24 20:40:06 +09:30 |
|
grossmj
|
92150fba71
|
Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216
|
2021-08-24 17:26:06 +09:30 |
|
grossmj
|
cfaafedb09
|
Merge branch '3.0' into busybox-docker
|
2021-08-11 18:36:30 +09:30 |
|
grossmj
|
d0a9425392
|
Remove busybox and copy system busybox in setup.py
|
2021-08-11 17:27:47 +09:30 |
|
grossmj
|
c5c95979c2
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/compute/qemu/utils/qcow2.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/handlers/api/controller/server_handler.py
# gns3server/version.py
|
2021-08-10 15:38:49 +09:30 |
|
grossmj
|
77487e4fc3
|
Merge branch 'master' into 2.2
|
2021-08-05 15:54:16 +09:30 |
|
Jeremy Grossmann
|
b68f7a78a7
|
Merge pull request #1927 from candlerb/candlerb/1921
Support cloning of encrypted qcow2 base image files
|
2021-08-04 23:19:23 -07:00 |
|
Jeremy Grossmann
|
6cf268ca93
|
Merge pull request #1934 from GNS3/handle_no-kvm_deprecated
Handle -no-kvm param deprecated in Qemu >= v5.2
|
2021-07-27 17:37:41 +09:30 |
|
grossmj
|
4646ce684f
|
Handle -no-kvm param deprecated in Qemu >= v5.2
|
2021-07-27 16:34:51 +09:30 |
|
Andrej Krpič
|
3b7dc21ef0
|
Fix binary websocket access to the console
telnet_writer.write is not an async method - drain() is.
Remove async keyword so the call is the same as for the text websocket.
|
2021-07-26 12:58:35 +02:00 |
|
grossmj
|
0ecea8ffbb
|
Change how to generate random MAC addresses
|
2021-07-25 16:03:54 +09:30 |
|
Brian Candler
|
1ee3e14bd3
|
Support cloning of encrypted qcow2 base image files
Fixes #1921
|
2021-07-09 10:53:02 +01:00 |
|
grossmj
|
c13f5c6627
|
Update to the udhcpc wrapper script. Ref #1890
|
2021-06-14 19:28:40 +09:30 |
|
grossmj
|
cdedd53339
|
Fix VMware VM support on Linux and Windows. Fixes #1919
|
2021-06-14 13:16:11 +09:30 |
|
Jeremy Grossmann
|
e78b5fa6d6
|
Fix typo
|
2021-06-12 15:20:55 +09:30 |
|
grossmj
|
6ec028ea4e
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/builtin/nodes/cloud.py
# gns3server/compute/vmware/vmware_vm.py
# gns3server/controller/link.py
# gns3server/controller/snapshot.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/controller/link_handler.py
# gns3server/schemas/link.py
# gns3server/utils/path.py
# gns3server/version.py
# requirements.txt
|
2021-06-12 14:36:32 +09:30 |
|
grossmj
|
c892cf371b
|
Fix VMware support on macOS BigSur
|
2021-06-08 11:56:33 +09:30 |
|
grossmj
|
6a726d0344
|
Fix formatting issue.
|
2021-06-03 19:32:00 +09:30 |
|
grossmj
|
9b0e3a77ed
|
Use a stock BusyBox for the Docker Integration
|
2021-06-03 18:38:08 +09:30 |
|
grossmj
|
971e86d254
|
Fix uBridge errors for cloud nodes not visible in logs. Fixes #1895
|
2021-05-16 14:59:02 +09:30 |
|
grossmj
|
09ac7fd7fb
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_manager.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/iou_handler.py
# gns3server/handlers/api/compute/project_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/handlers/api/controller/node_handler.py
# gns3server/handlers/api/controller/project_handler.py
# gns3server/handlers/index_handler.py
# tests/handlers/api/compute/test_project.py
# tests/handlers/api/compute/test_qemu.py
# tests/handlers/api/controller/test_node.py
# tests/handlers/api/controller/test_project.py
|
2021-05-15 20:46:34 +09:30 |
|
grossmj
|
9a6978902d
|
Fix tests.
|
2021-05-15 19:43:36 +09:30 |
|
grossmj
|
6294ad9e76
|
Prevent directory traversal
|
2021-05-15 17:35:32 +09:30 |
|
grossmj
|
9404c00411
|
Complete type annotations for API endpoints.
|
2021-04-18 15:40:38 +09:30 |
|
grossmj
|
cefab8d362
|
Rename __json__() to asdict()
|
2021-04-17 23:34:28 +09:30 |
|
grossmj
|
44074ff7c9
|
Some cleaning.
|
2021-04-17 18:36:32 +09:30 |
|
grossmj
|
9c850e0f2b
|
Move schemas between compute and controller subpackages
|
2021-04-15 18:12:08 +09:30 |
|
grossmj
|
c59fc375f2
|
Remove traceng code.
|
2021-04-13 19:03:23 +09:30 |
|
grossmj
|
c021e21309
|
Use black with -l 120 param.
|
2021-04-13 18:46:50 +09:30 |
|
grossmj
|
f928738bd5
|
Use pyupgrade with --py36-plus param.
|
2021-04-13 18:37:58 +09:30 |
|
grossmj
|
30ebae207f
|
Use Pydantic to validate the server config file.
|
2021-04-12 17:02:23 +09:30 |
|