arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity
5,309 Commits 5 Branches 203 Tags 151 MiB
aaa6ca9445
Commit Graph

769 Commits

Author SHA1 Message Date
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
grossmj
802959f9ab Merge branch 'master' into 3.0 
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
 2021-04-10 12:46:40 +09:30
grossmj
0fea3f969e Use aiosqlite and add service for templates 2021-03-28 21:17:29 +10:30
grossmj
8cce0eedee Fix console type error when creating Ethernet switch node. Fixes #1873 2021-03-01 13:55:52 +10:30
grossmj
c17a86e814 Add missing async 2021-02-18 18:14:35 +10:30
grossmj
1add223891 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/schemas/project.py
#	gns3server/schemas/qemu.py
#	gns3server/schemas/qemu_template.py
#	gns3server/version.py
#	tests/handlers/api/compute/test_qemu.py
 2021-02-16 21:11:40 +10:30
grossmj
1043be02a6 Merge branch 'master' into 2.2 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
 2021-02-16 19:02:12 +10:30
grossmj
9de61cd671 Fix warning: 'ide-drive' is deprecated when using recent version of Qemu. Fixes https://github.com/GNS3/gns3-gui/issues/3101 2021-02-14 14:39:02 +10:30
grossmj
9e6ccc3f61 Fix bug when starting of vpcs stopped with "quit". Fixes https://github.com/GNS3/gns3-gui/issues/3110 2021-02-14 13:50:10 +10:30
grossmj
128e494134 Stop uBridge if VPCS node has been terminated. Ref https://github.com/GNS3/gns3-gui/issues/3110 2021-01-27 21:03:19 +10:30
Brent Baccala
235a127111 Allow cloned QEMU disk images to be resized before the node starts, 
by cloning the disk image in response to a resize request instead
of waiting until the node starts.
 2020-12-30 15:36:38 -05:00
grossmj
6aefb5d32b Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2020-12-07 18:00:33 +10:30
grossmj
5244ae6d4c New config file options to configure the VNC console port range. 2020-12-03 18:04:42 +10:30
grossmj
c043830e3f Move endpoints to routes & preparations to use a database. 2020-11-19 15:21:03 +10:30
grossmj
acc5c7ebfa Update package versions. 
Do not use Path in schemas (causes issues with empty paths).
Change how notifications are handled.
Run tests with Python 3.9
 2020-11-11 17:18:41 +10:30
Bernhard Ehlers
e45bc5aec1 Fix mcopy error messages 2020-11-05 15:00:44 +01:00
grossmj
a5d89b428a Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/compute.py
#	gns3server/schemas/gns3vm.py
#	gns3server/utils/application_id.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2020-11-05 17:15:25 +10:30
grossmj
5a7b5e4e08 Make sure all HTTP exceptions return JSON with a "message" field instead of "detail" 2020-11-02 18:08:25 +10:30
grossmj
eeaf10b418 Put all schemas in the same module. 2020-10-31 16:02:21 +10:30
grossmj
5dab0c2587 Prevent WIC to be added/removed while Dynamips router is running. Fixes https://github.com/GNS3/gns3-gui/issues/3082 2020-10-27 20:08:01 +10:30
grossmj
a92c47b310 Add HTTP client to reuse the aiohttp session where needed. 
Remove unnecessary aiohttp exceptions.
 2020-10-22 16:19:44 +10:30
grossmj
bd8565b2b9 Refactor WebSocket console code to work with FastAPI. 
Fix endpoint routes.
 2020-10-19 15:00:41 +10:30
Bernhard Ehlers
de2b9caeeb Use HDD disk image as startup QEMU config disk 2020-10-19 03:19:22 +02:00
grossmj
0746949207 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/endpoints/compute/test_qemu_nodes.py
#	tests/endpoints/controller/test_nodes.py
 2020-10-12 18:04:49 +10:30
grossmj
362701f5aa Allow commas in image paths and VM name for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/3065 2020-10-11 14:02:22 +10:30
grossmj
91244456f5 Handle comma in disk path for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/3065 2020-10-08 22:09:03 +10:30
grossmj
c248764efb Fixes update() missing 2 required positional arguments: 'name' and 'value'. Fixes #1821 #1825 2020-10-06 17:08:51 +10:30
grossmj
eb3cb8a41f Migration to FastAPI 2020-10-02 16:07:50 +09:30
grossmj
399f1c082e Add '-smp sockets=1' by default for Qemu VMs. Ref https://github.com/GNS3/gns3-gui/issues/3047 2020-09-13 23:16:52 +09:30
grossmj
992cd7fc6c Implement full restart if user reload a Qemu VM which has been updated. Fixes https://github.com/GNS3/gns3-gui/issues/3038 2020-09-12 23:07:39 +09:30
grossmj
2bf625e000 Fix issue when resuming Qemu VM. Fixes https://github.com/GNS3/gns3-gui/issues/3027 2020-09-04 18:02:21 +09:30
grossmj
4843084158 Prioritize the config disk over HD-D for Qemu VMs. 
Fixes https://github.com/GNS3/gns3-gui/issues/3036

(cherry picked from commit c12b675691)
 2020-08-18 10:54:11 +09:30
grossmj
c12b675691 Prioritize the config disk over HD-D for Qemu VMs. 
Fixes https://github.com/GNS3/gns3-gui/issues/3036
 2020-08-18 10:54:11 +09:30
Jeremy Grossmann
fa26555d00
Merge pull request #1801 from GNS3/qemu-config-disk 
QEMU config disk - enable QEMU config import/export
 2020-08-15 16:35:20 +08:00
grossmj
f2ddef855f Fix tests. 
(cherry picked from commit 620d93634e)
 2020-08-15 16:35:31 +09:30
grossmj
620d93634e Fix tests. 2020-08-15 16:35:31 +09:30
grossmj
ec02150fd2 Set default disk interface type to "none". 
Fail-safe: use "ide" if an image is set but no interface type is configured.
Use the HDA disk interface type if none has been configured for HDD.

(cherry picked from commit 464fd804ce)
 2020-08-15 16:14:16 +09:30
grossmj
464fd804ce Set default disk interface type to "none". 
Fail-safe: use "ide" if an image is set but no interface type is configured.
Use the HDA disk interface type if none has been configured for HDD.
 2020-08-15 16:14:16 +09:30
grossmj
a56b816c1a Add explicit option to automatically create or not the config disk. Off by default. 
(cherry picked from commit 56aba96a5f)
 2020-08-14 17:57:24 +09:30
grossmj
56aba96a5f Add explicit option to automatically create or not the config disk. Off by default. 2020-08-14 17:57:24 +09:30
grossmj
c684c554bf Fix tests 
(cherry picked from commit 2ba6eac113)
 2020-08-13 17:10:31 +09:30
grossmj
2ba6eac113 Fix tests 2020-08-13 17:10:31 +09:30
grossmj
7043d48f1a Auxiliary console support for Qemu. Ref #2873 
Improvements for auxiliary console support for Docker and Dynamips.
 2020-07-29 16:23:51 +09:30
grossmj
65c8bb6754 Fix AUX console not allocated for Dynamips IOS routers. 2020-07-27 18:42:36 +09:30
grossmj
12732aaf83 Disallow to rename a running node. Fixes https://github.com/GNS3/gns3-gui/issues/2499 2020-07-27 15:06:17 +09:30
grossmj
831ee5f468 Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619 2020-07-26 18:27:18 +09:30
grossmj
01b2c72767 Add maxcpus property for Qemu VMs. Ref #1674 2020-07-24 15:15:41 +09:30
Bernhard Ehlers
068c31038f QEMU config disk - improve error handling 2020-07-19 17:56:49 +09:30
Bernhard Ehlers
2bbee15b18 QEMU config disk - notification of import/export errors 2020-07-19 17:56:49 +09:30
Bernhard Ehlers
50c49cfedb QEMU config disk - notification of import/export errors 2020-07-19 17:56:49 +09:30
Bernhard Ehlers
b672900406 QEMU config disk - use disk interface of HD-D, fallback is HD-A 2020-07-19 17:56:49 +09:30
Bernhard Ehlers
2e0fba925b QEMU config disk - add missing config disk to image directory 2020-07-19 17:56:49 +09:30
Bernhard Ehlers
450c6cddc7 QEMU config disk - get rid of mtoolsrc 2020-07-19 17:56:48 +09:30
Bernhard Ehlers
5c44268476 QEMU config disk - preserve file timestamp on zip unpack 2020-07-19 17:56:48 +09:30
Bernhard Ehlers
b69965791d QEMU config disk - initial implementation. Ref #2958 2020-07-19 17:56:48 +09:30