Compare commits

..

1702 Commits

Author SHA1 Message Date
d2a0632ec4 Release v2.2.41 2023-07-12 17:07:39 +10:00
fde5f5cbe2 Merge remote-tracking branch 'origin/master' into 2.2 2023-07-12 17:04:12 +10:00
7dc5628845 Bundle web-ui v2.2.41 2023-07-12 16:31:54 +10:00
723b519e8f Sync appliance files 2023-07-12 16:20:29 +10:00
9c653f7dbf Bump version to 2.2.41.dev3 2023-07-12 13:26:22 +10:00
c226b2a9ef Catch urllib3 exceptions when sending crash report. Ref https://github.com/GNS3/gns3-gui/issues/3483 2023-07-06 17:16:05 +10:00
c5c4e1ad56 Merge pull request #2255 from GNS3/fix/2243
Only add speed/duplex params when using Qemu >= v2.12
2023-07-06 16:43:54 +10:00
8e2989d747 Fix issue with tests and Qemu version on Windows 2023-07-06 16:36:36 +10:00
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
24c03406e7 Merge pull request #2253 from GNS3/uefi-boot-mode
Bundle recent OVMF firmware and improve UEFI boot mode
2023-07-04 13:38:47 +10:00
6c8c5c1787 Ignore uefi test on Windows 2023-07-04 13:31:21 +10:00
f541c03b94 Fix uefi test on Windows 2023-07-04 13:22:18 +10:00
0a14a08d54 Use recent OVMF firmware (stable-202305) and use flash drives to configure Qemu command line 2023-07-04 13:06:34 +10:00
29b4e89d21 Merge pull request #2252 from Raizo62/rights_empty8G.qcow2
- remove executable permissions to empty8G.qcow2
2023-06-28 19:55:56 +09:30
bbb68cb148 - remove the useless executable permissions to the file gns3server/disks/empty8G.qcow2
https://github.com/GNS3/gns3-gui/issues/3491
2023-06-28 08:30:13 +02:00
6f132a2e09 Merge pull request #2248 from GNS3/backport-uefi-boot-mode
Backport UEFI boot mode support for Qemu VMs
2023-06-23 11:31:52 +09:30
d5cfb85de5 Backport UEFI boot mode support for Qemu VMs 2023-06-23 11:18:25 +09:30
3dbc714f37 Developement on v2.2.41.dev2 2023-06-10 21:40:39 +09:30
682af449f8 Merge pull request #2240 from GNS3/release-v2.2.40.1
Release v2.2.40.1
2023-06-10 21:36:51 +09:30
60f1d76eab Release v2.2.40.1 2023-06-10 20:06:40 +09:30
16b619066a Merge branch 'master' into 2.2 2023-06-10 17:22:33 +09:30
d44038305f Add missing web-ui files. Fixes #2239 2023-06-10 15:50:28 +09:30
3641742930 Development on v2.2.41.dev1 2023-06-06 12:43:20 +09:30
4bf7838543 Merge pull request #2238 from GNS3/release-v2.2.40
Release v2.2.40
2023-06-06 12:41:40 +09:30
998fe6d8a4 Merge branch 'master' into release-v2.2.40 2023-06-06 12:28:30 +09:30
aa79f4cb25 Release v2.2.40 2023-06-06 10:23:42 +09:30
2602602193 Merge branch 'master' into 2.2 2023-06-06 10:20:07 +09:30
8d969349c8 Bundle web-ui v2.2.40 2023-06-06 10:18:18 +09:30
bf67fec242 Sync appliances 2023-06-06 10:07:50 +09:30
a070a72f66 Merge pull request #2235 from Raizo62/virtio-net-pci
qemu : with "virtio-net-pci", fix the speed and duplex
2023-06-03 21:03:04 +09:30
71d1aefb65 Test Qemu command with virtio-net-pci adapter 2023-06-03 20:57:23 +09:30
0b6436d2cb qemu : with network adapter_type equal to "virtio-net-pci", fix the speed to 10000 and duplex to full.
The values are actually fake.
	(https://github.com/GNS3/gns3-gui/issues/3476)
2023-06-03 11:48:55 +02:00
77f5044aec Merge pull request #2234 from GNS3/fix-tests
Fix tests
2023-06-02 20:32:25 +09:30
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
21dc2a8dbc Fix tests 2023-06-02 20:25:33 +09:30
aae7bf9865 Merge pull request #2231 from GNS3/fix/3452
Fix Docker + VNC issues
2023-06-02 20:24:55 +09:30
4338afab7f Fix tests 2023-06-02 20:16:06 +09:30
ef62eba4e8 Merge pull request #2233
Fix unexpected indent
2023-06-02 20:08:55 +09:30
cc4ead40e2 Fix unexpected indent 2023-06-02 20:08:21 +09:30
67943c4727 Merge pull request #2232 from Mlastawi/master
Parse name for request to node creation from template
2023-06-02 18:16:29 +09:30
045c0c4c14 Add missing comma 2023-06-02 10:38:42 +02:00
a0943b0b5a Parse name for request to node creation from template 2023-06-02 09:39:08 +02:00
84c886b058 Remove left over Xvfb related code 2023-05-31 21:33:39 +09:30
e59b5fb95b Remove Xvfb + x11vnc support 2023-05-31 21:28:06 +09:30
cc4d6759e3 Merge pull request #2229 from GNS3/fix/3472
Fix support for the GNS3 VM on macOS with VirtualBox 7
2023-05-31 20:46:39 +09:30
e45467af57 Use the correct VirtualBox host-only type 2023-05-31 20:39:25 +09:30
c6d6fcfe66 Search for correct VirtualBox network type 2023-05-31 20:19:13 +09:30
73bcd019cc Require a Host-Only Network to start the VirtualBox GNS3 VM on macOS with VirtualBox 7 2023-05-30 21:22:57 +09:30
2361e138ec Properly catch aiohttp client exception. Ref #2228 2023-05-30 16:17:12 +09:30
0f02cff5f2 Catch ConnectionResetError when waiting for the wrap console 2023-05-25 18:29:19 +08:00
72af145a23 Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448 2023-05-22 19:42:01 +08:00
d03e7ac9c5 Fix tests 2023-05-14 14:20:45 +08:00
af2fc8c111 Use proc.communicate() when checking for subprocess output
As recommended in https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process.stderr
2023-05-14 13:58:50 +08:00
25c03b7823 Merge pull request #2220 from GNS3/release-v2.2.39
Release v2.2.39
2023-05-08 20:27:28 +08:00
b4bfb24a80 Development on v2.2.40.dev1 2023-05-08 20:26:40 +08:00
d6ea546ff7 Release v2.2.39 2023-05-08 19:17:02 +08:00
68f9c55f3d Install web-ui v2.2.39 2023-05-08 19:10:22 +08:00
9868c28bc6 Merge pull request #2219 from GNS3/install-qemu-empty-disks
Install empty Qemu disks
2023-05-08 16:58:26 +08:00
f3f7921525 Add generic function to install resource files 2023-05-07 21:57:44 +08:00
65cc12c850 Sync appliance files 2023-05-05 22:46:42 +08:00
161f62d083 Install empty Qemu disks on first start 2023-05-05 22:40:58 +08:00
d6141d4652 Fix checking for ":" in project dir on Windows for Docker containers 2023-03-23 22:17:29 -10:00
8bf5eb2754 Upgrade sentry-sdk 2023-03-23 21:41:50 -10:00
ce220e5ae4 Merge pull request #2211 from eantowne/master
remote-install.sh: added variable declaration
2023-03-24 03:03:12 +08:00
791ce6a56e Added declaration for in remote-install.sh to resolve 'unary operator operator expected' error 2023-03-23 07:59:20 -04:00
f08ce9d3f1 Check for colon in project name. Fixes #2203 2023-03-19 18:26:26 +10:00
ceb8208002 Upgrade distro and aiohttp dependencies 2023-03-01 18:03:28 +10:00
42767eff56 Development on 2.2.39.dev1 2023-02-28 17:09:39 +10:00
0406083991 Merge pull request #2192 from GNS3/2.2
Release v2.2.38
2023-02-28 14:41:03 +08:00
91dba66800 Release v2.2.38 2023-02-28 15:35:17 +10:00
69b741a01e Sync appliance files 2023-02-28 15:31:02 +10:00
8903ab8a47 Bundle web-ui v2.2.38 2023-02-28 15:29:17 +10:00
4d62c6943b Merge branch 'master' into 2.2 2023-02-28 15:07:48 +10:00
2a66f67b5f Merge remote-tracking branch 'origin/2.2' into 2.2 2023-02-27 22:59:08 +10:00
8ef59c7832 Fix c7200_i0_log.txt is created in the current directory. Fixes #2191 2023-02-27 22:58:52 +10:00
cbdab1f0d7 Merge pull request #2190 from GNS3/check_tpm
Check swtpm version and start it before qemu
2023-02-26 18:59:08 +08:00
7968ee7ff2 Check swtpm version and start swtpm before qemu 2023-02-26 20:51:24 +10:00
be557abba9 Merge pull request #2185 from Xatrekak/master
Update remote-install.sh and add welcome.py
2023-02-19 13:02:54 +08:00
3040e87a7d Merge pull request #2189 from GNS3/fix/2188
Fix broken websocket console with Python 3.11
2023-02-18 15:44:06 +08:00
1f85abb036 Fix broken websocket console with Python 3.11 2023-02-18 15:32:57 +08:00
30c85703c8 Attempt to fix "cannot reopen console". Ref #2182 2023-02-13 19:32:44 +08:00
4bdd405bc5 Merge branch 'final_stacked_merge'
This updates the script to assume that welcome.py has been merged into the GNS3 master repo
2023-02-12 18:46:38 -05:00
229168367b Merge branch 'remote_install_changes'
Changes to remote-install to make it compatible with the latest versions of ubuntu server. Also adds an option to install the welcome dialog from gns3vm
2023-02-12 18:44:12 -05:00
e257fb425e This commit is stacked and assumes welcome.py has already been merged into the GNS3 master repo 2023-02-12 18:30:01 -05:00
fac224ac48 Updated to latest welcome.py commit. Raw cache still bugged 2023-02-12 17:26:53 -05:00
62c2ca9be1 Added Web UI to Dialog 2023-02-12 17:20:25 -05:00
f98a60fc74 added an OS update to end when using welcome option 2023-02-12 14:42:53 -05:00
42a5f1956e Changed mechanism used to set gns3 user password that works on all shells. 2023-02-12 14:21:01 -05:00
13df828ca7 switched to a direct link to the latest commit instead of the branch alias to bypass github raw caching issues. 2023-02-12 13:12:20 -05:00
19a8d1caed Update welcome.py 2023-02-12 12:59:06 -05:00
290df5290a fixed transcription 2023-02-12 02:48:17 -05:00
fbe10360c2 Finished gns3 user setup 2023-02-12 02:44:15 -05:00
ac042b02c4 changes self.d to self.display so it would be more intuitive. 2023-02-12 02:30:28 -05:00
e44999f588 Refactored welcome.py to use a class so its functions would be callable by remote-install.sh. This ensure the setup uses the same IP address that will be displayed by Dialog. 2023-02-12 02:07:18 -05:00
952b4e7249 fixed some shell bugs 2023-02-11 23:24:23 -05:00
3b0336bd7e fixed typo 2023-02-11 22:23:45 -05:00
7689b7841f switched to modifed welcome by and full path to it 2023-02-11 21:00:37 -05:00
bf5970b904 Update install and welcome to support running it 2023-02-11 19:57:54 -05:00
2eca92e34d The legacy get_ip function no longer worked on new versions of ubuntu LTS. 2023-02-11 18:05:03 -05:00
70d3f991ed Add welcome.py script from GNS3vm 2023-02-11 17:57:12 -05:00
2b6bec1b93 Merge pull request #2178 from GNS3/fix/2177
Fix Qemu binary not set when adding appliance from template
2023-02-04 10:12:30 +05:45
0f49911432 Fix Qemu binary not set when adding appliance from template 2023-02-04 12:18:52 +08:00
3a6ff9b44f Add long description content type in setup.py 2023-02-01 09:56:02 +08:00
83cb8693e6 Automatically add new issues to GNS3 project 2023-01-31 09:31:52 +08:00
e5ecdd270d Development 2.2.38.dev1 2023-01-25 18:36:39 +08:00
260ac44e87 Release v2.2.37 2023-01-25 15:06:12 +08:00
1fa4632b55 Merge branch 'master' into 2.2 2023-01-25 14:44:54 +08:00
a0cf711634 Bump version to 2.2.37.dev3 2023-01-25 14:13:07 +08:00
b83645c531 Add web-ui v2.2.37 2023-01-24 15:06:21 +08:00
a7daae1c6a Sync appliances 2023-01-24 14:57:58 +08:00
a7d19fd89a Fix StreamWriter doesn't have the wait_closed() method in Python3.6. Fixes #2170 2023-01-20 13:14:57 +08:00
3c2ae5363c Install built-in appliances when no previous version has been detected. Fixes #2168 2023-01-17 13:39:01 +08:00
24d1aeee32 Bump version to 2.2.37.dev2 2023-01-17 13:30:09 +08:00
8d56b7b18c Fix sync_appliances.sh 2023-01-17 13:11:56 +08:00
90d7478679 Sync appliances 2023-01-17 13:11:18 +08:00
fb4c04ac41 Update documentation to install gns3-server. Fixes #2124 2023-01-17 09:45:14 +08:00
dc1b98a1d0 Merge pull request #2166 from GNS3/fix/2165
Find Dynamips version before hypervisor is started
2023-01-17 07:15:33 +05:45
c57b0cbb53 Find Dynamips version before hypervisor launch and do not require Dynamips v0.2.23 2023-01-16 18:04:46 +08:00
5a3b502024 Fix NIO update UDP test 2023-01-10 11:39:18 +08:00
997e0ad6ee Fix more tests 2023-01-10 11:22:12 +08:00
eb3fc1bb3a Fix more tests 2023-01-10 11:09:27 +08:00
e9c95ff299 Fix tests 2023-01-10 10:07:26 +08:00
78c301653f Convert README to Markdown 2023-01-10 08:23:06 +08:00
535f89e29e Give udhcpc executable right. Fixes #2159 2023-01-06 20:09:17 +08:00
f8f5d7ec07 Development on 2.2.37.dev1 2023-01-05 09:13:30 +08:00
d0141c351b Merge branch '2.2' 2023-01-05 09:12:11 +08:00
8e2992fbc7 Release v2.2.36 2023-01-04 19:46:30 +08:00
8986f10506 Install web-ui v2.2.36 2023-01-04 19:05:24 +08:00
10f3adcb60 Sync appliance files 2023-01-04 18:28:14 +08:00
5459543eb5 Fix issue when detecting Dynamips version (version is not set until after Dynamips has started) 2023-01-04 18:21:17 +08:00
e15c36f05c Merge remote-tracking branch 'origin/2.2' into 2.2 2023-01-04 15:12:26 +08:00
da7c7d16e4 Fix starting Dynamips on Windows 2023-01-04 15:12:09 +08:00
8d69f7f792 Merge pull request #2157 from GNS3/qemu-tpm-support
Trusted Platform Module (TPM) support for Qemu VMs
2023-01-04 10:55:52 +05:45
297ada529c Prevent TPM to run on Windows 2023-01-04 12:57:48 +08:00
ae200d9add Add Trusted Platform Module (TPM) support for Qemu VMs 2023-01-04 12:13:19 +08:00
eb1b70456f Merge pull request #2155 from GNS3/fix/2143
Binding address for console
2023-01-04 07:00:33 +05:45
9132002b80 Fix typos 2023-01-04 09:08:40 +08:00
771a9a5ddb Require Dynamips 0.2.23 and bind Dynamips hypervisor on 127.0.0.1 2023-01-02 15:26:59 +08:00
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
8f9800f444 Update README.rst about static busybox 2023-01-01 18:24:42 +08:00
90c971ed74 Merge pull request #2152 from GNS3/fix/2151
Install built-in appliance files at the first start of a newer version of the server
2023-01-01 15:40:48 +05:45
d2ad9dc5e2 Delete the built-in appliance directory before installing updated files 2023-01-01 17:49:00 +08:00
e5c8ae4bde Use a stock BusyBox for the Docker integration 2023-01-01 17:04:48 +08:00
5bccf4841d Overwrite built-in appliance files when starting a more recent version of the server 2023-01-01 15:57:41 +08:00
b3a6b9173b Fix reset console. Fixes #1619 2022-12-31 09:43:17 +08:00
2d6b260188 Revert "Install importlib-resources==1.3 with Python < 3.9"
This reverts commit 343022c63b.
2022-12-30 21:13:59 +08:00
c814245426 Revert "Change importlib-resources dependency to v1.4.0"
This reverts commit d787f38c21.
2022-12-30 21:13:49 +08:00
d787f38c21 Change importlib-resources dependency to v1.4.0 2022-12-30 21:09:54 +08:00
343022c63b Install importlib-resources==1.3 with Python < 3.9 2022-12-30 21:05:18 +08:00
1148dbc48e Fix issue when calling reset_console with running VPCS and Qemu nodes. Ref #1619 2022-12-30 20:54:37 +08:00
85679aaa94 Try importlib-resources for Python 3.9 2022-12-30 11:44:29 +08:00
5bcc247881 Make gns3server.appliances a package 2022-12-30 11:37:34 +08:00
b8d595928b Try to fix tests 2022-12-30 10:35:29 +08:00
3804249d89 Fix tests 2022-12-30 10:01:43 +08:00
c56a8ef8f7 Only use importlib_resources for Python < 3.9. Fixes #2147 2022-12-30 09:15:40 +08:00
076e85ddb3 Update sentry-sdk dependency 2022-12-28 15:13:26 +08:00
2550fb3495 Support when the user field defined in Docker container is an ID. Fixes #2134 2022-12-28 11:05:22 +08:00
9f75a49e0a Fix syntax error in .whitesource 2022-12-27 12:27:26 +08:00
7f440f43d8 Add more base branches for Mend to scan 2022-12-27 12:25:49 +08:00
649173b293 Merge remote-tracking branch 'origin/master' 2022-12-21 17:14:00 +08:00
1c183e660f Downgrade Ubuntu to 20.04 to fix missing Python 3.6 2022-12-21 17:12:09 +08:00
634e6a3549 Update SECURITY.md 2022-12-20 21:28:46 +08:00
a91ed34f43 Downgrade Ubuntu to 20.04 to fix missing Python 3.6 2022-12-18 14:24:50 +08:00
5209009df9 Upgrade dependencies 2022-12-18 14:14:56 +08:00
5ba526e175 Development on v2.2.36.dev2 2022-11-11 00:36:47 +08:00
d17c243b13 Release v2.2.35.1 2022-11-10 22:21:13 +08:00
9e4ae6bc24 Sync appliance files 2022-11-10 22:10:21 +08:00
4b410cfa42 Merge branch 'master' into 2.2 2022-11-10 22:06:09 +08:00
b9e415b6fe Push missing file for Web-Ui v2.2.35 2022-11-10 13:09:10 +08:00
d2d327cc76 Re-release Web-Ui v2.2.35 2022-11-10 12:38:33 +08:00
0a046e43d7 Development on 2.2.36.dev1 2022-11-09 20:02:20 +08:00
a7036d14d5 Merge branch '2.2' 2022-11-09 20:00:48 +08:00
1aca7dbe04 Release v2.2.35 2022-11-08 23:40:25 +08:00
338128ca3e Upgrade pywin32 to v305 2022-11-08 23:39:10 +08:00
e165cc48e3 Use Visual Studio 2022 in appveyor.yml 2022-11-08 23:09:23 +08:00
c80a55b18c Install appliances and configs without importlib_resources for Windows only 2022-11-08 23:07:45 +08:00
284a4b62fb Fix copying appliances and configs when app is frozen 2022-11-08 22:50:59 +08:00
d33fefa183 Merge branch 'master' into 2.2 2022-11-08 19:29:39 +08:00
dfb48c884b Release web-ui v2.2.35 2022-11-08 19:29:21 +08:00
18ba60d1a3 Downgrade psutil to v5.9.2 2022-11-08 19:18:07 +08:00
521132726e Upgrade psutil to v5.9.4 2022-11-08 18:49:31 +08:00
f80aca7633 Sync appliance files 2022-11-08 18:40:27 +08:00
84914ecfa4 Add debug messages to fix VMnet interface list refresh. Ref https://github.com/GNS3/gns3-gui/issues/3381 2022-11-08 12:54:47 +08:00
5696d1ccb7 Fix issues with VMnet interface on macOS >= 11.0. Ref #3381 2022-11-07 23:59:33 +08:00
18b0863ba8 Merge remote-tracking branch 'origin/2.2' into 2.2
# Conflicts:
#	requirements.txt
2022-11-07 21:50:59 +08:00
ece47dc279 Upgrade dependencies 2022-11-07 21:48:45 +08:00
6e1d49d8ca Merge pull request #2133 from GNS3/use-importlib-resources
Migrate to importlib_resources
2022-11-07 21:24:35 +08:00
2e550d839e Fix tests 2022-11-07 20:33:02 +08:00
a4b24eaceb Use importlib_resources instead of pkg_resources and install built-in appliances in config dir. 2022-11-07 20:12:03 +08:00
f04702d607 Fix console vnc don't use configured ports in some case. Fixes #2111 2022-11-06 19:36:31 +08:00
6f11df6189 Add missing VMware settings in gns3_server.conf 2022-11-06 19:30:24 +08:00
9cf2e4f5a6 Make version PEP 440 compliant 2022-11-06 17:51:31 +08:00
9316876f97 Merge pull request #2123 from blueneekone/patch-1
Update gns3.service.systemd
2022-11-04 23:01:57 +08:00
f3b8f43689 Fix creating asyncio task in Python 3.6 2022-10-30 22:21:28 +08:00
2d74d1ad94 Fix tests for Python 3.11 2022-10-30 22:07:44 +08:00
ec50cc7c0d Support for Python 3.11 2022-10-30 19:04:54 +08:00
f8ee3b3d50 Upgrade pywin32 to v304 2022-10-19 18:31:17 +08:00
67e42f9353 Merge pull request #2128 from GNS3/fix/3393
Update requirements.txt
2022-10-18 22:31:56 +08:00
31a490211b Merge branch '2.2' into fix/3393 2022-10-18 22:31:04 +08:00
c7df8331ed Upgrade to Visual Studio 2022 in appveyor.yml 2022-10-18 21:47:10 +08:00
de1654a50f Upgrade pip and setuptools in appveyor.yml 2022-10-18 21:40:08 +08:00
a6959de1f8 Upgrade pytest. Fixes #2130 2022-10-18 21:14:53 +08:00
8cfedce468 Use jsonschema v3.2.0 for Python 3.6 2022-10-12 22:13:34 +08:00
77dd772314 Allow for more dependency versions at patch level 2022-10-12 22:07:37 +08:00
9ff302592c Upgrade to aiohttp 3.8.3 2022-10-12 21:40:23 +08:00
6b3d4feab8 Replace deprecated distro.linux_distribution() call 2022-10-11 23:28:11 +08:00
78b2b93540 Update dev-requirements.txt 2022-10-11 23:23:15 +08:00
0303e21059 Update requirements.txt 2022-10-11 23:01:24 +08:00
e20d1adb0e Downgrade aiohttp to v3.8.1 2022-10-10 16:30:28 +08:00
e5bee8ff52 Downgrade Jinja2 to support Python 3.6 2022-10-10 15:52:36 +08:00
58471ea7f4 Downgrade aiofiles to support Python 3.6 2022-10-10 15:50:35 +08:00
9fb0ba5a71 Upgrade dependencies 2022-10-10 14:29:04 +08:00
3d738e83f5 Update gns3.service.systemd
In reference to bug #1918, the gns3.service.systemd file references ExecPath /usr/bin/gns3server which needs to be changed to /usr/local/bin/gns3server for the daemon/service to run without failure.

Please see the change I made to the service above.
2022-10-02 23:25:58 -06:00
40c22e389e Merge branch 'master' into 2.2 2022-09-29 14:56:35 +02:00
0419c081fe Merge pull request #2083 from a60814billy/fix/binding-on-wrong-interface-in-windows
fix: binding to wrong interface in windows
2022-09-28 17:36:31 +02:00
dced70a565 Merge branch 'master' into 2.2 2022-09-27 11:55:53 +02:00
0d0a06799d Development on 2.2.35dev1 2022-08-29 11:14:44 +02:00
eeae27ae0d Merge branch '2.2' 2022-08-29 11:11:29 +02:00
8d4df08150 Release v2.2.34 2022-08-28 23:28:12 +02:00
fd1d8d9d86 Update appliance files 2022-08-28 22:51:26 +02:00
4ddce880ea Merge remote-tracking branch 'origin/2.2' into 2.2 2022-08-28 22:32:49 +02:00
e0209a0491 Downgrade Jinja2 to v3.0.3 2022-08-28 22:32:42 +02:00
e96d8ae497 Merge pull request #2089 from SpikefishSolutions/spikefishjohn-patch-3
Update compute.py
2022-08-28 22:09:44 +02:00
129f0a631c Use original $PATH in init.sh for Docker containers. Ref #2069 2022-08-28 12:06:56 +02:00
ad1f1cdb96 Merge remote-tracking branch 'origin/2.2' into 2.2 2022-08-28 00:03:03 +02:00
ab6c6535c6 Upgrade Sentry dependency 2022-08-28 00:02:54 +02:00
3444615253 Merge pull request #2101 from GNS3/upgrade-dev-dependencies
Upgrade dev dependencies
2022-08-28 00:01:53 +02:00
028f977823 Revert "Don't install nmap"
This reverts commit b6cf3aabca.
2022-08-28 00:01:26 +02:00
b6cf3aabca Don't install nmap 2022-08-27 23:55:42 +02:00
6546407e5d Upgrade to Python 3.7 for Windows tests 2022-08-27 23:52:59 +02:00
46b022f726 Restore missing loop 2022-08-27 23:45:30 +02:00
8f296e54f4 Add back loop 2022-08-27 23:41:52 +02:00
fc7d5be736 Use pytest-asyncio auto mode 2022-08-27 21:10:17 +02:00
600c18f04b Remove pytest.ini from tests dir 2022-08-27 21:00:31 +02:00
852de03d43 Install latest dev dependencies for Python >= 3.7 2022-08-27 20:40:35 +02:00
470e6cb901 Add pytest-asyncio 0.19.0 2022-08-27 19:41:46 +02:00
e8273fb19e Downgrade to pytest-aiohttp v0.3.0 2022-08-27 19:39:02 +02:00
4b3d6572d4 Downgrade to pytest v7.0.1 (last version to support 2022-08-27 19:35:36 +02:00
fad3df453d Run tests on 2.2 branch 2022-08-27 19:31:24 +02:00
d1c8f33fc5 Upgrade dev dependencies and fix issues after upgrading to pytest-aiohttp v1.0.4 2022-08-27 19:16:02 +02:00
3634cc8307 Merge pull request #2094 from mm1ke/master
gns3.service.openrc: make openrc script posix compliant
2022-08-08 19:29:30 +02:00
3b108563a0 gns3.service.openrc: make openrc script posix compliant 2022-08-08 19:23:29 +02:00
7277d526e3 Update compute.py
Remove check for open project. Without this check a remote can be rebooted and will be usable once the main server polls it again. Without this the main server would need to open a project that already uses the remote server or restart the main server's gns3 process.
2022-07-18 18:43:57 -04:00
790bf4521d fix: use exact match to find interface in windows to avoid get wrong interface 2022-07-06 14:22:11 +08:00
9e5ca50302 Bump version to v2.2.34dev2 2022-06-23 10:55:19 +02:00
35ec8bed6e Back to development on v2.2.34dev2 2022-06-21 11:52:58 +02:00
0433065b8b Revert "Development on v2.2.34dev2"
This reverts commit 7c5a5a9001.
2022-06-21 11:51:01 +02:00
7c5a5a9001 Development on v2.2.34dev2 2022-06-21 11:38:09 +02:00
1b32ef7854 Release v2.2.33.1 2022-06-21 10:48:02 +02:00
f5b1920f8c Add missing web-ui file 2022-06-21 10:24:19 +02:00
4341db0ff3 Development on v2.2.34dev1 2022-06-20 21:47:42 +02:00
162a8baf7b Release v2.2.33 2022-06-20 20:53:21 +02:00
4280655b3a Merge branch 'master' into 2.2 2022-06-20 20:49:51 +02:00
d47e546fce Release web-ui v2.2.33 2022-06-20 20:37:51 +02:00
2b4d623f13 Upgrade sentry-sdk and psutil 2022-06-20 20:05:34 +02:00
3c901a84bf Sync appliance files. 2022-06-20 20:02:04 +02:00
ec3c36d6da Fix Docker tests 2022-06-19 21:18:54 +02:00
908911e764 Remove parameter "Name" not useful to create a Docker container 2022-06-18 19:41:20 +02:00
bdd703a0dc Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619 2022-06-15 15:30:44 +02:00
4acc457674 Merge pull request #2073 from GNS3/disable-builtin-templates
Config setting to disable builtin templates
2022-06-15 15:08:21 +02:00
67bf14776f Config option to disable built-in templates 2022-06-15 14:48:52 +02:00
2eb64200a4 Add spaces before hostname for Docker network config. Ref #2039 2022-06-12 19:32:34 +08:00
988ca7574c Add hostname entry to sample network config for Docker nodes. Fixes #2039 2022-06-08 01:07:31 +08:00
527d4bb3ea Run Xtigervnc with MIT-SHM extension disabled for Docker VNC console support. Fixes #2071 2022-06-08 00:05:24 +08:00
1e4075ec37 Merge pull request #2066 from wowpetr/add-openrc-init
Add OpenRC init script
2022-05-26 19:02:23 +07:00
9d8ddea577 Added OpenRC init script 2022-05-16 07:06:29 +03:00
bccfb64958 Development on 2.2.33dev1 2022-04-27 19:51:24 +07:00
99813b3cfa Release v2.2.32 2022-04-27 18:47:20 +07:00
1837850894 Docker: load custom interface files from /etc/network/interfaces (commented by default). Ref #2052 2022-04-27 18:37:09 +07:00
fe037a5f1c Merge branch 'master' into 2.2 2022-04-27 18:25:31 +07:00
b03ec6e3fe Release web Ui 2.2.32 with correct version displayed 2022-04-27 18:24:36 +07:00
732c5deeff Revert "Release web UI 2.2.32"
This reverts commit db1443dd08.
2022-04-27 18:19:44 +07:00
db1443dd08 Release web UI 2.2.32 2022-04-27 18:11:26 +07:00
54e638f3ea Update appliance files 2022-04-27 17:26:36 +07:00
890dbd9f77 Create /etc/network/interfaces.d in Docker container. Fixes #2052 2022-04-20 22:59:51 +07:00
460fe5ed95 Prettify Docker '/etc/network/interfaces' file. Ref #2040 2022-04-20 19:29:56 +07:00
653539d2b0 Use public DSNs for Sentry 2022-04-20 18:41:18 +07:00
56b5c1d237 Fix VMware Fusion VM does not start on macOS >= 11. Fixes #2027 2022-04-20 18:26:45 +07:00
f21d5062fc Upgrade some packages 2022-04-20 17:38:54 +07:00
ce6d1e10d8 Include conf file in MANIFEST.in Ref #2044 2022-03-28 14:45:29 +10:30
a0fcb18395 Use Python 3.7 to publish API documentation 2022-03-28 11:27:53 +10:30
611193b25a Merge pull request #2042 from kaivogelgesang/master
Fix typo
2022-03-23 17:43:48 +10:00
73dff4b9c6 Fix typo 2022-03-23 08:38:14 +01:00
4b4f19c415 Create SECURITY.md 2022-03-14 14:27:32 +10:30
70e36be4fd Create codeql-analysis.yml 2022-03-14 14:21:50 +10:30
53f89a7fe5 Development on 2.2.32dev1 2022-02-26 20:39:26 +10:30
22c16e3608 Release v2.2.31 2022-02-26 18:22:29 +10:30
bb26ef2c3d Development on 2.2.31dev1 2022-02-25 15:59:40 +10:30
59e4e694e5 Install setuptools v59.6.0 when using Python 3.6 2022-02-25 15:50:45 +10:30
74018fae7b Release v2.2.30 2022-02-25 14:52:27 +10:30
f963e63d16 Merge branch 'master' into 2.2 2022-02-25 14:45:47 +10:30
7490be6d5e Support GNS3 variables in Docker environment variables. Fixes #2033 2022-02-23 14:33:30 +10:30
fa96c1845c Release web UI 2.2.30 2022-02-16 01:08:59 +01:00
4891dc9eee Set setuptools to v60.6.0 2022-02-06 21:02:43 +10:30
f7cc4e9574 Upgrade dependencies 2022-02-06 17:35:52 +10:30
4121aa31ac Merge pull request #2024 from SpikefishSolutions/master
Update qemu_vm.py linked node error
2022-01-18 08:16:00 +10:00
7dcc80ff39 Merge pull request #1 from SpikefishSolutions/spikefishjohn-patch-1
qemu_vm.py Linked node test.
2022-01-17 14:38:02 -05:00
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
03f8ea9a6e Fix dead link in README.rst Fixes #2022 2022-01-15 18:49:24 +10:30
6544f2e8e4 Development on 2.2.30dev1 2022-01-08 22:53:27 +10:30
aff06572d4 Release v2.2.29 2022-01-08 22:15:15 +10:30
35781e9b39 Sync appliance files 2022-01-08 22:11:32 +10:30
3251badfa5 Merge branch 'master' into 2.2 2022-01-08 22:02:37 +10:30
9559741d1f Release web UI 2.2.29 2022-01-07 21:03:19 +01:00
04287a7100 Merge pull request #2018 from tournemire/patch-1
Add NixOS in list of distributions with a package
2022-01-06 21:02:53 +10:00
31352f9a4c Add NixOS in list of distributions with a package 2022-01-06 11:57:00 +01:00
ef36b340b0 Development on 2.2.29dev1 2021-12-15 21:38:06 +10:30
bbcc28bbfc Release v2.2.28 2021-12-15 13:54:14 +10:30
d96d11746e Merge branch 'master' into 2.2
# Conflicts:
#	init/gns3.service.systemd
2021-12-15 13:36:04 +10:30
87c1df1639 Fix compute Docker test. Fixes #2003 2021-12-15 13:30:38 +10:30
b400ae240d Sync appliance files 2021-12-15 13:23:48 +10:30
466584f074 Release web UI 2.2.28 2021-12-13 23:49:42 +01:00
0d25727ca6 Simpler Systemd service file. Ref #1996 2021-11-20 16:18:09 +10:30
8d5d480077 Development on 2.2.28dev1 2021-11-13 16:31:21 +10:30
950b43a9cf Merge branch '2.2' 2021-11-13 16:29:40 +10:30
2469468c5d Release v2.2.27 2021-11-12 15:33:53 +10:30
0d19a742d0 Merge pull request #1997 from jak-sdk/issue-1996
update /var/run -> /run to meet FHS spec & Systemd best practices
2021-11-12 15:26:16 +10:30
02a19b230f Sync appliance files 2021-11-12 15:12:15 +10:30
c077a15137 Merge branch 'master' into 2.2 2021-11-12 14:46:30 +10:30
ce08b8914f Release web UI 2.2.27 fixed version 2021-11-10 00:14:25 +01:00
f7b7b1e59f Release web UI 2.2.27 2021-11-08 18:13:12 +01:00
jak
6b9511b36a update /var/run -> /run to meet FHS spec & Systemd best practices 2021-11-06 10:00:06 +00:00
b1a62dfdc2 Fix unhandled KeyError exception when starting Docker container. Ref #1991 2021-11-04 16:59:35 +10:30
1067e60284 Development on 2.2.27dev1 2021-10-08 21:49:11 +10:30
6cb8b9a75e Release v2.2.26 2021-10-08 21:02:04 +10:30
7009459b0c Merge branch 'master' into 2.2 2021-10-08 20:14:09 +10:30
03c94c0bc5 Sync appliance files. 2021-10-08 20:13:32 +10:30
568df7e476 Fix running tests with Python 3.10
https://github.com/actions/setup-python/issues/249#issuecomment-934299359
2021-10-07 15:11:53 +10:30
482b46d343 Release web UI 2.2.26 2021-10-06 17:53:00 +02:00
94ee197a6e Tests with Python 3.10 2021-10-06 20:27:57 +10:30
c386b2d046 Merge pull request #1978 from SDN-Projects/optimization/pip-no-cache-dir
chore : use --no-cache-dir flag to pip in dockerfiles to save space
2021-09-23 09:58:04 +09:30
de2d72248e chore : use --no-cache-dir flag to pip in dockerfiles to save space
using --no-cache-dir flag in pip install ,make sure downloaded packages
by pip don't cached on system . This is a best practice which make sure
to fetch from repo instead of using local cached one . Further , in case
of Docker Containers , by restricting caching , we can reduce image size.
In term of stats , it depends upon the number of python packages
multiplied by their respective size . e.g for heavy packages with a lot
of dependencies it reduce a lot by don't caching pip packages.

Further , more detail information can be found at

https://medium.com/sciforce/strategies-of-docker-images-optimization-2ca9cc5719b6

Signed-off-by: Pratik Raj <rajpratik71@gmail.com>
2021-09-22 15:17:21 +05:30
5ece48500c Sort symbols by theme. Fixes https://github.com/GNS3/gns3-gui/issues/3230 2021-09-20 20:09:58 +09:30
5eb5658a74 Fix memory percentage left warning. Fixes #1966 2021-09-20 18:08:02 +09:30
3286348a95 Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232 2021-09-20 17:46:19 +09:30
67661616cf Development on v2.2.26dev1 2021-09-14 21:13:04 +09:30
6beab9433b Release v2.2.25 2021-09-14 19:20:10 +09:30
e59e051961 Merge branch 'master' into 2.2 2021-09-14 18:42:39 +09:30
6b3f703f94 Release web UI 2.2.25 2021-09-14 10:35:10 +02:00
d44a6756c1 Sync appliance files 2021-09-12 18:13:21 +09:30
6d10d92af2 Fix images_path -> symbols_path 2021-09-09 16:58:42 +09:30
a8aeb63c91 No need to find the mountpoint first for disk usage. 2021-09-09 16:58:02 +09:30
6f1feed265 Fix issue preventing to use custom nested symbols. Fixes #1969 2021-09-08 15:13:51 +09:30
e026c1e91f Merge pull request #1967 from GNS3/affinity-symbols
Update affinity symbols
2021-09-07 19:30:53 -07:00
40e565d968 Add comment for svgo 2021-09-08 11:33:04 +09:30
5162ef2e22 Updated affinity symbols 2021-09-08 01:08:01 +09:30
1923c37092 Shell script to update affinity symbols 2021-09-08 01:05:56 +09:30
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
99d7d0c769 Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
2021-09-05 21:53:36 +09:30
e42b8cb97c Merge pull request #1963 from GNS3/run-with-qemu-6.1
Qemu 6.1 support
2021-09-05 05:15:23 -07:00
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
bcf34d0ec8 Merge pull request #1962 from candlerb/candlerb/1955
Reinstate qemu-img rebase
2021-09-04 22:28:52 -07:00
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
a55c9a5c6a Return disk usage for partition that contains the default project directory. Fixes #1947 2021-09-03 12:04:10 +09:30
041d2bd2d6 Merge pull request #1953 from GNS3/revert-1951-disk-usage-all-partitions
Revert "List disk usage for all mount points"
2021-09-02 05:29:53 -07:00
51c6f3fa31 Revert "List disk usage for all mount points" 2021-09-02 21:59:09 +09:30
83cbcac01b Merge pull request #1951 from GNS3/disk-usage-all-partitions
List disk usage for all mount points
2021-09-01 23:21:19 -07:00
b1224ce9f6 Update schema description for disk_usage_percent. 2021-09-02 15:48:13 +09:30
a2367d3c04 List disk usage for all mount points. 2021-09-02 15:43:38 +09:30
45e0cbeca2 Merge branch 'master' into 2.2 2021-09-02 14:44:39 +09:30
1eaabd6b25 Merge remote-tracking branch 'origin/master' 2021-09-01 19:31:46 +09:30
4eb8491cfa Fix tests. Fixes #1950 2021-09-01 19:31:37 +09:30
b843f94068 Merge pull request #1880 from hrnciar/setuptools
Explicitly require setuptools, utils/get_resource.py imports pkg_resources
2021-08-29 22:06:35 -07:00
f71e7aac9f Merge branch 'master' into setuptools 2021-08-29 22:01:30 -07:00
945e3e3e8e Development on 2.2.25dev1 2021-08-25 21:23:19 +09:30
59a89c5f88 Release v2.2.24 2021-08-25 20:31:25 +09:30
78c2ded2aa Merge branch 'master' into 2.2 2021-08-25 20:08:26 +09:30
6ba40bd5fb Release web UI 2.2.24 2021-08-25 11:57:52 +02:00
6005e89181 Fix issue when searching for image with relative path. Fixes #1925 2021-08-25 17:23:21 +09:30
27bcb60580 Sync appliance files. 2021-08-24 21:21:18 +09:30
93711fe060 Update dependencies 2021-08-24 21:12:27 +09:30
363fdb7d10 Fix wrong error when NAT interface is not allowed. Fixes #1943 2021-08-24 20:40:06 +09:30
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
c4c71cc838 Fix error when updating a link style. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-08-24 11:35:33 +09:30
8aada49414 Some fixes for early support for Python3.10
The loop parameter has been removed from most of asyncio‘s high-level API following deprecation in Python 3.8.
2021-08-15 15:25:33 +09:30
496170b4e5 Early support for Python3.10 Fixes #1940 2021-08-15 15:09:48 +09:30
731152c75a Merge pull request #1938 from GNS3/dependabot/pip/pywin32-301
Bump pywin32 from 300 to 301
2021-08-09 17:59:35 -07:00
2897325f36 Bump pywin32 from 300 to 301
Bumps [pywin32](https://github.com/mhammond/pywin32) from 300 to 301.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/master/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

---
updated-dependencies:
- dependency-name: pywin32
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-09 20:45:46 +00:00
8c0899d086 Development on 2.2.24dev1 2021-08-05 21:16:10 +09:30
d5c73f4ba4 Release v2.2.23 2021-08-05 15:58:54 +09:30
77487e4fc3 Merge branch 'master' into 2.2 2021-08-05 15:54:16 +09:30
754f55b01b Sync appliance files. 2021-08-05 15:53:12 +09:30
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
6c36beb97f Release web UI 2.2.23 2021-08-04 10:59:50 +02:00
c231ae77e5 Merge pull request #1935 from rarylson/detect-kms-support
Update `remote-install.sh` with flag for KMS support and fix hostname inconsistencies
2021-08-01 15:28:42 -07:00
e5a76fcf44 Fix hostname inconsistencies during script execution
When `--with-iou` and `--with-openvpn` are both enabled, hostname
were updated in `/etc/hostname` but not on the running system (only
changed after reboot). So the old hostname were used in MOTD and
client OpenVPN config URL.
2021-08-01 17:49:27 -03:00
d926a713b9 Add option --without-kvm
Some cloud providers (example, AWS EC2 for non-metal instances) do not
support nested virtualization, as well as some hypervisors (example,
VirtualBox prior to 6.x, Hyper-V on AMD). Option `--without-kvm` can
be used to disable hardware acceleration in these scenarios. Otherwise,
user will receive error when trying to start Qemu-based devices.

Commit also: replace `enable_kvm` and `require_kvm` with newer config
options (`enable_hardware_acceleration` and
`require_hardware_acceleration`); and do some code refactors.

One can argue that, instead of prividing option `--without-kvm`, we
should check if system supports KVM and enable/disable hardware
acceleration accordingly. However, there is the case when the
hypervisor supports nested virtualization, but feature is just disabled.
The chosen approach for this case is to keep KVM enabled and let user
known (user will eventually receive an error) so user can fix it.
Otherwise, user might never know and suffer from performance
degradation.
2021-08-01 17:47:28 -03:00
1a24ebfc19 Add a reload server endpoint. Fixes #1926 2021-08-01 16:20:30 +09:30
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
214bef9d06 Merge pull request #1932 from GNS3/mac-address-generation
Change how to generate random MAC addresses
2021-07-27 16:51:29 +09:30
4646ce684f Handle -no-kvm param deprecated in Qemu >= v5.2 2021-07-27 16:34:51 +09:30
d2534d6fa0 Merge pull request #1933 from akrpic77/ak-fix-binary-websocket
Fix binary websocket access to the console
2021-07-26 20:42:54 +09:30
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
0ecea8ffbb Change how to generate random MAC addresses 2021-07-25 16:03:54 +09:30
6741d6d7a9 Merge pull request #1930 from mm1ke/fix_tests-gwaqIATV
setup.py: prevent installing tests directory
2021-07-13 08:20:13 +08:00
feace0c7dc setup.py: prevent installing tests directory 2021-07-12 19:04:30 +02:00
1ee3e14bd3 Support cloning of encrypted qcow2 base image files
Fixes #1921
2021-07-09 10:53:02 +01:00
cdedd53339 Fix VMware VM support on Linux and Windows. Fixes #1919 2021-06-14 13:16:11 +09:30
e78b5fa6d6 Fix typo 2021-06-12 15:20:55 +09:30
3524e22761 Development on 2.2.23dev1 2021-06-10 16:20:09 +09:30
10daab21a3 Release v2.2.22 2021-06-10 15:41:58 +09:30
22eb6f7d8c Sync appliance files. 2021-06-10 12:42:43 +09:30
d556c08def Revert "Skip test"
This reverts commit 8acb2fe3
2021-06-08 12:27:20 +09:30
8acb2fe37e Skip test 2021-06-08 12:18:27 +09:30
94acf60aef Merge pull request #1913 from GNS3/vmware-bigsur
Fix VMware VM support on macOS BigSur
2021-06-07 19:38:19 -07:00
c892cf371b Fix VMware support on macOS BigSur 2021-06-08 11:56:33 +09:30
bfd30f3547 Sync appliance files. 2021-06-07 15:01:45 +09:30
095a022033 Fix tests. Ref https://github.com/GNS3/gns3-gui/issues/2461 2021-06-07 14:23:52 +09:30
4e34ab8e4f Link style support. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-06-07 14:08:21 +09:30
8825831106 Upgrade dependencies 2021-06-07 13:46:06 +09:30
5da5cbd6d8 Merge branch 'master' into 2.2 2021-06-07 13:34:25 +09:30
08f540f417 Release web UI 2.2.22 2021-06-05 10:32:12 +02:00
1db1a892b4 Merge pull request #1910 from fabaff/patch-1
Set py-cpuinfo to 8.0.0
2021-06-04 04:49:26 -07:00
7ff72879dd Set py-cpuinfo to 8.0.0 2021-06-04 13:36:21 +02:00
48d0c6b183 Merge pull request #1905 from candlerb/candlerb/1904
Preserve auto_start/auto_open/auto_close when restoring snapshot
2021-06-04 02:06:38 -07:00
c051367d4b Preserve auto_start/auto_open/auto_close when restoring snapshot
Fixes #1904
2021-05-24 17:31:04 +01:00
150526b1ff Update setup.py
Fixes #1897
2021-05-16 17:44:13 +09:30
971e86d254 Fix uBridge errors for cloud nodes not visible in logs. Fixes #1895 2021-05-16 14:59:02 +09:30
6847e19847 Change method to prevent forbidden directory traversal. Fixes #1894 2021-05-16 14:44:38 +09:30
3a479d7ea6 Merge pull request #1900 from GNS3/prevent-directory-traversal
Prevent directory traversal
2021-05-15 04:09:04 -07:00
9a6978902d Fix tests. 2021-05-15 19:43:36 +09:30
6294ad9e76 Prevent directory traversal 2021-05-15 17:35:32 +09:30
2c938b2c19 Development on 2.2.22dev1 2021-05-10 23:44:40 +09:30
03b7d9191b Release v2.2.21 2021-05-10 22:42:46 +09:30
87c87ca3cb Sync appliance files. 2021-05-10 22:39:03 +09:30
dfba40fee2 Merge branch 'master' into 2.2 2021-05-10 22:34:59 +09:30
f576bedfaf Release web UI 2.2.21 2021-04-30 14:01:53 +02:00
4e61cc811e Improvements for get symbol dimensions endpoint. Ref #1885 2021-04-10 12:28:50 +09:30
c9c6a5a762 Merge pull request #1885 from GNS3/Create-endpoint-in-symbols-handler-to-get-symbol-dimensions
Create endpoint in symbols handler to get symbol dimensions #1884
2021-04-09 04:59:57 -07:00
e797ad1b9f Development on 2.2.21dev1 2021-04-09 13:50:20 +09:30
a50141fcbf Release v2.2.20 2021-04-09 12:14:38 +09:30
852151f836 Merge branch 'master' into 2.2 2021-04-09 12:06:01 +09:30
e5807e5a8c Sync appliance files. 2021-04-09 12:04:20 +09:30
87a26d5da0 Fix tests and comment problematic ones that rely on AsyncioMagicMock 2021-04-09 11:57:29 +09:30
30cbfe2154 Update picture.py 2021-04-08 23:29:46 +02:00
4bbf7c2ed2 Update symbol_handler.py 2021-04-08 21:27:05 +02:00
7a8c1e8f5d Release web UI 2.2.20 2021-04-08 13:30:59 +02:00
7bb5202bdb Sync appliance files. 2021-04-07 20:58:55 +09:30
082206a7db Fix packet capture with HTTPS remote server. Fixes #1882 2021-04-07 12:40:15 +09:30
360a819e91 Set PyQt5 version to 5.15.2 on Windows 2021-04-06 22:12:34 +09:30
adbef787c3 Fix typo 2021-04-06 18:21:59 +09:30
685963b85d Sync appliance files and remove old ones after sync with online repo. Fixes #1876 2021-04-06 17:38:11 +09:30
e614ed79f4 Upgrade dependencies 2021-04-06 13:57:00 +09:30
bb47cc87e7 Explicitly require setuptools, utils/get_resource.py imports pkg_resources 2021-03-31 11:58:49 +02:00
6120736c91 Fix export for missing files 2021-03-24 13:16:00 +10:30
7542b28793 Revert "Fix tests"
This reverts commit 4d0cb32b
2021-03-24 13:05:50 +10:30
4d0cb32bd0 Fix tests 2021-03-24 12:39:22 +10:30
055a78bade Fix issue when trying to export temporary Dynamips files. 2021-03-24 12:06:10 +10:30
fad52ea2fc Development on 2.2.20dev1 2021-03-05 16:48:09 +10:30
d8054c7cb4 Release v2.2.19 2021-03-05 14:51:03 +10:30
91570f475f Launch projects marked for auto open after SIGHUP is received 2021-03-05 14:47:20 +10:30
42cda3af2b Sync appliance files. 2021-03-05 14:46:20 +10:30
e6be6bc958 Merge branch 'master' into 2.2 2021-03-02 17:18:24 +10:30
b7f8fb283b Sync appliance files. 2021-03-02 17:09:28 +10:30
72d5b5e7cc Release web UI 2.2.19 2021-03-02 00:31:54 +01:00
8cce0eedee Fix console type error when creating Ethernet switch node. Fixes #1873 2021-03-01 13:55:52 +10:30
11c53c128e Sync Juniper vSRX appliance file. 2021-02-24 14:28:12 +10:30
17b56ac7cb Sync appliance files. 2021-02-24 14:08:13 +10:30
aca7344212 Upgrade Jinja to version 2.11.3. Fixes #1865 2021-02-17 17:23:04 +10:30
3c5bbe04dc Development on 2.2.19dev1 2021-02-16 20:44:58 +10:30
c213cae500 Release v2.2.18 2021-02-16 19:09:46 +10:30
1043be02a6 Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
2021-02-16 19:02:12 +10:30
56c25727b6 SIGHUP: remove projects with an empty project directory. 2021-02-16 17:00:59 +10:30
0b854ffceb Bump version to 2.2.18dev2 2021-02-16 16:35:26 +10:30
366e904698 Release web UI 2.2.18 2021-02-15 23:55:14 +01:00
16c84e23a9 Catch OSError exception in psutil. Fixes https://github.com/GNS3/gns3-gui/issues/3127 2021-02-15 15:57:24 +10:30
64f172fe20 Expose 'auto_open' and 'auto_start' properties in API when creating project. Fixes https://github.com/GNS3/gns3-gui/issues/3119 2021-02-15 15:16:19 +10:30
bb0206d7d2 Add mtools package information. Ref https://github.com/GNS3/gns3-gui/issues/3076 2021-02-14 14:55:37 +10:30
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
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
4c339eade1 Fix WinError 0 handling 2021-01-27 21:47:14 +10:30
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
0e6b97b27b Merge pull request #1856 from BrentBaccala/master
Allow cloned QEMU disk images to be resized before the node starts
2021-01-10 16:57:10 +10:00
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
bb51146e80 Merge pull request #1852 from joyme123/update-python-version
fix(readme): update python version from 3.5.3 to 3.6
2020-12-23 14:39:08 +10:30
e6944276a6 fix(readme): update python version from 3.5.3 to 3.6 2020-12-23 11:33:20 +08:00
704858fd8d Merge pull request #1847 from b-ehlers/QemuConfig
Add Qemu config disk
2020-12-14 14:22:25 +10:30
87ede50827 Development on 2.2.18dev1 2020-12-04 18:10:11 +10:30
24fe67f82b Release v2.2.17 2020-12-04 16:26:56 +10:30
18c878429f Merge branch 'master' into 2.2 2020-12-04 16:22:04 +10:30
6c3a070733 Close and remove projects deleted from disks after SIGHUP signal is received. 2020-12-04 16:17:28 +10:30
a157ef5a8a Release web UI 2.2.17 2020-12-04 02:59:13 +01:00
5244ae6d4c New config file options to configure the VNC console port range. 2020-12-03 18:04:42 +10:30
db47615d43 Merge pull request #1843 from tirkarthi/fix-asyncio-all-tasks-2.2
Use asyncio.all_tasks instead of deprecated method for Python 3.9 compatibility
2020-11-17 20:05:13 +10:30
603683e2c5 Use asyncio.all_tasks instead of deprecated method for Python 3.9 compatibility. 2020-11-17 06:30:47 +00:00
e45bc5aec1 Fix mcopy error messages 2020-11-05 15:00:44 +01:00
a3ee1d9ee6 Development on 2.2.17dev1 2020-11-05 16:59:58 +10:30
0e95e7e023 Release v2.2.16 2020-11-05 15:38:19 +10:30
1748250179 Sync appliance files. 2020-11-05 15:30:21 +10:30
c8ea22c651 Merge branch 'master' into 2.2 2020-11-05 15:05:05 +10:30
d16cb5ef89 Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069 2020-11-05 11:13:57 +10:30
004acdc271 Release web UI 2.2.16 2020-11-04 12:51:25 +01:00
e182f53d69 Fix wrong defaults for images_path, configs_path, appliances_path. Fixes #1829 2020-11-04 12:30:23 +10:30
aef8f0dff3 Use EnvironmentFile for Systemd service. Ref https://github.com/GNS3/gns3-gui/issues/3048 2020-11-02 18:23:41 +10:30
b6a021dabd Fix SSL support for controller and local compute. Fixes #1826 2020-10-27 23:25:19 +10:30
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
5d1fdceb98 Fix bug with application id allocation for IOU nodes. Fixes #3079 2020-10-27 19:41:24 +10:30
5743d47327 Set ident for merge. 2020-10-24 17:04:42 +10:30
ca69b01d11 Use origin/3.0 for merge into gh-pages branch. 2020-10-24 17:02:44 +10:30
dd785b61cf Work directly on gh-pages branch to generate the API documentation. 2020-10-24 16:59:55 +10:30
0f154e5f29 Fix invalid syntax for git merge 2020-10-24 16:45:53 +10:30
f9c4c82da6 Fix merge issues on gh-pages branch, second try. 2020-10-24 16:12:17 +10:30
3a136a46a1 Fix merge issues on gh-pages branch 2020-10-24 16:07:48 +10:30
a6a35e7c43 Fix publish_api_documentation.yml 2020-10-24 15:42:44 +10:30
163a867f00 Only automatically build API documentation for 3.0 branch and v3.* tags 2020-10-24 15:24:32 +10:30
d2b7c9bcbf Do not build API documentation on schedule. 2020-10-24 13:38:32 +10:30
fb8df1cc6b Fetch all history for all tags and branches in publish_api_documentation.yml 2020-10-24 13:13:19 +10:30
d063b3e39d Manual trigger API documentation publishing using workflow_dispatch 2020-10-24 13:08:10 +10:30
83fbd1f627 Fix GitHub Actions error: A branch or tag with the name '3' could not be found. 2020-10-24 12:16:05 +10:30
1aa6fe8535 Add publish_api_documentation.yml to master branch for scheduled event to work. 2020-10-23 23:03:50 +10:30
de2b9caeeb Use HDD disk image as startup QEMU config disk 2020-10-19 03:19:22 +02:00
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
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
88ab528977 Development on 2.2.16dev1 2020-10-07 16:30:03 +10:30
7d031e71a0 Release v2.2.15 2020-10-07 15:29:52 +10:30
c46c095fcb Sync appliance files. 2020-10-07 15:24:15 +10:30
e592b95639 Revert "Add info log to show where custom symbols are searched from."
This reverts commit 593e3795
2020-10-07 15:20:28 +10:30
593e379523 Add info log to show where custom symbols are searched from. 2020-10-07 15:19:09 +10:30
d451d3125e Fix symbol retrieval issue. Ref #1824 2020-10-07 11:48:11 +10:30
e014d36ad2 Skip tests not working on Windows. 2020-10-06 17:40:36 +10:30
c248764efb Fixes update() missing 2 required positional arguments: 'name' and 'value'. Fixes #1821 #1825 2020-10-06 17:08:51 +10:30
0259696872 Fix Hyper-V based GNS3 VM WMI issue. Fixes #1822 2020-10-06 16:42:50 +10:30
165ba4d8d5 Merge branch 'master' into 2.2 2020-10-06 12:30:08 +10:30
8049ab8b64 Release 2020.4.0-beta.1 2020-10-05 15:42:19 +02:00
2857cab94e Development on 2.2.15dev1 2020-09-15 06:49:11 +09:30
326841cd9e Release v2.2.14 2020-09-15 05:52:47 +09:30
dacc5ef9cd Merge branch 'master' into 2.2 2020-09-15 05:28:00 +09:30
dd1e4f655e Release 2020.3.0-beta.4 2020-09-14 18:35:17 +02:00
bf4550bf78 Fix tests. Ref https://github.com/GNS3/gns3-gui/issues/3047 2020-09-13 23:23:08 +09:30
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
919abdc052 Sync appliance files. 2020-09-12 23:08:38 +09:30
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
90ecefd455 Development on 2.2.14dev1 2020-09-05 04:26:16 +09:30
b4c7823696 Release v2.2.13 2020-09-04 23:13:28 +09:30
ffde704251 Merge branch 'master' into 2.2 2020-09-04 23:10:09 +09:30
8c00cd0a84 Release 2020.3.0-beta.3 2020-09-04 12:54:48 +02:00
2bf625e000 Fix issue when resuming Qemu VM. Fixes https://github.com/GNS3/gns3-gui/issues/3027 2020-09-04 18:02:21 +09:30
5305117a75 Sync appliance files. 2020-09-04 01:59:45 +09:30
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
01db2d2a86 Create config disk property false by default for Qemu templates
Ref https://github.com/GNS3/gns3-gui/issues/3035

(cherry picked from commit a2e884e315)
2020-08-17 12:45:57 +09:30
f2ddef855f Fix tests.
(cherry picked from commit 620d93634e)
2020-08-15 16:35:31 +09:30
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
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
9d3f7c79a2 Fix more tests
(cherry picked from commit 546982d1ea)
2020-08-13 17:18:45 +09:30
c684c554bf Fix tests
(cherry picked from commit 2ba6eac113)
2020-08-13 17:10:31 +09:30
97e731a7d9 Development on 2.2.13dev1 2020-08-07 21:12:46 +09:30
2c08166510 Release v2.2.12 2020-08-07 19:27:32 +09:30
940f004752 Sync appliance files 2020-08-07 19:24:01 +09:30
f083649021 Merge branch 'master' into 2.2 2020-08-07 19:03:50 +09:30
aeb82de78a Release 2020.3.0-beta.2 2020-08-07 09:57:52 +02:00
6761ae3445 Catch exception when psutil returns OSError 2020-08-06 13:37:27 +09:30
855a95de49 Fix tests. Fixes #1796 2020-07-30 14:58:22 +09:30
380e7a8a7f Downgrade psutil to version 5.6.7 2020-07-28 21:03:24 +09:30
89b5629cf5 Upgrade to psutil version 5.7.2 2020-07-21 15:49:57 +09:30
7471b31b0c Fix tests. 2020-07-17 15:34:00 +09:30
37c7202aa0 Use parent directory as working directory for project duplication and snapshots. Fixes https://github.com/GNS3/gns3-gui/issues/2909 2020-07-17 15:11:14 +09:30
99128e7713 Fix Key Error "vendor_id" is missing when configuring GNS3 VM with VirtualBox. Fixes https://github.com/GNS3/gns3-gui/issues/3018 2020-07-10 17:44:38 +09:30
c40651b53e Development on 2.2.12dev1 2020-07-09 21:37:03 +09:30
c4d2422fe2 Release v2.2.11 2020-07-09 20:37:10 +09:30
f08f7702d1 Sync appliance files. 2020-07-09 20:26:41 +09:30
b787cb3ace Merge branch 'master' into 2.2 2020-07-09 20:23:20 +09:30
62130c116a Fix crash when project sets 'auto_open' option and a remote GNS3 VM is used. Fixes https://github.com/GNS3/gns3-gui/issues/3014 2020-07-09 20:13:21 +09:30
1cbed45f16 Fix Dynamips ghost image support when project contains a space. Fixes #3015 2020-07-08 20:32:58 +09:30
29b31d72e9 Release 2020.3.0-beta.1 2020-07-07 14:05:24 +02:00
9acb2ceda1 QEMU config disk - improve error handling
(cherry picked from commit 068c31038f)
2020-07-03 11:31:17 +02:00
ea17cc2565 Fix issue when cannot skip slots for Dynamips routers. Fixes https://github.com/GNS3/gns3-gui/issues/3000 2020-06-29 20:00:30 +09:30
850c30f958 Merge branch 'master' into 2.2
# Conflicts:
#	tests/handlers/api/compute/test_dynamips.py
#	tests/handlers/api/compute/test_qemu.py
2020-06-29 18:44:46 +09:30
27da8458e8 Allow tests to be run by root. Fixes #1784 2020-06-29 18:43:35 +09:30
053828f3e8 QEMU config disk - init config disk in base class
(cherry picked from commit 2bbee15b18)
2020-06-28 16:35:39 +02:00
f747b3a880 QEMU config disk - notification of import/export errors
(cherry picked from commit 50c49cfedb)
2020-06-28 09:21:57 +02:00
8bd3e2346b Add Snyk badges. 2020-06-27 18:27:04 +09:30
74fc4fc75c Merge branch 'master' into 2.2 2020-06-26 21:30:27 +09:30
d0487b92c5 Remove pyup and pep8 script. 2020-06-26 19:20:40 +09:30
7924963276 Remove tox and update dependencies 2020-06-26 19:08:21 +09:30
d7083541b0 Remove Travis CI support and add GitHub Actions badge 2020-06-26 18:55:52 +09:30
af22fb8e98 Comment unused code that causes issue with flake8 2020-06-26 18:47:31 +09:30
03c4643a0f Merge remote-tracking branch 'origin/master' 2020-06-26 18:35:49 +09:30
4ba7131451 Add flake8 in dev-requirements.txt 2020-06-26 18:35:25 +09:30
3af71d8976 Set up GitHub Action for running tests 2020-06-26 18:31:58 +09:30
f361b9cb3e Merge pull request #1790 from GNS3/whitesource/configure
Configure WhiteSource for GitHub.com
2020-06-26 09:04:09 +08:00
12d3ba391f Add .whitesource configuration file 2020-06-26 01:01:48 +00:00
88ee9ae8b9 Merge pull request #1788 from GNS3/snyk-fix-4af38289923e34d863acdf00d9e8d3b3
[Snyk] Security upgrade psutil from 5.6.6 to 5.6.7
2020-06-24 21:08:26 +08:00
9665378f44 fix: requirements.txt to reduce vulnerabilities
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PSUTIL-483082
2020-06-24 13:06:58 +00:00
fd411e7855 Update classifiers in setup.py 2020-06-24 12:40:31 +09:30
7fd8fde020 Some fixes for tests. Ref #1784 2020-06-19 19:05:23 +09:30
51b76b1e30 Development on 2.2.11dev1 2020-06-18 19:06:00 +09:30
9a9e54c523 Release v2.2.10 2020-06-18 12:29:33 +09:30
13a6b4fe55 Merge branch 'master' into 2.2 2020-06-18 12:23:10 +09:30
3b4f4bfeda Sync appliances. 2020-06-18 12:20:42 +09:30
a018c8e1a8 Add pytest-aiohttp to tests_require in setup.py 2020-06-18 12:04:15 +09:30
79b93defbd Don't require hardware acceleration. Fixes #1780 2020-06-18 11:26:14 +09:30
750590d0db QEMU config disk - use disk interface of HD-D, fallback is HD-A
(cherry picked from commit b672900406)
2020-06-17 17:06:55 +02:00
72bef07f2b Release 2020.2.0-beta.5 2020-06-17 15:58:43 +02:00
3344cfb98a Merge pull request #1782 from GNS3/test-refactoring
Refactor tests
2020-06-17 11:13:13 +08:00
9d141baf22 Comment capsys tests 2020-06-16 21:27:49 +09:30
1a4c2ed069 Try to fix capsys issue with Python 3.8 (third try) 2020-06-16 21:19:51 +09:30
7fb554135f Try to fix capsys issue with Python 3.8 (second try) 2020-06-16 21:11:29 +09:30
241caa1ec7 Try to fix capsys issue with Python 3.8 2020-06-16 20:56:10 +09:30
d33584a2e4 More specific fix for Windows 2020-06-16 19:16:58 +09:30
438b1c056c Remove '\n' from for version strings for test_parse_arguments test. 2020-06-16 19:16:05 +09:30
ef23e74e9c Another fix for test_gns3vm.py 2020-06-16 19:09:49 +09:30
9ab8599e1e Fix other issues with tests. 2020-06-16 19:03:42 +09:30
d9ab29a9e0 Another fix for test_gns3vm.py 2020-06-16 18:52:07 +09:30
09e9382df1 Do not try to use ProactorEventLoop() on non Windows platforms. 2020-06-16 18:45:11 +09:30
8976384a56 Fix test_gns3vm.py 2020-06-16 18:37:32 +09:30
e4b7e46444 Fix tests for Windows 2020-06-16 01:57:16 -07:00
1d4c3a164d Use the ProactorEventLoop on Windows. 2020-06-16 14:08:17 +09:30
d3ea67da24 Refactor tests
* Use pytest-aiohttp
* Use the async def / await syntax.
* Fix tests to run with Python 3.8
2020-06-16 13:59:03 +09:30
f498ab06b4 Wait longer for x11 socket file to be created. Ref #1761 2020-06-10 20:37:13 +09:30
3940f013d4 Allow Hyper-V to run on AMD when Windows 10 build 19640 or later is detected. Fixes #1777 2020-06-10 15:21:58 +09:30
e1dab0dff4 Show error message if IPv6 is not enabled when using SPICE console. Fixes #1772 2020-06-09 15:06:41 +09:30
c6da24f267 Move jsonschema 2.6.0 requirement in build repository.
https://github.com/GNS3/gns3-server/issues/1751
https://github.com/GNS3/gns3-gui/issues/2849

This is to avoid the following error:

```
ERROR: Double requirement given: jsonschema==2.6.0 (from -r gns3-gui\win-requirements.txt (line 4)) (already in jsonschema==3.2.0 (from -r gns3-gui\requirements.txt (line 1)), name='jsonschema')
```
2020-06-07 13:07:16 +09:30
1f149769f2 Only use jsonschema 2.6.0 on Windows and macOS.
https://github.com/GNS3/gns3-server/issues/1751
https://github.com/GNS3/gns3-gui/issues/2849
2020-06-07 12:55:22 +09:30
ee70a6a27d Disable default integrations for sentry sdk. 2020-06-06 15:37:17 +09:30
297d1a0aae Remove unused bytes2human function 2020-06-05 13:10:01 +09:30
05e8fd3ff5 Development on 2.2.10dev1 2020-06-04 21:06:30 +09:30
c0c8151480 Release v2.2.9 2020-06-04 18:39:27 +09:30
ad7277c938 Merge branch 'master' into 2.2 2020-06-04 12:21:52 +09:30
0c2e4d2de9 Merge pull request #1768 from GNS3/replicate-network-connection-state
Support to activate/deactive network connection state replication in Qemu
2020-06-04 10:49:47 +08:00
1264680b51 Sync appliances. 2020-06-04 12:18:16 +09:30
a9697e925c Release 2020.2.0-beta.4 2020-06-03 19:15:56 +02:00
16a0e1c308 Merge pull request #1771 from eknoes/patch-1
Fix link for appliance JSON schema
2020-06-03 19:48:07 +08:00
f53d6f1b66 Fix link for appliance JSON schema 2020-06-03 13:46:48 +02:00
58a19af9ac Support to activate/deactive network connection state replication in Qemu. 2020-06-02 18:45:22 +09:30
a796f1e42e Possible fix for problem connecting to the GNS3 VM. Ref https://github.com/GNS3/gns3-gui/issues/2969 #1760 2020-06-01 19:40:53 +09:30
6e4187741c Merge pull request #1764 from GNS3/reset-mac-addresses
Option to reset MAC addresses when exporting or duplicating a project
2020-05-27 10:53:24 +08:00
8eefaa3f32 Option to reset or not all MAC addresses when exporting or duplicating a project. 2020-05-27 12:14:47 +09:30
5575657318 Fix tests. Ref #1754 2020-05-26 21:40:41 +09:30
69b816e21e Fix bug when changing properties for closed project. Fixes #1754 2020-05-26 18:34:20 +09:30
5c3bd589b9 Fix issues with crash reporting & bump version to 2.2.9dev2. Ref https://github.com/GNS3/gns3-server/issues/1758 2020-05-21 18:19:19 +09:30
1a20cbeefd Lock listing VMs. Ref #1755 2020-05-20 19:33:56 +09:30
da85d7b827 Try to fix error when listing Hyper-V VMs. Ref #1755 2020-05-20 19:19:04 +09:30
7002b026fc Catch VirtualBox errors when listing VMs. Fixes #1759 2020-05-20 18:42:50 +09:30
00f8a27404 Merge branch 'master' into 2.2
# Conflicts:
#	requirements.txt
2020-05-19 16:16:19 +09:30
5b59a09e8d Deprecate running with Python 3.5 2020-05-19 16:14:58 +09:30
16ca0fd915 aiocontextvars is only necessary for Python < 3.7 2020-05-19 16:04:14 +09:30
c63aad8eca Replace Raven by Sentry SDK. Fixes https://github.com/GNS3/gns3-server/issues/1758 2020-05-19 15:48:53 +09:30
54bab7445c Require setuptools>=17.1 in setup.py. Ref https://github.com/GNS3/gns3-server/issues/1751
This is to support environmental markers.
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#171
2020-05-08 12:34:57 +09:30
32a8bc54a1 Development on 2.2.9dev1 2020-05-07 23:10:19 +09:30
dadbacd8a4 Release v2.2.8 2020-05-07 18:10:57 +09:30
9032fd2a5c Merge branch 'master' into 2.2 2020-05-07 12:51:46 +09:30
eb0d4439a0 Release 2020.2.0-beta.3 2020-05-07 00:02:33 +02:00
91a1c5db49 Redirection to the bundled web-ui in the root handler 2020-05-06 16:31:18 +09:30
0a77233631 Fix root handler for web-ui 2020-05-06 15:38:16 +09:30
8df8b73c8f Merge branch 'master' into 2.2 2020-05-06 11:59:00 +09:30
6968ae9295 Release 2020.2.0-beta.2 2020-05-05 23:39:24 +02:00
1c9a43d071 Update appliance files. 2020-05-05 14:29:43 +09:30
a4bc696a5f Fix tests 2020-05-05 13:19:51 +09:30
10645a412b Default port set to 80 for server running in the GNS3 VM. Fixes #1737 2020-05-05 12:40:50 +09:30
1b008fb516 Sync appliance files. 2020-05-01 19:21:43 +09:30
45d135911f Fix tests. 2020-04-30 20:36:12 +09:30
3626bd5adb Make the Web UI the default page. Ref https://github.com/GNS3/gns3-server/issues/1737 2020-04-30 17:27:06 +09:30
6c322bbdde Fix tests. 2020-04-30 15:49:06 +09:30
02c0fa26e1 Support controller reloading for templates, appliances and projects. Ref #1743 2020-04-30 15:30:50 +09:30
99a238a0dc Update README Ref #1719 2020-04-29 14:57:15 +09:30
7b61724213 Remove unused variable. Ref #1744 2020-04-28 17:55:00 +09:30
72c6f5b484 Return exit status 1 if server fails to start. Fixes #1744 2020-04-28 14:39:28 +09:30
8536af33da Fix tests. 2020-04-28 13:49:05 +09:30
4ddd45f788 Merge branch 'master' into 2.2 2020-04-28 13:14:53 +09:30
53b1809dc3 Merge pull request #1742 from fadlytabrani/patch-1
Add clipboard support for TigerVnc
2020-04-27 20:34:41 -07:00
dd11d38338 Fix tests. 2020-04-27 22:48:42 +09:30
c0adc88592 Use Environmental Markers to force jsonschema version. Fixes https://github.com/GNS3/gns3-gui/issues/2849
Version 3.2.0 with Python >= 3.8
Version 2.6.0 with Python < 3.8
2020-04-27 12:54:17 +09:30
2c9afbb217 Merge remote-tracking branch 'origin/2.2' into 2.2 2020-04-27 12:43:28 +09:30
770841b3ee Use Environmental Markers to force jsonschema version 2.6.0 on Windows/macOS. Ref https://github.com/GNS3/gns3-gui/issues/2849 2020-04-27 12:43:07 +09:30
896e99d046 Merge pull request #1745 from b-ehlers/2.2
Implement a minimum interval between cpu_percent() calls. Fixes #1738
2020-04-19 21:16:06 -07:00
10bb259248 Implement a minimum interval between cpu_percent() calls. Fixes #1738 2020-04-19 20:42:46 +02:00
4ab100b716 Revert "Implement a minimum interval between psutil calls. Fixes #2262"
This reverts commit 3a09bd43dc.
2020-04-19 20:06:47 +02:00
347035a99b QEMU config disk - add missing config disk to image directory
(cherry picked from commit 2e0fba925b)
2020-04-16 11:07:56 +02:00
0db0f6256b QEMU config disk - get rid of mtoolsrc
(cherry picked from commit 450c6cddc7)
2020-04-15 20:50:59 +02:00
6fd60452c4 Add clipboard support for TigerVnc
There's currently no clipboard support for servers running on TigerVnc. TigerVnc clipboard support is provided by vncconfig that needs to be spawned for every display socket. The code changes above provides that functionality
2020-04-16 00:14:20 +10:00
a2d57f7c37 Merge pull request #1741 from candlerb/candlerb/snasphot
Correct typo "Snasphot"
2020-04-15 02:53:01 -07:00
fb153e3c71 Merge pull request #1740 from candlerb/candlerb/1739
Sort snapshots by (created_at, name)
2020-04-15 02:51:55 -07:00
69986b0d0f Correct typo "Snasphot" 2020-04-15 09:46:45 +01:00
06a6a0a332 Sort snapshots by (created_at, name)
Fixes #1739
2020-04-15 09:41:50 +01:00
2606c2d9a7 Merge branch '2.3'
# Conflicts:
#	gns3server/version.py
2020-04-08 19:39:35 +09:30
57067a99fa Development on 2.2.8dev1 2020-04-08 01:26:42 +09:30
087cba3903 Release v2.2.7 2020-04-08 00:03:13 +09:30
0a5995b11c Merge branch 'master' into 2.2 2020-04-07 23:58:50 +09:30
4f3fd65377 Release 2020.2.0-beta.1 2020-04-07 16:11:44 +02:00
99d9728360 QEMU config disk - preserve file timestamp on zip unpack
(cherry picked from commit 5c44268476)
2020-04-07 14:11:00 +02:00
6a1eef0627 QEMU config disk - initial implementation. Ref #2958
(cherry picked from commit b69965791d)
2020-04-06 12:56:00 +02:00
42eaf97e9f Fix uBrigde error popups when Docker image has stopped. Fixes https://github.com/GNS3/gns3-gui/issues/2957 2020-04-06 13:52:04 +09:30
55a5ce77ba Remove debug message 2020-04-06 11:51:59 +09:30
0922159686 Merge pull request #1731 from torstehu/fix-literal-warning
fix warning that you are explicitly comparing literals
2020-04-02 19:35:30 -07:00
f9ab4ffb96 fix warning that you are explicitly comparing literals 2020-04-02 21:26:23 +02:00
241937b80b Merge pull request #1715 from GNS3/websocket-console
Support for WebSocket consoles
2020-03-27 21:44:25 -07:00
b179ca88a7 Merge branch 'master' into 2.3
# Conflicts:
#	gns3server/version.py
2020-03-28 13:43:50 +10:30
4bed19f20a Release v2.2.6 2020-03-26 12:37:59 +10:30
4bc1e5e02e Merge branch 'master' into 2.2 2020-03-26 12:15:16 +10:30
d5b6fda270 Remove --local when starting Docker dev server. 2020-03-26 12:06:05 +10:30
720f52655e Release 2020.1.0-alpha.1 2020-03-25 00:43:14 +01:00
4df10d1427 Release 2019.2.0-alpha.11 2020-03-25 00:26:02 +01:00
aa83fcc7d1 Monitor ubrige processes. 2020-03-20 21:30:05 +10:30
afbbf7a524 Add Xvnc command to the VNC servers list. Fixes #172 2020-03-19 19:06:51 +10:30
b24bb42a66 Allow controller to reconnect to compute if communication is lost. Ref #1634 2020-03-19 18:02:01 +10:30
aa1b621c10 Improvement of support for docker USER directive. Fixes #1727. 2020-03-19 17:50:27 +10:30
6aed064a86 Fix cannot delete Dynamips router the content of the "usage" field. Fixes https://github.com/GNS3/gns3-gui/issues/2947 2020-03-16 16:38:23 +10:30
615cffd9ac Prevent locked drawings to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2948 2020-03-16 16:30:08 +10:30
868c39acfe Fix issues with empty project variables. Fixes https://github.com/GNS3/gns3-gui/issues/2941 2020-03-14 17:22:43 +10:30
392678e757 Upgrade psutil to version 5.6.6 due to CVE-2019-18874
https://github.com/advisories/GHSA-qfc5-mcwq-26q8
2020-03-14 15:47:12 +10:30
a62168fde0 Return array for controller statistics endpoint 2020-03-10 17:48:14 +10:30
3df348ac2a Server statistics implementation 2020-03-10 17:48:03 +10:30
d9c264ce77 Sync appliances. 2020-03-06 12:05:19 +10:30
6eb62ad179 Remove 'format=raw' from the Qemu options of the disk interfaces. Ref #1699 2020-02-24 20:06:45 +08:00
966e644c51 Merge pull request #1718 from GNS3/iou-application-id
Allocate application IDs for IOU nodes on the controller. Fixes #557
2020-02-10 15:27:50 +08:00
c5412bf970 Allocate application IDs for IOU nodes on the controller.
An application ID is used by IOU to generate its interface Mac addresses. They must be unique across all opened projects sharing the same computes to avoid Mac address collisions.
2020-02-10 15:20:49 +08:00
6cb87ef25d Sync appliance files. 2020-02-04 16:48:11 +08:00
3484a7dd3d Unprotected access for websocket consoles.
Ref https://github.com/GNS3/gns3-gui/issues/2883#issuecomment-580677552
2020-01-31 18:30:26 +08:00
c313475f68 Support for WebSocket consoles 2020-01-31 17:31:27 +08:00
e90262eb95 Require VirtualBox >= 6.0 on AMD and >= 6.1 on Intel processors (for GNS3 VM only). Fixes #1610 2020-01-26 18:23:17 +08:00
f7a6a0d466 Merge pull request #1714 from GNS3/qemu-changes
Recent Qemu versions support. Ref #1699
2020-01-25 16:05:03 +07:00
92ac250bc7 Add nvme disk interface and fix scsi disk interface for Qemu VMs. 2020-01-25 16:22:34 +08:00
667d50aa4a Disallow using "legacy networking mode" with Qemu >= 2.9.0 2020-01-24 19:06:24 +08:00
d796f8d112 Add latest Qemu nic models. 2020-01-24 19:05:46 +08:00
fb4ece5c67 Attempt to fix error when loading wmi module. Fixes #1712 2020-01-23 19:04:17 +08:00
ab4b391a02 Handle "aborted" state for VirtualBox VMs. Fixes #1702 2020-01-23 18:00:33 +08:00
dcdaffa056 Change how Hyper-V VMs are found. Ref #1612 2020-01-21 18:03:07 +08:00
39d44c8480 Merge pull request #1713 from GNS3/server-statistics
Server statistics implementation. Ref #1682
2020-01-17 04:17:01 -05:00
c3b2128fae Return array for controller statistics endpoint 2020-01-17 17:07:30 +08:00
941bed9605 Server statistics implementation 2020-01-17 16:50:17 +08:00
12a8831c44 Change version to 2.3.0dev1 on 2.3 branch 2020-01-16 18:06:51 +08:00
60cc5c7bb4 Development on 2.2.6dev1 2020-01-10 00:32:10 +08:00
6d66e4d5d5 Release v2.2.5 2020-01-09 23:52:40 +08:00
82b42fffef Development on 2.2.5dev1 2020-01-09 05:17:01 +08:00
fe8fd828b6 Release v2.2.4 2020-01-09 00:45:09 +08:00
e127dc302e Merge branch 'master' into 2.2 2020-01-08 13:29:21 +08:00
c52abd973e Sync documentation 2020-01-08 10:52:15 +08:00
114da9764b Fix tests. 2020-01-08 08:59:55 +08:00
0a87ee573c Accept a node name when creating a node from a template using the API. Fixes #1708 2020-01-08 08:19:33 +08:00
688b1ac0e4 Fix tests. 2020-01-08 07:10:33 +08:00
500b5b0b65 Fix tests. 2020-01-08 06:03:31 +08:00
e428865d19 Sync appliances. 2020-01-08 05:38:34 +08:00
98f5454ccb Disallow to modify a template if changes cannot be written on disk. Fixes #1695 2020-01-08 05:35:46 +08:00
a47fa83cec Fix renaming IOL hostname replaces %h only in a single place. Fixes #1707 2020-01-08 01:24:47 +08:00
e3e6790943 Merge pull request #1710 from CapnCheapo/patch-1
Add symbols_path
2020-01-04 13:31:01 -05:00
2a77841961 Add symbols_path
Added symbols_path so everybody knows that's a config option.
2020-01-04 10:29:06 -06:00
8fbd4602e8 Release 2019.2.0-alpha.11 2019-12-30 05:09:54 -08:00
825dc5996d Change the default UDP port range to be 20000 to 30000 in gns3_server.conf Ref #1271 2019-12-06 14:36:45 +08:00
26efdaf7b7 Fix tests 2019-12-05 14:06:46 +08:00
50b507f76c Fix cannot power on VirtualBox VM in saved state. Ref #1702 2019-12-05 13:46:02 +08:00
060871cc42 Development on 2.2.4dev1 2019-11-12 16:43:21 +08:00
9e4474de8d Release v2.2.3 2019-11-12 15:29:54 +08:00
9bda15236e Sync appliance files. 2019-11-12 15:23:37 +08:00
4daaea9cec Merge branch 'master' into 2.2 2019-11-12 15:20:12 +08:00
5e4e5c741b Merge pull request #1691 from JCDraaijer/master
Added workaround for #1690
2019-11-11 18:36:34 +08:00
7117b1fb65 Improved how the path to the config file is actually determined 2019-11-11 11:20:51 +01:00
992c60e3e0 Return HTTP status code 204 in API when project successfully closed. Fixes #1689 2019-11-11 15:32:57 +08:00
a98fc2d308 Python3.8 support. Ref https://github.com/GNS3/gns3-gui/issues/2895 2019-11-11 12:44:31 +08:00
2fd4b2cbc8 Make sure still support Python >= 3.5.3 2019-11-11 12:39:45 +08:00
3bd394b637 Added workaround for #1690. Added venv/ to .gitignore 2019-11-10 20:41:39 +01:00
7571c32563 Sync appliance files. 2019-11-08 18:24:22 +08:00
05b949930d Fix tests. 2019-11-08 17:25:59 +08:00
4075bbd703 Fix exception when adding VirtualBox VM. Fixes #1685. 2019-11-08 17:13:21 +08:00
3aba2a319c Set psutil to version 5.6.3 in requirements.txt 2019-11-08 10:44:17 +08:00
3a3ba2f54a Merge branch 'master' into 2.2 2019-11-08 10:42:44 +08:00
2fa2c715f5 Add LimitNOFILE=16384 to GNS3 service. Ref #1678 2019-11-07 16:28:47 +08:00
907207a140 Fix tests 2019-11-06 15:35:59 +08:00
539cf640d8 Change the default UDP port range to be 20000 to 30000. Ref #1271 2019-11-06 12:25:30 +08:00
6e7aeb1fdd Developement version on 2.2.3dev1 2019-11-04 19:45:18 +08:00
3245450e67 Release v2.2.2 2019-11-04 18:33:28 +08:00
f154ebeee9 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-11-04 18:29:06 +08:00
7608584833 Merge branch 'master' into 2.2 2019-11-04 18:28:42 +08:00
f69914565a Release 2019.2.0-alpha.10 2019-11-04 02:15:09 -08:00
60beba108a Merge pull request #1681 from GNS3/fix-pci-bridges
Fix how PCI bridges are created for Qemu VMs with greater than 32 interfaces. Fixes #1665
2019-11-04 17:00:13 +07:00
4a0fbe9b1b Release 2019.2.0-alpha.10 2019-11-04 01:29:58 -08:00
ff9bd59ef8 Fix how PCI bridges are created for Qemu VMs with greater than 32 interfaces. 2019-11-03 17:56:52 +08:00
4ab3f281c5 Fix broken support for cloned VirtualBox VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2889 2019-11-03 16:34:24 +08:00
7b507bf532 Sync appliance files. 2019-11-03 16:32:15 +08:00
459dd7b479 Handle builtin entry does not exist when adding node from template (new fix). 2019-11-02 16:23:45 +08:00
b8c70a3a8e Development on 2.2.2dev1 2019-11-01 18:43:36 +08:00
a267ecdea4 Merge branch 'master' into 2.2 2019-11-01 18:34:17 +08:00
7b8f0c2633 Release v2.2.1 2019-11-01 17:53:20 +08:00
89f97902f9 Handle builtin entry does not exist when adding node from template. 2019-11-01 17:48:25 +08:00
8dd2831890 Upgrade aiohttp to version 3.6.2 2019-11-01 17:18:30 +08:00
19723f06ed Sync appliance files 2019-11-01 17:07:43 +08:00
3f5ee94022 Merge remote-tracking branch 'origin/master' 2019-11-01 15:24:04 +08:00
85582554ac Let systemd directly supervises the GNS3 service. Fixes #1678 2019-11-01 15:23:52 +08:00
107dbbc949 Release 2019.2.0-alpha.10 2019-10-31 04:38:52 -07:00
2af9127879 Fix issue when linking to more than one NAT node with allowed_interface option enabled. Fixes #1671 2019-10-31 17:07:52 +08:00
5e9810d420 Prevent deleting a GNS3 project outside the project directory. Ref #1669 2019-10-30 16:25:06 +08:00
f3ad333a21 Do not send "console_type" property to computes for all builtin nodes excepting Ethernet switches. Fixes https://github.com/GNS3/gns3-gui/issues/2882 2019-10-29 18:06:09 +08:00
c8f7d789f7 Update API documentation 2019-10-23 22:00:00 +08:00
df9b40c1dc Fix QEMU link detection flaky on last port. Fixes #1666 2019-10-15 23:42:42 +08:00
f5c02368e6 Fix tests. 2019-10-09 17:47:22 +08:00
7cfd0d4d1d Use compatible shlex_quote to handle case where Windows needs double quotes around file names, not single quotes. Ref https://github.com/GNS3/gns3-gui/issues/2866 2019-10-09 17:02:30 +08:00
9d47050dff Use 0.0.0.0 by default for server host. Fixes https://github.com/GNS3/gns3-server/issues/1663 2019-10-09 16:35:42 +08:00
1b845225b2 Improvement to validate HTTP authentication config. Ref #1662 2019-10-09 15:56:20 +08:00
5a3f8b9a9b Use versioned config directory for profiles. Fixes #1664 2019-10-09 15:20:19 +08:00
56a4d3f8fd Fix tests. 2019-10-09 15:00:48 +08:00
6d1adea907 Enable nested hardware virtualization by default for GNS3 VM running in VirtualBox. Fixes #1377
No error is sent by VBoxManage is this feature is not available, for instance with Intel processors.
2019-10-09 14:50:00 +08:00
2d777cac13 Set default host to "localhost". Fixes https://github.com/GNS3/gns3-server/issues/1663 2019-10-08 18:28:10 +08:00
6ae7ef8a2e Improve process to get guest IP address from GNS3 VM running in VMware workstation/player. Ref https://github.com/GNS3/gns3-gui/issues/2866 2019-10-08 17:58:27 +08:00
09d05accc1 Fix tests. Ref #1659 2019-10-08 17:34:16 +08:00
2f57bd58c0 Fix error with console type in Ethernet switch schema. Fixes #1659 2019-10-08 17:16:17 +08:00
51a92b46dd Bump version to 2.2.1dev1 2019-10-08 16:05:36 +08:00
7c437adbef Release v2.2.0 2019-09-30 16:24:26 +08:00
fef1d01e26 Merge branch 'master' into 2.2 2019-09-30 16:20:19 +08:00
af3ae0df24 Merge branch '2.1'
# Conflicts:
#	gns3server/compute/dynamips/nodes/atm_switch.py
2019-09-30 16:11:26 +08:00
87390274cc Add debug message for what directory is checked for Qemu binaries. Ref #1655 2019-09-30 15:54:57 +08:00
f424e2dfd5 Sync appliance files. 2019-09-30 11:59:41 +08:00
4031fd0c18 Release 2019.2.0-alpha.8 2019-09-27 01:57:03 -07:00
1c678e296e Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/version.py
2019-09-24 14:07:18 +08:00
958ec94f13 Sync appliance files. 2019-09-24 14:06:26 +08:00
a9fd990904 Bump version to 2.2.0dev18 2019-09-24 14:02:36 +08:00
9d18ac1e3e Merge branch 'master' into 2.2 2019-09-24 13:56:16 +08:00
2cfac30810 Fix single quote is not closed. Fixes #1654 2019-09-17 18:54:18 +07:00
67e70c4628 Fix wrong Dynamips command used to rename an ATM switch. Fixes #1651 2019-09-11 15:06:08 +07:00
8b71e9b20c Release v2.2.0rc5 2019-09-09 15:06:14 +07:00
7cd9bb6ca6 Merge branch '2.1' into 2.2 2019-09-09 15:02:06 +07:00
6ec5683c95 Merge pull request #1649 from neffs/fix-sata
Don't specify the PCI bus for AHCI device
2019-09-05 17:37:13 +07:00
2e41328ae9 Merge branch 'master' into fix-sata 2019-09-05 17:36:53 +07:00
918ba21f1f Merge pull request #1648 from neffs/master
Add id value to all qemu drives
2019-09-05 17:33:05 +07:00
077432ff2f Add qemu drive id to tests 2019-09-03 16:45:50 +02:00
8105b68d52 Don't specify the PCI bus for AHCI device
pci.X is not always defined, let qemu handle this.

I think PCI buses only exist if PCI network adapters are defined, this
is not the case with virtio.
2019-09-03 16:03:27 +02:00
906f29d5fc Add id value to all qemu drives
A fixed id doesn't hurt and now we can select Disk Interface=none in
GNS3 and e.g. attach the volume as a USB thumb drive with -device
usb-storage,drive=drive0,...
2019-09-03 15:54:51 +02:00
5d4de9d0ba Fix AttributeError: Cannot set attribute '%s'. Fixes #1646 2019-08-31 14:43:35 +07:00
4470519d9f Release v2.2.0rc4 2019-08-30 15:23:32 +07:00
941857470d Release 2019.2.0-alpha.7 2019-08-29 09:39:26 -07:00
e64ed839f5 Check that vcpus value for GNS3 VM is an integer. Fixes #1636 2019-08-27 18:01:46 +07:00
647dde1bb4 Make x,y optional for creating links via API. Fixes #1630 2019-08-26 19:51:03 +07:00
63c0bfe46e Sync appliance files. 2019-08-26 17:08:33 +07:00
2eddc463e7 Merge pull request #1643 from GNS3/allow-none-compute_id-templates
Allow "none" for compute_id in templates. Fixes #1638
2019-08-26 17:07:07 +07:00
fb288db50a Set default_name_format for some builtin nodes. 2019-08-26 17:00:18 +07:00
55a9abfcea Allow "none" for compute_id in templates. 2019-08-26 16:48:03 +07:00
dac2cf4089 Bump version to 2.2.0dev17 2019-08-23 18:20:44 +07:00
3b0bb8df4e Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/version.py
2019-08-20 17:34:47 +07:00
9559748f9d Bump version to 2.2.0dev16 2019-08-20 17:33:48 +07:00
4656521987 Release v2.2.0rc3 2019-08-11 19:14:56 -07:00
2feec666a2 Revert to jsonschema 2.6.0 due to packaging problem. 2019-08-11 19:11:40 -07:00
86772d9127 Release v2.2.0rc2 2019-08-10 12:04:19 -05:00
fc182e932a Fix typo with jsonschema version 3.2.0 -> 3.0.2 2019-08-10 11:55:47 -05:00
27d447c926 Release v2.2.0rc1 2019-08-10 11:42:10 -05:00
df9f717d7c Sync appliance files 2019-08-10 11:35:32 -05:00
703dca54ab Bump jsonschema to version 3.0.2 2019-08-10 11:31:08 -05:00
39da0f3904 List Hyper-V VMs on non-english OSes. Fixes #1612 2019-07-30 15:01:17 -02:30
6a7d47ce97 Merge branch '2.2' 2019-07-12 12:07:44 +02:00
7c07d0b4bd Add missing default values in Cloud schema. 2019-07-12 11:32:55 +02:00
6626bf37a6 Development on 2.2.0dev15 2019-07-11 17:34:56 +02:00
f7376ee382 Release v2.2.0b4 2019-07-11 16:58:35 +02:00
3172985a21 Sync appliance files. 2019-07-11 16:55:13 +02:00
dcf94a5852 Requires a project to be opened to start/stop/suspend all nodes. Fixes #1609 2019-07-10 17:07:13 +02:00
cba39a3744 Fix issue when starting GNS3 VM for Hyper-V 2019-07-10 15:56:54 +02:00
03c7744efd Set defaults for custom cloud nodes. 2019-07-10 15:51:06 +02:00
b0f74c2a5e Fix issue when trying to rename a Dynamips node that is already powered on. Fixes #2824 2019-07-10 15:40:11 +02:00
63fb82a89d Remove deprecated Qemu parameter to run legacy ASA VMs. Fixes #2827 2019-07-10 11:33:04 +02:00
aad74dbcb9 Add debug message when searching for an image. Ref https://github.com/GNS3/gns3-gui/issues/2828 2019-07-10 11:16:50 +02:00
c5be58b016 Merge pull request #1607 from fcolista/patch-1
Update README.rst
2019-07-04 19:37:05 +02:00
507090d69d Fix base href for web ui 2019-07-04 10:37:14 +02:00
ed27a46dee Release 2019.2.0-alpha.5 2019-07-04 00:20:54 -07:00
8d02405e88 Fix redirection to web-ui bundled server 2019-07-04 08:59:33 +02:00
a17034fc6d Update README.rst 2019-07-03 20:30:10 +02:00
7adf5201f0 Release 2019.2.0-alpha.4 2019-07-03 06:08:46 -07:00
0df3322b6c Development on 2.2.0dev14 2019-06-15 16:38:06 +02:00
43c7acb0cf Release v2.2.0b3 2019-06-15 15:39:32 +02:00
239d9e6fd6 Merge pull request #1599 from GNS3/cdrom-refresh
Refresh mounted media after ISO switch
2019-06-15 15:26:48 +02:00
9e54ab77d0 Merge 2.1 into 2.2 branch. 2019-06-15 15:26:20 +02:00
5dbedb744e Sync appliance files. 2019-06-15 15:24:45 +02:00
7a463676cd Eject cdrom first before changing an image. Use 'force' when ejecting. 2019-06-15 15:20:21 +02:00
b0700b8787 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-06-15 12:53:55 +02:00
06ce0868ec Fix template migration issues from GUI to controller. Fixes https://github.com/GNS3/gns3-gui/issues/2803 2019-06-15 12:52:50 +02:00
7c33d3510a Development on 2.1.22dev1 2019-06-14 19:42:18 +02:00
cb1f73e9a2 Release v2.1.21 2019-06-14 10:47:07 +02:00
2476581dca Change uBridge debug level to '1' when debugging is enabled. Fixes #1598 2019-06-12 14:35:13 +02:00
b7af2e4d5c Refresh mounted media after ISO switch. 2019-06-12 14:23:03 +02:00
b002812907 Merge pull request #1597 from kazkansouh/2.2-fix-1595-volumes
Fix for issue #1595
2019-06-05 12:10:34 +02:00
af78031322 Resolve conflicts in docker volumes instead of error. Fixes https://github.com/GNS3/gns3-server/issues/1595 2019-06-05 10:40:40 +01:00
61c87e57a4 Use console port to allocate guest CID (console ID) for Qemu VMs. Fixes #2804 2019-06-05 11:25:35 +02:00
9cce4de190 %guest-cid% variable implementation for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2804 2019-06-04 18:00:44 +02:00
54d50b2ef4 Set hkp protocol for keyserver in remote install script. Fixes #1596 2019-06-04 15:10:34 +02:00
9e518412b3 Set keyserver port to 80 in remote install script. Fixes #1596 2019-06-04 15:03:28 +02:00
e9154f6af6 Fix KeyError: 'usage' exception when configuring IOU template. Fixes https://github.com/GNS3/gns3-gui/issues/2806 2019-05-31 08:41:44 +02:00
dd05884096 Development on 2.2.0dev13 2019-05-29 17:52:38 +07:00
e58f86e204 Release v2.2.0b2 2019-05-29 17:16:59 +07:00
a6bc6bc79c Update appliance files. 2019-05-29 16:52:50 +07:00
336b77e28a Merging 2.1 into 2.2 branch 2019-05-29 16:50:36 +07:00
3dbce3fa40 Development on 2.1.21dev1 2019-05-29 16:37:42 +07:00
053a16960c Release v2.1.20 2019-05-29 15:44:25 +07:00
a860243531 Ignore Unicode errors when reading base config file contents. 2019-05-29 15:43:17 +07:00
99886d3f0c Development on 2.1.20dev1 2019-05-28 16:33:43 +07:00
6fb613dcff Release v2.1.19 2019-05-28 15:23:35 +07:00
4f803ff162 Sync appliances. 2019-05-28 10:37:43 +07:00
591d4f29ff Fix minor bugs with log rotation support. Ref #1586 2019-05-28 10:34:27 +07:00
87d85c1947 Remove yarl from requirements.txt since it is installed by aiohttp. 2019-05-27 18:10:46 +07:00
54c4bd31d4 Remove setup require since we do not use environment makers yet. 2019-05-27 17:57:37 +07:00
907807dc53 Drop typing dependency. 2019-05-27 17:38:16 +07:00
5cbfafbeb2 Support snapshots for portable projects. Fixes https://github.com/GNS3/gns3-gui/issues/2792 2019-05-27 15:35:47 +07:00
6229fadace Fix topology test 2019-05-26 15:55:29 +07:00
81a48df9bb Update the GNS3 version in topology file if converted. Ref https://github.com/GNS3/gns3-gui/issues/2798 2019-05-26 15:44:55 +07:00
2289fd4a2f Set log max size to 10MB. Ref #1586 2019-05-25 21:33:47 +07:00
4ac999461b Support for log rotation and compression. Fixes #1586 2019-05-25 18:23:51 +07:00
3b87a19979 Do not start QEMU console if QEMU process is not started. Fixes https://github.com/GNS3/gns3-gui/issues/2712 2019-05-25 15:31:35 +07:00
5a62277819 Merging 2.2 into master 2019-05-24 15:27:07 +07:00
a86f881d83 Avoid sending warning message all the time for Ethernet switch. 2019-05-23 15:57:08 +07:00
457ae4783f Development on 2.1.19dev1 2019-05-23 14:37:37 +07:00
878987a26e Release v2.1.18 2019-05-22 16:13:28 +07:00
40d7ae6866 Support to include snapshots in portable projects. 2019-05-22 14:35:37 +07:00
39f6f4edd5 Development on 2.2.0dev12 2019-05-21 19:16:19 +07:00
5b3be13e73 Release v2.2.0b1 2019-05-21 15:26:54 +07:00
16908df8b2 Upgrade GNS3 Web UI to v2019.2.0-alpha.3 2019-05-20 14:23:25 +02:00
c357d52ba4 Revert "Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3"
Ref https://github.com/GNS3/gns3-server/issues/1583
Ref https://github.com/GNS3/gns3-server/issues/1592

This reverts commit 351ed64de9.
2019-05-20 17:23:26 +07:00
44a142e91d Fix tests 2019-05-20 11:02:29 +07:00
28004479fd Change behavior when an IOU license is verified. Fixes https://github.com/GNS3/gns3-server/issues/1555 2019-05-20 10:51:24 +07:00
e8b8554c1a Fix Qemu VM state support after closing a project and check for JSON data returned by qemu-img. Fixes #1591 2019-05-19 17:59:00 +07:00
424db843ca Fix Docker extra volumes support 2019-05-19 14:26:03 +07:00
0c6749f62b Update Dockerfile to Ubuntu 18.04 2019-05-18 20:19:34 +07:00
cdae1f9e00 Merge pull request #1584 from kazkansouh/2.2-docker-volumes
Custom persistent docker volumes
2019-05-18 20:17:11 +07:00
cf0cc8bb87 Ensure Qemu monitor commands are executed. Ref #1582. 2019-05-18 19:31:41 +07:00
c41c01b95f Fix tests. 2019-05-18 19:19:27 +07:00
2340823f53 Update appliance files. 2019-05-18 15:45:28 +07:00
470cea327f Fix console variable replacement issue. 2019-05-18 14:31:21 +07:00
6edcbd0461 Set console type to "none" by default for Ethernet switches and add a warning if trying to use "telnet". Fixes https://github.com/GNS3/gns3-gui/issues/2776 2019-05-18 14:28:20 +07:00
a7e449ff0e Bump version to 2.2.0dev11 2019-05-18 14:11:07 +07:00
e763980dbe Add %console-port% variable for additional Qemu options. Fixes https://github.com/GNS3/gns3-gui/issues/2786 2019-05-18 13:51:00 +07:00
f1ae3b3778 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-05-18 13:45:57 +07:00
9400c49b82 Merge 2.1 branch into 2.2 2019-05-18 13:45:39 +07:00
773bad811a Fix invalid reStructuredText for long description in setup.py 2019-05-17 16:14:19 +07:00
6b54cc27da Release v2.1.17 2019-05-17 15:10:28 +07:00
351ed64de9 Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3
This is to fix build issue for Ubuntu 19.04 package on Launchpad.
Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774
2019-05-17 09:56:16 +07:00
81ddb0cfe6 Impoved docker volumes user input validation 2019-04-22 12:46:28 +01:00
0c19bc8d43 Support for additional persistent docker volumes to be specified within appliance configuration 2019-04-22 10:26:41 +01:00
264f9da576 Merge pull request #1580 from GNS3/pyup-update-pytest-4.4.0-to-4.4.1
Update pytest to 4.4.1
2019-04-16 20:05:10 +07:00
30a9ea8675 Update pytest from 4.4.0 to 4.4.1 2019-04-16 03:34:57 +02:00
7543d7587c Release v2.2.0a5 2019-04-15 17:05:20 +07:00
f5ebc6a29a Merge 2.1 into 2.2 2019-04-15 15:54:08 +07:00
f41158173b Development on 2.1.17dev1 2019-04-15 12:41:40 +07:00
cb5dc36987 Release v2.1.16 2019-04-15 12:00:18 +07:00
fb470dd4b5 Back to the major.minor version for config files. Ref https://github.com/GNS3/gns3-gui/issues/2756 2019-04-14 21:31:40 +07:00
6dbb992513 Fix templates missing after server restart. Fixes https://github.com/GNS3/gns3-gui/issues/2769 2019-04-14 20:39:55 +07:00
e962717448 Fix bug when GNS3 VM were not saved. Fix tests. 2019-04-14 17:42:20 +07:00
6dc58b28fd Some adjustments with compute WebSocket handling. Ref https://github.com/GNS3/gns3-server/issues/1564 2019-04-14 16:48:12 +07:00
6db8cecda5 Merge 2.1 into 2.2 2019-04-13 18:39:06 +07:00
cc1980ac1c Fix broken embedded console for Ethernet switch. Fixes #1574 2019-04-11 17:57:47 +07:00
2af9c9c8ec Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764 2019-04-10 15:43:51 +07:00
8cd66cfc02 Remove old unused argument option. Fixes #1569 2019-04-09 19:26:07 +07:00
4d222ddc0a Bump version to 2.2.0dev10 2019-04-09 19:20:21 +07:00
5c884702e5 Development on 2.2.0dev9 2019-04-05 22:01:35 +08:00
62c5aa2948 Release v2.2.0a4 2019-04-05 19:10:04 +08:00
474e184646 Merge pull request #1573 from kazkansouh/2.2-docker-user
Support for docker images that set the USER directive (+test coverage)
2019-04-05 19:00:22 +08:00
7a55ba3c1e Use the full version number for path to config files. Ref https://github.com/GNS3/gns3-gui/issues/2756 2019-04-05 18:44:31 +08:00
6df93d4db0 Updated tests for setting docker user 2019-04-05 11:06:35 +01:00
7c3a38d379 Support for docker images that set the USER directive. Changes the
docker user to root for the init script to configure the network,
then drops to the configured user (or root if one is not defined)
for continuing booting the image.
2019-04-05 08:51:57 +01:00
dde01317e0 Fix packet filter not working for Ethernet switch and Ethernet hub. Fixes https://github.com/GNS3/gns3-gui/issues/2754 2019-04-02 01:12:06 +07:00
a17119187b Fix remote packet capture for Dynamips. 2019-04-01 20:58:18 +07:00
4cc5dbc228 Fix remote packet capture and make sure packet capture is stopped when deleting an NIO. Fixes https://github.com/GNS3/gns3-gui/issues/2753 2019-04-01 19:47:31 +07:00
f01706e9e6 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-04-01 15:53:59 +07:00
c075baa05b Store config files in version specific location 2019-04-01 15:53:39 +07:00
de2cbf4258 Merge pull request #1565 from GNS3/pyup-update-pytest-4.3.1-to-4.4.0
Update pytest to 4.4.0
2019-04-01 12:00:59 +07:00
bc71fb6933 Update pytest from 4.3.1 to 4.4.0 2019-04-01 06:54:28 +02:00
21bed54768 Fix opening previously saved 2.1 project grid overlapping. Fixes #2734 2019-03-31 16:48:08 +07:00
d50614aed7 Fix empty theme name in symbol selection dialog. Fixes https://github.com/GNS3/gns3-gui/issues/2751 2019-03-30 16:20:21 +07:00
22854f1baa Refresh documentation 2019-03-30 15:56:26 +07:00
5045c6cfbf Update documentation 2019-03-28 17:24:02 +08:00
6a6cabc2d2 Bundle v2019.1.0-alpha.3 web-ui 2019-03-27 12:34:45 +01:00
541101741b Development on 2.2.0dev8 2019-03-25 23:44:19 +08:00
2b786e40b9 Release v2.2.0a3 2019-03-25 19:35:22 +08:00
2bb1b61526 Fix traceback when starting packet capture on builtin nodes. Fixes https://github.com/GNS3/gns3-gui/issues/2743 2019-03-25 16:57:36 +08:00
106df1d4ab Load v2019.1.0-alpha.2 of WebUI 2019-03-22 14:17:40 +01:00
06a6abe687 Fetch tags for update-bundled-web-ui.sh 2019-03-22 14:12:51 +01:00
3f4bdfef11 Fix mimetype for javascript, #1559 2019-03-22 08:35:27 +01:00
cbb6eccad8 Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2019-03-21 10:39:55 +01:00
9edbd27b4f Serve WebUI via get_resource for freezed app 2019-03-21 10:39:49 +01:00
645031ee15 Development on 2.1.16dev1 2019-03-21 13:56:11 +08:00
c70b344133 Release v2.1.15 2019-03-21 11:41:44 +08:00
343f223a83 Fix tests after deactivating the embedded shell for Ethernet switch. Ref #1424 #1556 2019-03-20 17:04:02 +08:00
1f1d93d078 Deactivate the embedded shell for Ethernet switch. Ref #1424 #1556 2019-03-20 16:23:30 +08:00
dd211bce52 Fix VBoxManage fails if VM has specific special characters in name. Fixes #2739 2019-03-18 23:29:18 +07:00
e00bde51da Merge branch '2.1' into 2.2 2019-03-18 19:26:46 +07:00
e291ec1eb9 Fix IOU symlink issue on remote servers. 2019-03-18 18:11:16 +07:00
3daa3f450b Fix IOU symlink issue on remote servers. 2019-03-18 18:05:40 +07:00
8e8985c69f Fix vcpus configuration for GNS3 VM on VMware. Ref #2738. 2019-03-18 17:53:14 +07:00
03401a477e Fix issue when images are not uploaded from appliance wizard. Ref https://github.com/GNS3/gns3-gui/issues/2738 2019-03-18 15:33:37 +07:00
4e396ac690 Save the GNS3 VM settings even if the GNS3 VM cannot be stopped. 2019-03-18 15:30:59 +07:00
3a73d01547 Fix exception when emitting event from controller. Ref https://github.com/GNS3/gns3-gui/issues/2737 2019-03-15 13:14:55 +07:00
23b568678a Development on 2.2.0dev7 2019-03-14 23:27:11 +07:00
8ad632976f Release v2.2.0a2 2019-03-14 17:09:53 +07:00
b8bf2bf465 Web-UI v2019.1.0-alpha.1 2019-03-14 10:44:09 +01:00
55be74f93c Update docs for update-bundled-web-ui.sh 2019-03-14 10:33:35 +01:00
7d591b0228 Fix issue when loading and quickly closing a project and opening it again. Fixes #1501. 2019-03-14 15:15:27 +07:00
a059e6b943 Disable unreliable nested virtualization check. 2019-03-13 23:13:54 +07:00
c6990dfeee Merge remote-tracking branch 'origin/2.2' into 2.2 2019-03-13 12:56:50 +07:00
aff67b324f Fix issue not checking build number on Windows. 2019-03-13 12:56:33 +07:00
f7e90a7d7f Merge pull request #1550 from GNS3/pyup-update-pytest-4.3.0-to-4.3.1
Update pytest to 4.3.1
2019-03-13 02:21:49 +07:00
ed6b1d909d Update pytest from 4.3.0 to 4.3.1 2019-03-12 20:16:34 +01:00
010d65114d Hyper-V with nested virtualization is only supported on Windows 10 Anniversary Update or later. 2019-03-13 02:15:58 +07:00
3dcb7799e3 Use accurate info to detect Windows version. 2019-03-12 22:40:37 +07:00
aaaeb410d5 Fix exception when loading and quickly closing a project. 2019-03-12 21:50:09 +07:00
d506962bdb Debugging why sys.getwindowsversion() does not work with frozen app. 2019-03-12 21:18:46 +07:00
4d9728b6f5 Correctly rename symbol. 2019-03-12 18:54:05 +07:00
ff9048b5a8 Revert "Rename symbol."
This reverts commit 6c96be2acc.
2019-03-12 18:53:02 +07:00
6c96be2acc Rename symbol. 2019-03-12 18:42:54 +07:00
21afaf31f9 Merge pull request #1549 from GNS3/symbol-management-refactoring
Symbol management refactoring
2019-03-12 18:21:30 +07:00
8e5ac228d5 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-03-12 18:17:41 +07:00
94f63f54ba Change Hyper-V requirement checks. 2019-03-12 18:17:31 +07:00
cf91e904f7 Early support for symbol themes. 2019-03-12 18:13:33 +07:00
767bb770ca Re-order handlers in order to prevent CORS 2019-03-11 16:16:10 +01:00
bae3fb84b9 Download custom appliance symbols from GitHub
Fix symbol cache issue. Ref https://github.com/GNS3/gns3-gui/issues/2671
Fix temporary directory for symbols was not deleted
Fix temporary appliance file was not deleted
2019-03-11 16:55:16 +07:00
889d29ec55 Update appliances. 2019-03-11 09:48:54 +07:00
a221678448 Merge pull request #1545 from steffann/patch-1
Add vMX 17.4 and 18.4
2019-03-09 17:48:46 +07:00
20886bdd51 Update juniper-vmx-vfp.gns3a 2019-03-08 23:50:55 +01:00
089148e451 Update juniper-vmx-vcp.gns3a 2019-03-08 23:39:59 +01:00
d3ec2a7275 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-03-07 18:55:59 +07:00
2d01ef489b Option to export snapshots. 2019-03-07 18:55:38 +07:00
d64d7de541 Support tags versioned WebUI when bundling 2019-03-07 11:56:15 +01:00
372017f467 Merge pull request #1537 from GNS3/import-export-refactoring
Project import/export refactoring. Fixes #1349
2019-03-07 17:38:56 +07:00
826f6b2d57 Fix include images test. 2019-03-07 17:17:07 +07:00
0ae66a2608 Support selecting a compression type when exporting a project. 2019-03-07 17:05:32 +07:00
380224dca1 Change how VPCS executable is searched. 2019-03-06 23:15:05 +07:00
af80b0bb6e Use aiofiles where relevant. 2019-03-06 23:00:01 +07:00
b0df7ecabf Merge branch '2.2' into import-export-refactoring 2019-03-05 17:29:01 +07:00
4c83fc1243 Update paths for binaries moved to the MacOS directory in GNS3.app 2019-03-04 16:07:04 +07:00
69ba0ccf77 Bump version to 2.2.0dev2 2019-03-04 14:48:57 +07:00
0681c296a7 Merge pull request #1541 from GNS3/lock-unlock-items
Refactoring for locking/unlocking items
2019-03-02 16:44:28 +07:00
3f679bd106 Locked state should not be used when duplicating a node. 2019-03-02 16:39:05 +07:00
724eda1f35 Handle locking/unlocking items independently from the layer position. 2019-03-02 16:26:40 +07:00
3f7c4c0474 Update qemu_vm.py 2019-03-01 23:40:32 +07:00
5b6011a248 Stay with jsonschema 2.6.0 2019-03-01 17:26:23 +07:00
80eb06f67c Merge 2.1 into 2.2 2019-03-01 17:23:49 +07:00
9132ba8d05 Remove zipstream from tests. 2019-02-28 23:25:05 +07:00
85ea1cf7a9 Remove import zipstream from tests. 2019-02-28 17:50:09 +07:00
8cc8269842 Use aiozipstream for snapshots.
Fix tests.
2019-02-28 17:25:05 +07:00
52bfa636c1 Project duplication support. 2019-02-27 17:57:07 +07:00
4eca82174d Development on 2.1.15dev1 2019-02-27 15:59:16 +07:00
32f5dbb645 Release v2.1.14 2019-02-27 14:58:52 +07:00
7aae682f0a Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723 2019-02-27 14:47:45 +07:00
879e32eb9a Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536 2019-02-26 23:19:33 +07:00
01481cde1f Development on 2.1.14dev1 2019-02-26 18:10:23 +07:00
b5deb9d177 Release v2.1.13 2019-02-26 16:46:02 +07:00
a8990c9e89 Non blocking project exportation. 2019-02-26 15:55:07 +07:00
e1aa13fa73 Force jsonschema dependency to 2.6.0
This is to fix this issue when starting the (frozen) application on Windows:

```
  File "C:\Python36-x64\lib\site-packages\jsonschema\validators.py", line 505, in <module>
  File "C:\Python36-x64\lib\site-packages\jsonschema\_utils.py", line 57, in load_schema
  File "C:\Python36-x64\lib\pkgutil.py", line 634, in get_data
OSError: [Errno 34] Result too large: 'jsonschema\\schemas\\draft6.json'
```
2019-02-26 15:28:11 +07:00
135d56371d Fix tests for project notifications. 2019-02-23 23:20:11 +07:00
7fe8f7e716 Fix long-polling request for project notifications. 2019-02-23 21:08:52 +07:00
10702f87bc Fix export test. 2019-02-23 11:13:50 +07:00
2fb5e47c8d Allow cloud nodes to be exported. Fixes #1519 2019-02-23 11:07:01 +07:00
4487e578bc Fix create a node from a template test. 2019-02-22 18:44:12 +07:00
5754747a90 Merging 2.1 into 2.2 2019-02-22 18:04:49 +07:00
62c51edbae Less aggressive connections to uBridge. Ref #1289 2019-02-22 16:05:31 +07:00
a13d063aa1 Fix topology images (Pictures) disappearing from projects. Fixes #1514. 2019-02-21 23:58:54 +07:00
1ef1872f8e Reset MAC addresses when duplicating a project. Fixes #1522 2019-02-20 16:38:43 +07:00
657698a961 Fix create a node from an appliance test. 2019-02-20 11:21:29 +07:00
081ba31b50 Fix API call to create a node from an appliance doesn't return the new node data. Fixes #1527 2019-02-20 10:47:33 +07:00
aea4ae808f Detect invalid environment variable and send a warning when creating a Docker node. Ref #2683 2019-02-19 17:34:10 +07:00
3e601a8a24 Merge pull request #1526 from GNS3/pyup-update-pytest-4.1.1-to-4.3.0
Update pytest to 4.3.0
2019-02-19 15:57:13 +07:00
ae3515434c Do not export/import symlinks for projects. Fixes #2699 2019-02-19 12:43:44 +07:00
8e2d8f3962 Update pytest from 4.1.1 to 4.3.0 2019-02-19 04:27:57 +01:00
589c9754e8 Fix symlink not being created for duplicated IOU devices. Fixes https://github.com/GNS3/gns3-gui/issues/2699 2019-02-19 00:09:59 +08:00
4ecd3b2015 Configure coresPerSocket value in VMX file for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2688 2019-02-17 23:16:48 +08:00
84ee3263ba Count logical CPUs to detect if the number of vCPUs is too high when configuring the GNS3 VM. Fixes #2688. 2019-02-17 23:07:33 +08:00
174624121d Fix Qemu VM tests. Ref #1516 2019-02-17 19:53:46 +08:00
d9a9abf845 Add explicit error when trying to pull a Docker image from Docker Hub without Internet access. Fixes #1506. 2019-02-17 19:21:21 +08:00
0b07299472 Fixes double display output in GRUB in QEMU v3.1. Fixes #1516. 2019-02-17 19:03:36 +08:00
f7d0f54b6d Use production env for bundled web-ui 2019-01-29 10:02:39 +01:00
96dce2ec82 Release v2.2.0a1 2019-01-29 14:47:09 +08:00
117a1ac6da Restore reload support for nodes. 2019-01-24 16:51:14 +08:00
7fb192699b Development on 2.1.13dev1 2019-01-23 15:42:10 +08:00
bccdfc97d1 Release 2.1.12 2019-01-23 15:40:38 +08:00
792c4310eb Merge pull request #1502 from GNS3/svg-symbols-fixes
Tune how to get the size of SVG images.
2019-01-22 00:41:26 +07:00
3e21f96bf9 Fix indentation issue. Ref https://github.com/GNS3/gns3-gui/issues/2674
(cherry picked from commit c14d79a3d5)
2019-01-21 23:51:46 +07:00
5f932fee9f Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674.
* Default for missing height/width is "100%" as defined in the SVG specification
* Better error message, if viewBox attribute is missing
* Removal of "%" in percent more fault tolerant by using rstrip("%")

(cherry picked from commit e3757a8955)
2019-01-21 23:49:43 +07:00
c14d79a3d5 Fix indentation issue. Ref https://github.com/GNS3/gns3-gui/issues/2674 2019-01-21 16:24:23 +07:00
e3757a8955 Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674.
* Default for missing height/width is "100%" as defined in the SVG specification
* Better error message, if viewBox attribute is missing
* Removal of "%" in percent more fault tolerant by using rstrip("%")
2019-01-21 16:01:03 +07:00
456ef1348b Fix DeprecationWarning: invalid escape sequence. Fixes https://github.com/GNS3/gns3-gui/issues/2670 2019-01-17 18:01:58 +07:00
4b52e9313e Fix issue with coroutine not awaited. Fixes #1499 2019-01-17 17:43:09 +07:00
474025175e Remove "deprecated" node for VirtualBox based GNS3 VM support. Ref #1377 2019-01-16 19:22:16 +07:00
191036e266 Fix wrong controller method call. 2019-01-14 17:20:11 +07:00
8360ae98b1 Move appliance and template management code in their own classes. 2019-01-14 16:09:06 +07:00
5a3929f01a Merge pull request #1497 from GNS3/pyup-update-pytest-4.1.0-to-4.1.1
Update pytest to 4.1.1
2019-01-13 12:53:54 +07:00
aed6ea3aa0 Update pytest from 4.1.0 to 4.1.1 2019-01-12 21:59:44 +01:00
95f91bde19 Merge pull request #1496 from GNS3/pyup-update-aiohttp-3.5.3-to-3.5.4
Update aiohttp to 3.5.4
2019-01-12 17:35:49 +07:00
7c288fc61b Update aiohttp from 3.5.3 to 3.5.4 2019-01-12 11:34:10 +01:00
12a4f95a8f Update appliance files. 2019-01-12 17:33:53 +07:00
c6afea49da Try to delete saved VM state only if a snapshot has been saved. 2019-01-12 17:04:37 +07:00
bb284d082a Set socket options SO_KEEPALIVE and TCP_NODELAY for embedded Telnet server. Ref #1335 2019-01-12 16:50:15 +07:00
a896346c77 Fix issue with notification queue that prevented to properly close projects. Fix #1493 2019-01-12 16:02:36 +07:00
161c05a310 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-01-12 12:13:40 +07:00
f0ffb07165 Fix issue with "usage" variable for Dynamips VMs. Fixes #1495 2019-01-12 12:13:22 +07:00
ce048c6a00 Merge pull request #1494 from GNS3/pyup-update-aiohttp-3.5.2-to-3.5.3
Update aiohttp to 3.5.3
2019-01-11 19:47:24 +08:00
289eee968e Update aiohttp from 3.5.2 to 3.5.3 2019-01-11 08:59:41 +01:00
b68c0cf176 Merge pull request #1491 from GNS3/pyup-update-pytest-4.0.2-to-4.1.0
Update pytest to 4.1.0
2019-01-10 09:55:09 +07:00
b20f2a116b Merge pull request #1492 from GNS3/pyup-update-aiohttp-3.5.1-to-3.5.2
Update aiohttp to 3.5.2
2019-01-10 09:54:54 +07:00
cdb7eea888 Update aiohttp from 3.5.1 to 3.5.2 2019-01-08 22:29:49 +01:00
b1123acb8a Update pytest from 4.0.2 to 4.1.0 2019-01-06 23:05:37 +01:00
c736051dda Fix tests. 2018-12-30 21:50:47 +07:00
9ed181151f New node information dialog to display general, usage and command line information.
Ref https://github.com/GNS3/gns3-gui/issues/2662 https://github.com/GNS3/gns3-gui/issues/2656
2018-12-30 19:35:24 +07:00
40f8a33331 Merge pull request #1489 from GNS3/pyup-update-sphinx-1.8.2-to-1.8.3
Update sphinx to 1.8.3
2018-12-27 00:50:23 +07:00
2a1822fe12 Update sphinx from 1.8.2 to 1.8.3 2018-12-25 22:19:11 +01:00
b66e42e650 Merge pull request #1488 from GNS3/pyup-update-aiohttp-3.5.0-to-3.5.1
Update aiohttp to 3.5.1
2018-12-25 19:21:15 +07:00
485b8a3db4 Update aiohttp from 3.5.0 to 3.5.1 2018-12-25 08:44:09 +01:00
eacc20cf07 Merge pull request #1487 from GNS3/pyup-update-aiohttp-3.4.4-to-3.5.0
Update aiohttp to 3.5.0
2018-12-24 17:48:10 +07:00
e1c250a8dd Update aiohttp from 3.4.4 to 3.5.0 2018-12-23 10:14:05 +01:00
eae9774d69 Support "usage" field for Dynamips, IOU, VirtualBox and VMware. Fixes https://github.com/GNS3/gns3-gui/issues/2657 2018-12-21 16:54:13 +08:00
468145319d Merge 2.1 into 2.2 branch. 2018-12-21 15:24:34 +08:00
ef38ccfefa Automatically create a symbolic link to the IOU image in the IOU working directory. Fixes #1484 2018-12-17 22:42:18 -06:00
670b6d689a Merge remote-tracking branch 'origin/2.1' into 2.1 2018-12-14 19:53:51 -06:00
fc75a6b8d3 Fix link pause/filters only work for the first interface of Docker containers. Fixes #1482 2018-12-14 19:53:43 -06:00
ed7b91ae3a Merge pull request #1481 from GNS3/pyup-update-pytest-4.0.1-to-4.0.2
Update pytest to 4.0.2
2018-12-14 11:49:43 -06:00
d79f6b578d Update pytest from 4.0.1 to 4.0.2 2018-12-14 18:21:49 +01:00
f76b329cba Fix ConnectionResetError issues and switch to aiohttp version 3.4.4. Fixes #1474. 2018-12-03 19:14:22 +08:00
030714ae80 Fix server authentication. 2018-12-03 18:46:24 +08:00
0fd54536d2 Fix issue when there is no gns3_controller.conf. Fixes https://github.com/GNS3/gns3-gui/issues/2644 2018-11-30 19:09:10 +08:00
58b2ee152d Fix Docker console test. 2018-11-30 18:59:02 +08:00
bec2270334 Fix non responsive console for Docker VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2645 2018-11-30 17:06:21 +08:00
56412b35e0 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/utils/asyncio/telnet_server.py
2018-11-30 12:38:02 +08:00
9fbdb25da8 Back to classic symbol theme. Ref https://github.com/GNS3/gns3-gui/issues/2644 2018-11-29 17:14:21 +08:00
647ac87c89 Merge pull request #1476 from ddragic/x11vnc
Docker: fix x11vnc not starting
2018-11-29 07:03:58 +07:00
817a053dfc docker_vm: fix x11vnc not starting 2018-11-29 00:37:20 +01:00
fb0456fdfa Merge pull request #1475 from GNS3/naming-consistency
Review and apply consistent naming
2018-11-28 16:32:42 +07:00
d7c2e16c21 Use "template" to name what we use to create new nodes. 2018-11-28 16:12:58 +07:00
21c0a35f77 Use project instead of topology where appropriate. 2018-11-27 18:30:16 +07:00
a17fa821bd Make sure nothing is named "compute server". 2018-11-27 18:14:51 +07:00
b4a2bc5b47 Merge pull request #1467 from GNS3/symbol-themes
Support symbol themes. Ref #1466
2018-11-27 17:19:52 +07:00
f39c27ff7b Allow usage property in Docker appliance. 2018-11-27 16:36:52 +07:00
db982f5df7 Merge pull request #1473 from GNS3/kazkansouh-2.2-grid-new-project
Improved grid support
2018-11-27 16:34:00 +07:00
a93606d9ed Use "node" instead of "appliance" for grid support. 2018-11-27 16:13:22 +07:00
dd14101eec Merge branch '2.2-grid-new-project' of git://github.com/kazkansouh/gns3-server into kazkansouh-2.2-grid-new-project 2018-11-27 15:50:24 +07:00
83161bcdd4 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-27 15:47:29 +07:00
df4e4bec24 Merge pull request #1472 from GNS3/docker-console-resize
Telnet console resize support for Docker VM. Fixes #1471
2018-11-27 15:17:34 +07:00
60ac6d2dfe Telnet console resize support for Docker VM. 2018-11-27 15:06:56 +07:00
1067f71952 Allow appliances to be loaded from file without the appliance id.
Fixes https://github.com/GNS3/gns3-gui/issues/2639.
2018-11-27 14:03:12 +07:00
8eb20525e8 Update schema to allow for drawing grid size to be part of project. 2018-11-26 15:31:28 +00:00
c0a0a13bdd Avoid _fix_permissions() to be called twice when stopping Docker VM. Ref #1428 2018-11-26 15:53:24 +07:00
a3044ede77 Fix _fix_permissions() garbles permissions in Docker VM. Ref #1428 2018-11-25 17:11:42 +07:00
df3baffd9b Fix "None is not of type 'integer'" when opening project containing a Qemu VM. Fixes #2610. 2018-11-24 19:56:29 +07:00
219c346187 Remove useless warning. 2018-11-24 17:04:16 +07:00
6a2d1e9b33 Merge pull request #1465 from GNS3/pyup-update-pytest-4.0.0-to-4.0.1
Update pytest to 4.0.1
2018-11-24 16:08:58 +07:00
e2231b1220 Update pytest from 4.0.0 to 4.0.1 2018-11-24 09:21:06 +01:00
e0813bfbe8 Normalize symbol ID on Windows. 2018-11-23 18:47:42 +07:00
9f7f26700e Debugging for Windows. 2018-11-23 18:33:45 +07:00
51787295dd Use POSIX path for symbol ID. 2018-11-23 18:26:04 +07:00
17d070dca7 Early support for symbol themes. 2018-11-23 17:27:10 +07:00
301b7475f7 Sync appliances 2018-11-21 14:13:14 +07:00
f442c6e9e1 Sync appliances 2018-11-21 14:12:38 +07:00
2a3825543a Merge pull request #1450 from GNS3/pyup-update-sphinx-1.7.1-to-1.8.2
Update sphinx to 1.8.2
2018-11-20 17:13:53 +07:00
df0f0c5b83 Merge branch '2.2' into pyup-update-sphinx-1.7.1-to-1.8.2 2018-11-20 17:06:42 +07:00
2e79da5fe1 Fix broken examples in API documentation. 2018-11-20 16:24:59 +07:00
4e2b8bfe7c Add more information about appliances to the API documentation. 2018-11-20 16:21:33 +07:00
68ecbffcf1 Use Python3.6 to build the API documentation. 2018-11-20 15:35:46 +07:00
1289d20a14 Add missing files for API documentation. 2018-11-20 15:19:44 +07:00
53928b884f Bump version to 2.2.0dev5 2018-11-20 14:37:38 +07:00
bc5eda8259 Restore previously removed test. 2018-11-20 14:36:18 +07:00
ff5ba3742e Update API documentation for appliance endpoints. Ref https://github.com/GNS3/gns3-gui/issues/2630 2018-11-20 13:04:27 +07:00
e5950674f8 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-20 00:22:35 +07:00
5cb0957f35 Require privileged access for uBridge when using VMware VMs and Docker containers. Fixes #1461. 2018-11-20 00:22:16 +07:00
7385d67c39 Merge pull request #1457 from GNS3/pyup-update-pytest-timeout-1.2.1-to-1.3.3
Update pytest-timeout to 1.3.3
2018-11-19 17:49:46 +07:00
e8cb8d29d8 Merge pull request #1454 from GNS3/pyup-update-pytest-3.8.1-to-4.0.0
Update pytest to 4.0.0
2018-11-19 17:49:10 +07:00
3fae6ada95 Only require privileged access for uBridge when connecting a cloud to an Ethernet/TAP interface. Fixes #1461. 2018-11-19 17:33:17 +07:00
ca6a0708a8 Merge pull request #1462 from GNS3/use-files-as-disk-images
Allow virtual machines to use files in project directory as disk images.
2018-11-19 16:41:36 +07:00
3727487730 Fix test on Windows. 2018-11-19 16:09:39 +07:00
3497deaa31 Allow virtual machines to use files in project directory as disk images. 2018-11-19 15:53:43 +07:00
3861d6a274 Merge pull request #1459 from GNS3/duplicate-appliance
Support to duplicate an appliance via API. Fixes https://github.com/GNS3/gns3-gui/issues/2618
2018-11-18 17:57:10 +07:00
bd657c0167 Support to duplicate an appliance. 2018-11-18 17:05:16 +07:00
9b83b087cb Fix mac address schema validation for Qemu VM appliance. Fixes https://github.com/GNS3/gns3-gui/issues/2629 2018-11-18 16:20:50 +07:00
a33b8eac3a Support "L1 keepalives" in IOU appliance schema. 2018-11-18 16:04:08 +07:00
c7b8c347d7 Remove problematic test when run on Travis. 2018-11-18 00:08:40 +07:00
53f3821d41 Change test that randomly fails on Travis. 2018-11-17 23:23:28 +07:00
3512fde841 Fix small bugs when using the new appliance management API. 2018-11-17 22:16:18 +07:00
74e1463015 Fix bug with custom adapters and categories for Docker VM. Fixes https://github.com/GNS3/gns3-gui/issues/2613 2018-11-17 21:50:00 +07:00
aa4593c993 Handle custom adapters in schemas. 2018-11-17 20:09:34 +07:00
82140c082c Merge pull request #1458 from GNS3/appliance-default-settings
Apply default settings when adding an appliance via API. Fixes #1456
2018-11-17 19:39:34 +07:00
499ab9844a Reorganize how appliance creation is validated against JSON schemas.
This allows for clearer error messages when validation fails.
2018-11-17 18:12:46 +07:00
71fcf855b4 Add tests for all appliance types. 2018-11-17 15:37:20 +07:00
627c7e9cfe Use schema to set appliance default values and better schema validation error messages. 2018-11-16 23:02:10 +07:00
f486f07a61 Update pytest-timeout from 1.2.1 to 1.3.3 2018-11-16 13:11:49 +01:00
1acc7777f9 Merge pull request #1455 from GNS3/appliance-api
New appliance management API. Fixes #1427
2018-11-15 22:52:18 +07:00
1184f29b90 Add appliance API tests. Ref #1427. 2018-11-15 21:34:36 +07:00
9aafa4e62f Schema validation for appliance API. Ref #1427. 2018-11-15 17:28:17 +07:00
bb3edfe779 Update pytest from 3.8.1 to 4.0.0 2018-11-15 00:57:47 +01:00
98f04365b7 Remove generic controller settings API endpoint. 2018-11-14 16:24:30 +08:00
cebb56387a Fix tests. 2018-11-13 15:40:18 +08:00
f91d3c9dbb Merge branch '2.2' into appliance-api 2018-11-13 14:59:55 +08:00
089fdff4f1 Working dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-13 14:59:18 +08:00
e7b8309a80 Fix Docker VNC tests. Ref #1438 2018-11-11 23:25:23 +08:00
d45d52f15c Support Xtigervnc restart. 2018-11-11 23:23:30 +08:00
029344da14 Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438 2018-11-11 22:33:58 +08:00
36474f7bab Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
2018-11-11 22:31:29 +08:00
d0bab9947e Support tigervnc in Docker VM. Ref #1438 2018-11-11 21:07:33 +08:00
f0fe9d39fa Base for dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-11 20:13:58 +08:00
887b32c4bc Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-11 20:08:37 +08:00
f03ba5ca0b Update appliance templates. 2018-11-11 20:08:13 +08:00
97758a09f4 Update sphinx from 1.7.1 to 1.8.2 2018-11-11 12:59:41 +01:00
41fbbf7a56 Reorder routes in order to get working CORS 2018-11-08 11:47:09 +01:00
fcd102317a Merge pull request #1448 from GNS3/disable-cors-cache
Disable CORS cache, Fixes: #1445
2018-11-06 13:38:43 +01:00
7bc67cb41f Merge pull request #1447 from GNS3/wrong-cors-response
Fix CORS response on node deletion, Fixes: #1446
2018-11-06 13:38:01 +01:00
249b2255f6 Fix CORS response on node deletion, Fixes: #1446 2018-11-06 13:37:03 +01:00
78c693ff63 Disable CORS cache, Fixes: #1445 2018-11-06 13:31:14 +01:00
b858664985 Merge pull request #1444 from alfredmyers/patch-1
Fixed typos on README.rst
2018-11-05 21:23:30 +07:00
78fe929e0c Fixed typos on README.rst 2018-11-05 09:59:29 -02:00
2764828f38 Refactor how clients access PCAP capture files. Fixes https://github.com/GNS3/gns3-gui/issues/2438.
* The PCAP file is directly accessed if controller and client are on the same host.
* The PCAP file is streamed from the compute server to the client with the controller as a proxy when the controller is remote for the client.
2018-10-27 14:47:17 +07:00
bf1b801cc0 Remove static dir configuration 2018-10-24 09:04:05 +02:00
4158edf8e2 Merge pull request #1435 from GNS3/fix-put-cors-for-nodes
FIX PUT CORS for nodes, Fixes: #1434
2018-10-23 12:41:14 +02:00
fa5571ced1 FIX PUT CORS for nodes, Fixes: #1434 2018-10-23 11:09:38 +02:00
df36d8377d Fix more tests. 2018-10-17 17:40:25 +07:00
ab8dc52ece Fix tests to work with new version of aiohttp (>= 3.0) 2018-10-17 17:32:10 +07:00
9ae9209881 Update appliance templates. 2018-10-16 16:20:37 +07:00
86f87aec74 Fix installation with Python 3.7. Fixes #1414.
Fix deprecated use of aiohttp.Timeout. Fixes #1296.
Use "async with" with aiohttp.ClientSession().
Make sure websocket connections are properly closed, see https://docs.aiohttp.org/en/stable/web_advanced.html#graceful-shutdown
Finish to drop Python 3.4.
2018-10-16 15:56:06 +07:00
8217f65e97 Do not test with Python 3.4 on Travis. 2018-10-15 17:08:18 +07:00
de5934f818 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-10-15 17:06:25 +07:00
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
93b6c0e49d Merge pull request #1421 from kazkansouh/2.2-update-docker-init-path
Support for using other dhcp clients in docker init.sh
2018-10-07 04:35:48 +02:00
14fb64b941 Added "/sbin" to init script PATH variable so that its possible to
use more sophosticated dhcp clients (compared to the udhcpc that is
provided by busybox) by installing them into the docker image in
the normal way.
2018-10-06 16:06:24 +01:00
8baa480b79 Fix tests. 2018-10-06 21:57:03 +08:00
97c68f56bf Notify users if x11vnc process has crashed. Fix #1401. 2018-10-06 21:30:39 +08:00
22f7ca0243 Return compute port information via API. Ref #1420. 2018-10-05 12:48:20 +02:00
eb97ebf311 Fix platform.linux_distribution() is deprecated. Fixes https://github.com/GNS3/gns3-gui/issues/2578 2018-10-04 16:32:49 +02:00
de5a6ca8c7 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-10-04 15:44:29 +02:00
9de13c570c Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
2018-10-04 15:44:13 +02:00
e4a6db8ebc Fix some typos. 2018-10-04 15:22:42 +02:00
181a31be32 Update minimum VIX version requirements for VMware. Ref #1415. 2018-10-02 11:22:32 +02:00
8d368cd0f6 Development on 2.1.12dev1 2018-09-28 20:50:03 +02:00
41d4ecc4b7 Release v2.1.11 2018-09-28 20:47:44 +02:00
4d95e0b51f Catch some exceptions. 2018-09-28 15:04:38 +02:00
0b919aa8c9 Merge pull request #1411 from GNS3/pyup-update-pytest-3.4.2-to-3.8.1
Update pytest to 3.8.1
2018-09-27 22:23:49 +02:00
b10d79c37a Update pytest from 3.4.2 to 3.8.1 2018-09-27 21:59:19 +02:00
4efdefaf5a Development on 2.1.11dev1 2018-09-15 11:23:18 +02:00
b6b345508b Release v2.1.10 2018-09-15 11:19:55 +02:00
5d2e539193 Update appliances. 2018-09-14 22:18:13 +02:00
eb0e26b55f Include locale information and GNS3 VM version in crash reports. 2018-09-12 15:38:20 +02:00
17d657c919 Fix small errors like unhandled exceptions etc. 2018-09-11 15:06:01 +02:00
0aa9ab53d1 Import encodings.idna to avoid LookupError when standard library is in a zip file. 2018-09-07 09:34:17 +02:00
4021a13651 Catch exceptions in various locations to fix small issues reported by Sentry. 2018-09-06 09:49:12 +02:00
341e2e2e3a Check if serial pipe can be opened for VMware and VirtualBox VMs. 2018-09-06 07:02:32 +02:00
f8ecd61a98 Notify users if xvfb process or x11vnc process have crashed. Ref #1401. 2018-09-05 15:16:07 +08:00
c620d0be84 Improve the invalid port format detection. Fixes https://github.com/GNS3/gns3-gui/issues/2580 2018-09-05 13:35:42 +08:00
abfbadecd6 Update aiohttp verion requirement in order to support Python 3.7. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-09-02 20:41:45 +07:00
4a6202fa84 Update setup.py and fix minor issues. 2018-09-02 15:32:33 +07:00
f89d645b56 Update appliances. 2018-08-31 19:33:03 +07:00
6822ff65a2 Disable static directory. Ref https://github.com/GNS3/gns3-gui/issues/2558. 2018-08-30 17:34:26 +07:00
ef4db112f1 Fix typo. 2018-08-29 17:27:24 +07:00
86be4f98f1 Fix wrong call after merging. 2018-08-29 16:22:37 +07:00
3c332b895d Fix tests after merging. 2018-08-29 16:08:08 +07:00
33e8710495 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
2018-08-29 15:57:54 +07:00
8e90d79399 Upgrade remote install script to use any ubuntu codename. Fixes #1393. 2018-08-28 17:41:06 +07:00
78d0284247 Merge remote-tracking branch 'origin/master' 2018-08-28 17:27:18 +07:00
57cb457b5d Use port 80 for key server. 2018-08-28 17:27:08 +07:00
b7dd8b5176 Catch asyncio.CancelledError when shutting down the server. 2018-08-28 17:10:24 +07:00
00cf66fb0f Report GNS3 VM errors to the GUI server summary. Ref #1359. 2018-08-28 15:42:06 +07:00
8d4e73d23c Replace vboxnet0 (if it does not exist) by the first available vboxnet interface on Windows. Fixes https://github.com/GNS3/gns3-vm/issues/102 2018-08-26 03:28:38 -07:00
4e712280b3 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-08-26 02:44:01 -07:00
4d57a3befa Check if the VirtualBox host-only network exists when starting a GNS3 VM running on VirtualBox. Ref https://github.com/GNS3/gns3-vm/issues/102 2018-08-26 02:43:40 -07:00
38b72079b2 Change file timestamps if necessary because ZIP does not support timestamps before 1980. Fixes #1360. 2018-08-25 18:10:40 +07:00
814526ba26 Add missing coroutine decorator Ref https://github.com/GNS3/gns3-gui/issues/2566 2018-08-25 16:00:40 +07:00
f5dc635baa Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566 2018-08-25 15:50:08 +07:00
902de3dd47 Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568 2018-08-25 14:10:47 +07:00
ad9b6f42bf Test with Python 3.7 on Travis. 2018-08-24 18:59:10 +07:00
3560cda06c Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-08-24 18:57:18 +07:00
a3d1e865a8 Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566. 2018-08-24 18:52:15 +07:00
089d25c79d Forbid controller and compute servers to be different versions.
Report last compute server error to clients and display in the server summary.
2018-08-22 16:54:43 +07:00
59ce105a50 Fix exception with short names for Dynamips interfaces. Fixes #1386. 2018-08-21 19:46:14 +07:00
aeb33024ca Add missing Qemu boot priority values. Fixes https://github.com/GNS3/gns3-server/issues/1385 2018-08-21 17:49:58 +07:00
9ef23ce6a8 Include HTTP error code when reporting an error while download appliance templates
from GitHub repository.
2018-08-21 17:30:34 +07:00
b7f9b865c8 Optimize appliance templates update from GitHub repository by only downloading when the repository
has been updated. Ref https://github.com/GNS3/gns3-gui/issues/2490
2018-08-21 16:26:07 +07:00
651d8280a7 Fix appliance template tests. 2018-08-19 19:35:45 +07:00
5958a23557 Update appliance templates from online registry. Ref #2490. 2018-08-19 16:02:47 +07:00
a78ee18977 Update appliance templates. 2018-08-18 16:49:21 +07:00
1e33e94c15 Add missing doc pages. 2018-08-16 21:50:54 +07:00
8699f2e2b0 Update docs for controller_notifications and project_notifications. 2018-08-16 21:40:51 +07:00
7f72b90b0e The server has now 2 notification streams
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
2018-08-16 21:31:57 +07:00
dac3ba19b7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/ports/port_factory.py
2018-08-13 22:06:44 +07:00
c593785c6d Development on 2.1.10dev1 2018-08-13 13:50:43 +02:00
689a82a180 Release v2.1.9 2018-08-13 13:13:46 +02:00
23e83b730b Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:45:24 +07:00
e5d38811ca Fix incorrect short port names in topology summary. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:10:21 +07:00
daa2de4541 Allow custom symbols to be sub-directories. 2018-08-13 00:16:02 +07:00
29620f4ea3 Add affinity symbols. Ref https://github.com/GNS3/gns3-gui/issues/2488 2018-08-12 22:08:48 +07:00
1fd010484d ACPI shutdown for GNS3 VM running on Hyper-V. Ref https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 17:11:32 +07:00
c48eebcc5d Hyper-V support for GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 16:49:24 +07:00
c0521732a9 Get IP address from guest Hyper-V VM. Ref https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 01:49:48 -07:00
7a9625744c Merge pull request #1384 from BrentBaccala/pull-2
add appliance data for Cisco Nexus 9000v NX-OS 7.0(3)I7(3)
2018-08-11 12:55:19 +07:00
470133b096 add appliance data for Cisco Nexus 9000v NX-OS 7.0(3)I7(3) 2018-08-10 16:40:23 -04:00
c9767a06b3 Early Hyper-V support to run the GNS3 VM. Ref https://github.com/GNS3/gns3-gui/issues/763. 2018-08-10 16:18:14 +07:00
652d5788c3 Fix tests. 2018-08-09 18:14:38 +07:00
89f7169589 Add appliance UUID added to the node data. Fixes #1334. 2018-08-09 17:45:33 +07:00
a54359d243 Clean GNS3 close if one remote server is down. Fixes #1357. 2018-08-09 16:59:10 +07:00
e3c8c9d484 Mark VirtualBox support for running the GNS3 VM as deprecated. Ref #1377. 2018-08-08 15:02:31 +07:00
cc52a6a6b5 Change default z value for nodes to 1 2018-08-08 14:33:10 +07:00
033f005bde Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
2018-08-07 21:06:42 +07:00
12e71a2917 Set lower process priority when computing idle-pc value on Windows. Ref #2522. 2018-08-07 19:31:33 +07:00
17e51fdac6 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-07-26 13:35:57 -05:00
d0ed6931d8 Catch exception: ZIP does not support timestamps before 1980. Ref #1360. 2018-07-26 13:34:23 -05:00
c274be1135 Sync appliances 2018-07-13 12:42:43 +02:00
a494f8257b Merge pull request #1368 from sbraz/typing
Require typing only for Python < 3.5
2018-07-13 11:34:30 +08:00
2a1b9e7232 Require typing only for Python < 3.5 2018-07-12 23:43:27 +02:00
1cc1ccd511 Re-enable static directory 2018-07-02 09:25:39 +02:00
ec8cfcd0f9 Disable static/ dir, Ref: #2532 2018-06-29 14:31:19 +02:00
dd845eb096 Fix tests on Windows 2018-06-28 09:16:51 +02:00
41026c74c1 Use mocked dir for web-ui redirection test 2018-06-26 13:13:19 +02:00
7d75b6248d Use mocked dir of web-ui for tests 2018-06-26 12:53:39 +02:00
21780fa2ed Gitkeep for web-ui directory 2018-06-26 12:26:04 +02:00
aed1989cdf Merge pull request #1364 from GNS3/bundled-web-ui
Serve WebUI handlers and update-bundled-web-ui script
2018-06-26 12:10:11 +02:00
0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02:00
6dc2ae8641 Clear script 2018-06-22 15:30:24 +02:00
867e997b74 Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
e20e885d44 Release v2.1.8 2018-06-14 15:17:08 +02:00
893e9c4749 'caplog.text()' syntax is deprecated, use 'caplog.text' property instead. 2018-06-14 17:15:24 +08:00
b68041e4e3 Remove problematic pytest-capturelog dev dependency. 2018-06-14 17:09:15 +08:00
84865ac3d6 Fix dev requirement. 2018-06-14 16:55:48 +08:00
0f496907a0 Fix API status code for start/stop/suspend/reload a node. Fixes #1353.
Fix issues with test.
Update documentation.
2018-06-14 16:39:32 +08:00
f3b4cc0160 Fix tests 2018-06-13 19:16:43 +02:00
ac73c72727 Don't send variables to computes where are empty, Ref: #1340 2018-06-13 18:55:47 +02:00
2e586f56ca Development on v2.1.8dev1 2018-06-12 11:15:06 +02:00
0b742fc43d Release v2.1.7 2018-06-12 11:12:59 +02:00
72cc3961dd Merge pull request #1351 from acaudwell/udp-ports-fix
Don't release NIO UDP ports when updating docker container.
2018-06-11 22:36:17 +07:00
b2e0a1b291 Don't release NIO UDP ports when updating docker container.
When a docker container was updated, the NIO UDP ports were being released
from port_manager, but they were still stored in self._ethernet_adapters.
When the container was restarted, the same NIO ports would be used. However,
if a new connection was then added, it could assign a port that was already
in use. The end result was that traffic would be bridged across the wrong
interface connection.
2018-06-11 15:17:13 +12:00
96d5e351f7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-10 21:19:55 +07:00
45edc40948 Timeout for stream file. 2018-06-10 21:18:16 +07:00
1550c7bee7 Fix cloud tests. 2018-06-10 17:56:56 +07:00
1f017a0d1d Console support for clouds (to connect to external devices or services). 2018-06-10 17:43:29 +07:00
34fcbd68f3 Fix switching console type from telnet to VNC throws error. 2018-06-09 22:08:30 +07:00
40151cd1fe Fix switching console type from telnet to VNC throws error. Fixes #2489. 2018-06-09 21:47:36 +07:00
1905a99ce7 Fix saved VM state was not deleted correctly. 2018-06-09 17:28:26 +07:00
6caf38206c Fix tests. 2018-06-07 22:37:29 +07:00
8851a55199 Fix timeout error with "save as" for large projects. 2018-06-07 22:26:23 +07:00
c18d855a10 Merge branch '2.1' of github.com:GNS3/gns3-server into 2.1 2018-06-07 11:58:30 +02:00
ae0c362427 Merge pull request #1348 from ehlers/api-docs
Update API documentation
2018-06-07 15:57:11 +07:00
60a3ab87dc Update API documentation 2018-06-07 10:26:06 +02:00
62f87de23a Add API endpoint to return all links attached to a node. 2018-06-06 20:46:44 +07:00
70cbc0260b Merge pull request #1347 from AlyssonOliveira/fix_requirements.txt_to_hold_prompt-toolkit_1.0.15
Hold prompt-toolkit==1.0.15 to fix https://github.com/GNS3/gns3-serve…
2018-06-06 18:57:02 +07:00
c3c298cd63 Hold prompt-toolkit==1.0.15 to fix https://github.com/GNS3/gns3-server/issues/1346 2018-06-06 08:37:50 -03:00
fd5df0052a Fix issue with some SVG symbols that could not be used in GNS3.
This was due to the height and width values being percentages.
2018-06-06 16:32:51 +07:00
19c5ff8521 Show correct free disk space value. 2018-06-06 14:59:44 +07:00
31a268e756 Force prompt-toolkit to version 1.0.15 2018-06-06 01:36:43 +07:00
7f27cb7015 Update requirements.txt 2018-06-06 01:34:05 +07:00
fbfa75830e Bump version to 2.1.7dev1 2018-06-05 16:46:11 +07:00
f8bf749577 Remove unwanted trailing characters and other white spaces when reading .md5sum files. 2018-06-05 00:01:20 +07:00
d1ccf3bc84 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-04 22:46:52 +07:00
051eedb406 Change order to find vnetlib on Windows (PATH -> Registry -> Default directories). 2018-06-04 21:57:34 +07:00
e026c6415e Add dev1 to the version 2018-05-24 13:11:57 +02:00
b0c89a4f2c Development on v2.1.7dev1 2018-05-22 14:14:31 +02:00
eafe27e684 Release v2.1.6 2018-05-22 14:11:48 +02:00
c52342907a Merge pull request #1332 from GNS3/global-vars
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
2018-05-15 09:23:54 +02:00
5a0e21f58d Locks down async-timeout<3.0.0 for P3.4 support; Fixes: #1331 2018-05-11 13:37:04 +02:00
f3c6faed75 Removed unnecessary line 2018-05-09 15:53:50 +02:00
7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
83445214be Support for nested global variables 2018-05-09 11:25:55 +02:00
0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +02:00
f2700ed445 Support of supplier and variables in topology 2018-05-08 10:07:42 +02:00
e4436096c2 Fix tests 2018-05-07 15:18:19 +02:00
132c7c8f5b Fix tests 2018-05-07 12:55:32 +02:00
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
21a1800edc Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py
2018-04-28 19:41:12 +07:00
202e7362a5 Add command information when uBridge has an error. Ref #1289 2018-04-28 18:48:52 +07:00
305fe2e817 Handle asyncio timeouts. Ref #1307. 2018-04-28 17:42:02 +07:00
a56d5b453f Fix project export tests. 2018-04-28 16:46:47 +07:00
3b94484914 Fix bug with export project. Ref #1187 #1307. 2018-04-28 16:38:52 +07:00
50a922f83e Offload slow file operations to threads for snapshots and project "save as". Ref #1187 #1307. 2018-04-28 16:01:43 +07:00
80958e8a6d support based on init.sh, Ref: #2482 2018-04-27 14:33:07 +02:00
20294e284c Fix exception from send_signal() on Windows. 2018-04-27 17:00:28 +07:00
43081152ef Add support of ExtraHosts for Docker, Ref. gns3-gui#2482 2018-04-25 16:03:01 +02:00
747814f083 Development on v2.1.6 2018-04-18 11:41:30 +02:00
2e9c5590a8 Release v2.1.5 2018-04-18 11:29:02 +02:00
cfd0216554 Disable TraceNG for version 2.1.5 2018-04-18 17:19:44 +08:00
2ea0aa5ded Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
2018-04-18 17:08:42 +08:00
9ecb058343 Fix tests. 2018-04-18 16:13:59 +08:00
013c74f6d8 Sync appliance files. 2018-04-18 16:12:30 +08:00
fff2e128eb Set the first byte to 0C when generating a random MAC address for a Qemu VM. Ref #1267. 2018-04-18 16:06:51 +08:00
5690d350bd Update appliance files. 2018-04-17 12:58:37 +08:00
1fea086f13 Do not use VMnet0 when allocating VMnet adapters. 2018-04-17 11:47:25 +08:00
dd9c18b9f8 Use SO_REUSEADDR before calling bind() where missing. Fixes #1289. 2018-04-16 16:36:36 +08:00
5c4f6dd3dc Do not fail a Dynamips project conversion if a file being used. 2018-04-16 15:45:43 +08:00
a12c5a95b0 Catch exceptions when using AsyncioTelnetServer. Fixes #1321. 2018-04-16 15:30:06 +08:00
025441f027 Add default destination setting for traceng + some checks. 2018-04-16 15:03:22 +08:00
801547983a Fix tests. 2018-04-13 17:04:19 +08:00
2de182eff4 Grid size support for projects. 2018-04-13 16:54:57 +08:00
9adfb1820d Remove 'include INSTALL' from MANIFEST. 2018-04-13 14:17:18 +08:00
ee5317948b Fix tests. 2018-04-06 14:32:06 +07:00
22a71b0e8c Fix problem with VM saved stated. 2018-04-06 13:19:54 +07:00
7622c10cc9 Returns the ports' adapter types and mac addresses when available. 2018-04-06 13:19:17 +07:00
adc2f69d5d Fix tests. 2018-04-04 21:51:31 +07:00
395277d5c5 Support for console auto start. 2018-04-04 21:31:35 +07:00
1d7f67695a Bump version to 2.2.0dev2 2018-04-03 12:51:09 +07:00
757c103c03 Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361.
MAC addresses can customized for Qemu as well.
2018-04-02 22:27:12 +07:00
509b171b06 Allow to have projects with the same name in different locations. 2018-03-30 23:01:37 +07:00
ea0009db6c Save state feature for VirtualBox and VMware. New "On close" setting to
select the action to execute when closing/stopping a Qemu/VirtualBox/VMware VM.
2018-03-30 21:18:44 +07:00
3d1ee4da3f Support for suspend to disk / resume (Qemu). 2018-03-30 19:28:22 +07:00
64949f5d04 Fix bug with 'none' console type for Ethernet switch.
Fix some tests related to traceng.
2018-03-30 13:00:52 +07:00
669d2ec038 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/schemas/node.py
2018-03-30 12:14:09 +07:00
297bbd91ec Fix traceng tests. 2018-03-30 12:10:57 +07:00
47e5dfabd8 Merge branch 'traceng' into 2.1 2018-03-29 15:17:41 +07:00
898f180310 Fix issue with start all. 2018-03-29 13:32:56 +07:00
b61bd2dc67 Merge remote-tracking branch 'origin/traceng' into traceng 2018-03-29 13:29:56 +07:00
b7780ba7cc Check for valid IP address and prevent to run on non-Windows platforms. 2018-03-29 13:26:43 +07:00
c053a2f350 Enable UDP tunnel option and use ICMP probing by default. 2018-03-28 04:26:40 -07:00
05ec14e888 Use the configured IP address to trace. 2018-03-27 03:43:50 -07:00
d08c08617c Support for source and destination for traceNG. 2018-03-27 16:58:49 +07:00
8e695c8af1 Have TraceNG start without needing cmd.exe 2018-03-27 01:19:24 -07:00
ff7911bd99 Allow to resize a Qemu VM disk (extend only). 2018-03-26 18:05:49 +07:00
6cec67f79f Allow to select the default NAT interface in preferences for local server. 2018-03-26 14:23:01 +07:00
caa2bda71b Spice with agent support for Qemu VMs. 2018-03-25 14:36:14 +07:00
d419d3fa39 Check if the HAXM service is running when starting a Qemu VM with hardware acceleration. Ref #1242. 2018-03-24 22:15:20 +07:00
5d704aa478 Fix tests. 2018-03-24 18:25:09 +07:00
e52775fa3a Support for console type "none". 2018-03-24 18:11:21 +07:00
54661c50b2 Fix tests related to console type changes. 2018-03-23 21:29:39 +07:00
b6275deeef Fix tests. 2018-03-23 16:01:21 +07:00
b8353bc0d5 Support for none console type (Qemu & Docker only) 2018-03-23 15:44:16 +07:00
a40fdb3641 Fix bug and add optimizations when connecting and sending commands to QEMU monitor after starting a VM. Fixes #2336. 2018-03-23 00:07:32 +07:00
135bbe8825 Check if HAXM support is installed on macOS. Ref #1242. 2018-03-22 22:37:09 +07:00
9a9ac6d9f7 Fix some issues with hardware acceleration support for Qemu. 2018-03-22 15:45:41 +07:00
17bfed52f2 Fix Qemu VM tests. 2018-03-22 14:05:31 +07:00
44f2acffa5 Support Qemu with HAXM acceleration. Ref #1242. 2018-03-21 16:41:25 +07:00
85dcb985eb Fix packet filters for Dynamips. 2018-03-20 11:15:42 +07:00
279b4d7b20 Fix link filters/suspend tests. 2018-03-19 18:25:56 +07:00
8b91894fa4 Improve suspend a link for Qemu and VirtualBox VMs.
A suspended link will be unplugged allowing the VMs to be notified
of the change.
2018-03-19 16:26:12 +07:00
cde30f8f53 Fix warning message. 2018-03-19 14:23:46 +07:00
c7875f93a3 Qemu VM support to detect when a link is plugged/unplugged. 2018-03-19 14:22:10 +07:00
b7e436efdf Fix tests. 2018-03-15 20:47:42 +07:00
aaf59e6050 Allow to configure the interface to be used by the NAT node. Fixes #1175. 2018-03-15 17:20:40 +07:00
08493871a5 Restrict the list of available Ethernet/TAP adapters. Fixes #352. 2018-03-15 16:33:23 +07:00
fb3bcf3b8f Basic project stats. 2018-03-15 15:21:29 +07:00
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
88674455a3 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
2018-03-14 18:40:37 +07:00
a4626a2b79 Custom icons and small fixes for TraceNG integration. 2018-03-14 16:56:37 +07:00
a13c237495 Merge pull request #1316 from BrentBaccala/master
Update Cisco ASAv appliance to include version 9.9.1
2018-03-14 13:25:22 +07:00
54a93a5ccb update Cisco ASAv appliance to include version 9.9.1 2018-03-14 01:20:09 -04:00
397c1322b4 Base support for TraceNG. 2018-03-12 17:57:13 +07:00
148baaf465 Back to development on v2.1.5dev1 2018-03-12 11:27:02 +01:00
aaac2a2d93 Fix issue with temporary travis deploy issues 2018-03-12 09:43:57 +01:00
e54a94240d Re-release v2.1.4 2018-03-12 09:40:42 +01:00
4ca216b181 Development on v2.1.5dev1 2018-03-12 09:26:07 +01:00
e417ee8fed Release v2.1.4 2018-03-12 09:19:18 +01:00
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
3201a996ed Add Juniper JunOS space appliance. 2018-03-11 23:02:43 +07:00
1df03d052f Sync checkpoint gaia appliance template. 2018-03-09 15:41:17 +07:00
da31358a65 Sync appliance templates. 2018-03-09 15:26:40 +07:00
0bd7736460 Make sure we use an IPv4 address in the remote install script. 2018-03-08 21:09:00 +07:00
38f458db7c Delete old pcap file when starting a new packet capture. 2018-03-08 16:00:05 +07:00
233e41d006 Fix export project test. 2018-03-08 00:39:08 +07:00
22db13d2bf Fix bug preventing to export portable projects with IOU images. 2018-03-08 00:13:35 +07:00
0fde1cf54a Ignore invalid BPF filters. Ref #1290. 2018-03-07 21:37:15 +07:00
00e781826b Different approach to handle no data returned by uBridge hypervisors. Fixes #1289. 2018-03-07 19:42:19 +07:00
7c14e21f4a Different approach to handle no data returned by Dynamips or uBridge hypervisors. Fixes #1289. 2018-03-07 19:33:19 +07:00
a3a0657502 Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289 2018-03-07 19:11:34 +07:00
3ca4f72b99 Fix Dynamips private config not loaded into nvram when starting a router. Fixes #1313. 2018-03-07 18:18:51 +07:00
d911e82dc4 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-03-07 16:42:12 +07:00
c93d0d8d12 Make sure we don't try to read when opening a file in binary more. Fixes #1301. 2018-03-07 16:39:04 +07:00
2a5f3221b9 Merge pull request #1314 from GNS3/pyup-update-pytest-3.4.1-to-3.4.2
Update pytest to 3.4.2
2018-03-06 09:24:58 +01:00
78ea230673 Update pytest from 3.4.1 to 3.4.2 2018-03-06 04:57:22 +01:00
53a229f8e9 Fix never reached condition 2018-03-05 11:16:03 +01:00
419797dd92 Merge pull request #1312 from GNS3/controller-compat
Compatybility with controller, default_symbol and hover_symbol, Fixes…
2018-03-02 13:49:32 +01:00
05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
c714c9c8de Merge pull request #1310 from GNS3/fix-1297
Filter snapshots directory during the snapshot, Fixes: #1297
2018-02-28 16:40:18 +01:00
9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
9e73ca6620 Merge pull request #1309 from GNS3/fix-2420
Handle docker env with last empty line, Fixes: #2420
2018-02-27 16:41:24 +01:00
e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
7beae4e451 Merge pull request #1308 from GNS3/pywin32-dep
Pywin32 instead of pypiwin32, Ref. #1276
2018-02-27 09:27:54 +01:00
a0f2dd374e Require uBridge version 0.9.14 on Linux 2018-02-26 23:18:44 +07:00
b1657996e3 Pywin32 instead of pypiwin32, Ref. #1276 2018-02-26 16:25:31 +01:00
835bc24b44 Merge pull request #1304 from GNS3/pyup-update-sphinx-1.6.6-to-1.7.1
Update sphinx to 1.7.1
2018-02-26 09:14:40 +01:00
e83ed3b4b5 Merge pull request #1295 from ehlers/fix_cpuload
Implement a minimum interval between psutil calls. Fixes #2262
2018-02-26 13:08:10 +06:30
603442509a Update sphinx from 1.6.6 to 1.7.1 2018-02-23 19:59:09 +01:00
89b352890c Merge pull request #1303 from GNS3/pyup-update-pytest-3.3.2-to-3.4.1
Update pytest to 3.4.1
2018-02-21 11:59:38 +01:00
56b901a831 pytest.ini for ignoring files and recording DEBUG level in tests 2018-02-21 11:05:50 +01:00
1b3065750d .pytest_cache into .gitignore 2018-02-21 10:27:01 +01:00
f1d8ee30cd pytest-catchlog merged into the core 2018-02-21 10:26:30 +01:00
2111f549c9 Merge pull request #1302 from nabilbendafi/master
Fix missing 'locales' package in base image
2018-02-21 10:14:01 +01:00
629c7be395 Update pytest from 3.3.2 to 3.4.1 2018-02-21 03:03:33 +01:00
3a15839272 Fix missing 'locales' package in base image
`/bin/sh: 1: locale-gen: not found`
2018-02-20 16:43:22 +01:00
3a09bd43dc Implement a minimum interval between psutil calls. Fixes #2262 2018-02-13 11:31:04 +01:00
17422bc461 Fix appliance loading test (missing category). 2018-02-06 16:55:40 +08:00
935b8981ea Fix appliance loading test. 2018-02-06 16:15:34 +08:00
fff593b358 Fix error when appliance template is broken (missing fields). Fixes #1287. 2018-02-06 16:07:23 +08:00
abbe3d3a31 Fix "Change of linked base VM doesn't work with templates migrated from 2.0" 2018-02-05 16:42:29 +08:00
52b690b683 Fix "Unable to override non-custom VMware adapter". 2018-02-04 22:08:41 +08:00
654aa18d09 Fix get_port test. 2018-02-02 22:14:50 +08:00
519df3ab35 Let a project be opened when a port cannot be found (can happens if a project is corrupted). 2018-02-02 22:05:51 +08:00
4ba523a0d7 Add an error message when Docker container is not ready to be started. Ref #1281. 2018-02-02 16:29:08 +08:00
07d2d7b340 Update documentation. 2018-01-31 23:37:02 +07:00
e5a4afaeb1 Sync appliance files. 2018-01-31 19:05:03 +07:00
3802a3d70b Fix more IOU tests. 2018-01-31 16:34:41 +07:00
0ee87c9110 Fix IOU tests. 2018-01-31 16:12:55 +07:00
e5c76750b1 Fix issue when running multiple project containing IOU nodes on the same server. Ref #1239. 2018-01-31 15:51:29 +07:00
1045364adc Set first byte to 52 when generating a random MAC address for a Qemu VM. Ref #1267. 2018-01-30 18:26:38 +07:00
008baad86a Update link state and save project when a link is suspended or filters are added/removed (without node properties set). 2018-01-30 17:39:33 +07:00
c0ff37039d Merge pull request #1278 from GNS3/pyup-update-pytest-3.2.5-to-3.3.2
Update pytest to 3.3.2
2018-01-30 09:00:17 +01:00
29b9b0431c Merge branch '2.2' into pyup-update-pytest-3.2.5-to-3.3.2 2018-01-30 09:00:08 +01:00
cf5b24e829 Merge pull request #1279 from GNS3/pyup-update-pep8-1.7.0-to-1.7.1
Update pep8 to 1.7.1
2018-01-30 08:59:06 +01:00
f9853a1cc3 Merge pull request #1280 from GNS3/pyup-update-pytest-timeout-1.2.0-to-1.2.1
Update pytest-timeout to 1.2.1
2018-01-30 08:58:47 +01:00
d14e3d084d Update pytest-timeout from 1.2.0 to 1.2.1 2018-01-30 08:58:07 +01:00
53e36d1ed5 Update pep8 from 1.7.0 to 1.7.1 2018-01-30 08:58:03 +01:00
403645d2f0 Update pytest from 3.2.5 to 3.3.2 2018-01-30 08:57:47 +01:00
9921db2183 Merge branch '2.1' into 2.2 2018-01-30 08:53:23 +01:00
4f2a50894b Merge pull request #1277 from GNS3/av-pywin32
Fix AppVeyor crashes with pypiwin32-222 Ref. #1276
2018-01-30 08:52:35 +01:00
62e03148c1 Merge pull request #1275 from GNS3/async-md5-calcs
Calculate MD5 on thread and before json response, Ref. gui#2239
2018-01-29 23:28:11 +07:00
889aa3ba94 More generic dependency for pypiwin32, Ref. #1276 2018-01-29 15:26:45 +01:00
cbb15c7a84 Check if locking version of pypiwin32==220 helps, Ref. #1276 2018-01-29 15:16:38 +01:00
8268e76a86 Check if passes tests on 2.1 2018-01-29 15:09:03 +01:00
bb26e8acdd Calculate MD5 on thread and before json response, Ref. gui#2239 2018-01-29 14:20:48 +01:00
1582ac3195 Merge branch '2.2' into async-md5-calcs 2018-01-29 13:01:45 +01:00
7fe6508e73 Merge pull request #1274 from GNS3/asyncio-ensure-future
Conservative approach to supported versions of Python 3.4 and asyncio…
2018-01-29 12:21:41 +01:00
eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
dc377165f2 Cancellable md5sum calculation on thread, Ref. gui#2239 2018-01-29 10:18:13 +01:00
6868e20a70 Compute md5sum on thread and don't block main server, Ref. gui#2239 2018-01-26 12:53:48 +01:00
3c5ca9ce0e Merge pull request #1270 from GNS3/replace-async-with-ensure-future
Replace asyncio.async with ensure_future because of deprecation, Fixe…
2018-01-24 11:18:10 +01:00
d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
838d82a98b Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2018-01-24 10:55:08 +01:00
05983f2838 Fix test_open_auto_start test 2018-01-24 10:54:56 +01:00
c532e6392d Merge pull request #1257 from GNS3/pyup-update-sphinx-1.6.2-to-1.6.6
Update sphinx to 1.6.6
2018-01-24 10:15:07 +01:00
e05f93abd3 Merge pull request #1268 from GNS3/pyup-pin-prompt-toolkit-1.0.15
Pin prompt-toolkit to latest version 1.0.15
2018-01-24 10:14:57 +01:00
daf058a306 Merge tag 'v2.1.3' 2018-01-24 10:09:31 +01:00
647c1dbb05 Pin prompt-toolkit to latest version 1.0.15 2018-01-23 06:47:36 +01:00
28f8216590 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-01-23 12:47:13 +07:00
e54ccc26b0 Bump to version 2.2.0dev1 & refresh resources/ui files. 2018-01-23 11:36:57 +07:00
f7d82059d5 Development on v2.1.4dev1 2018-01-19 07:18:00 +01:00
d2faaee099 Release v2.1.3 2018-01-19 07:15:39 +01:00
6fee543ce7 Fix more client/server version tests. 2018-01-18 16:14:09 +08:00
2e40fb8608 Fix client/server version test. 2018-01-18 16:04:31 +08:00
d4f1084391 Bump version number to 2.1.3dev1 2018-01-18 15:32:06 +08:00
b792be00f9 Merge tag 'v2.1.2' 2018-01-18 08:29:40 +01:00
cf4477ce34 Merge remote-tracking branch 'origin/unlock-yarl' into 2.1 2018-01-18 12:10:19 +08:00
f525bd2ce1 Update appliance files. 2018-01-18 11:57:48 +08:00
bd8816d14c Suspend for Docker nodes. 2018-01-18 11:43:04 +08:00
34acb1f185 Unlock yarl version and multidict 2018-01-17 10:26:22 +01:00
7ded71142f Fix same MAC address for duplicated Qemu nodes. 2018-01-17 14:13:06 +08:00
c281f55fb2 Fix same base MAC for duplicated IOS routers. Fixes #1264. 2018-01-17 14:01:44 +08:00
e5e2b7a8ac Fix "Creating multiple IOU nodes at once assigns the same application id". Fixes #1239. 2018-01-15 18:09:05 +07:00
30e8949985 Fix "Transport selection via DSN is deprecated" message. Sync is configured with HTTPTransport. 2018-01-15 16:56:15 +07:00
393ac85bca Merge remote-tracking branch 'origin/2.1' into 2.1 2018-01-15 14:42:25 +07:00
9d9dc037d8 Refresh CPU/RAM info every 1 second. Ref #2262. 2018-01-15 14:42:01 +07:00
32f56feca2 Merge pull request #1263 from ddragic/eth_switch_cmd
Rename ethernet switch shell command arp to mac
2018-01-15 08:20:39 +01:00
5d86f06390 Rename ethernet switch arp command to mac, also rename in test 2018-01-14 17:50:21 +01:00
6789989cb9 Rename ethernet switch arp command to mac 2018-01-14 17:10:26 +01:00
ffc7024b64 Fix error while getting appliance list. Fixes #1258. 2018-01-14 20:29:17 +07:00
ed275e4ec5 Fix UnboundLocalError: local variable 'node' referenced before assignment. Fixes #1256. 2018-01-14 19:06:35 +07:00
4143ee8178 first commit 2018-01-14 10:52:59 +07:00
88989cc274 Default symbol must be computer.svg 2018-01-12 21:46:48 +07:00
ab6fe6da1d Compatibility for old node templates (those with default_symbol and hover_symbol properties). 2018-01-12 17:34:37 +07:00
8b1c68a0b7 Fix problem when searching for VBoxManage. Fixes #1261. 2018-01-12 13:17:16 +07:00
97cfb892a6 Improve the search for VBoxManage. 2018-01-11 16:33:15 +07:00
f9c7c15f95 Fixing race condition when starting the GNS3 VM. 2018-01-10 16:22:55 +07:00
5f14f8eb46 Default VPCS name format is now PC-{0}. 2018-01-09 23:40:35 +07:00
7c91e46812 Development on v2.1.3dev1 2018-01-08 14:21:04 +01:00
588339487f Update sphinx from 1.6.2 to 1.6.6 2018-01-08 14:10:17 +01:00
6af64454d0 Release v2.1.2 2018-01-08 14:09:59 +01:00
47ef7e2a5e Merge remote-tracking branch 'origin/2.1' into 2.1 2018-01-08 18:08:45 +07:00
927f7e6b9d Do not show log message if configuration file doesn't exist. Fixes #1206. 2018-01-08 18:07:15 +07:00
9ca56964f5 Merge pull request #1255 from ehlers/update-docs
Update API documentation
2018-01-08 02:46:06 -08:00
e6d2bd4424 Update API documentation 2018-01-08 09:26:44 +01:00
21a7a68875 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-01-08 11:57:24 +07:00
ffe21f6b73 Update API documentation. Fixes #1253. 2018-01-08 11:57:07 +07:00
266916b092 Merge pull request #1252 from ehlers/api_links_drawings
GNS3-API: implement GET for specific drawing and link
2018-01-07 06:12:24 +01:00
8907b3d58a GNS3-API: implement GET for specific drawing and link
Fixes #1249
2018-01-05 13:44:46 +01:00
d80e01a9c5 Development on v2.1.2dev1 2017-12-22 13:29:18 +01:00
5dd0414ab3 Release v2.1.1 2017-12-22 13:27:20 +01:00
e8353e68bb Merge remote-tracking branch 'origin/2.1' into 2.1 2017-12-21 09:38:28 +01:00
23c63bbd4d Protect variable replacement for Qemu options. Escape double quotes. 2017-12-21 09:38:18 +01:00
dadf11f69b Fix tests 2017-12-21 09:37:48 +01:00
3efe753eee Add proper exception when cannot find tunnel on QEMU, Fixes: #1241 2017-12-21 08:55:49 +01:00
f48420af58 Increase timeout for creation of image, Ref. #2239 2017-12-21 08:46:20 +01:00
79bca29b93 Protect variable replacement for Qemu options. 2017-12-20 20:46:16 +01:00
0e4865e049 Bump version to 2.1.1dev2 2017-12-20 11:20:07 +01:00
26567d9164 Merge remote-tracking branch 'origin/2.1' into 2.1 2017-12-18 12:08:23 +01:00
a8177d7afa Fix tests more reliably. Ref #0df997d. 2017-12-18 12:08:14 +01:00
a393e7f723 Merge pull request #1205 from GNS3/aiohttp-2.3.1
aiohttp 2.3 support.
2017-12-18 11:09:16 +01:00
0df997d232 Fix tests. 2017-12-17 23:06:19 +01:00
630afc5469 Do not overwrites persistent Docker volumes. Fixes #2358. 2017-12-17 22:35:26 +01:00
3e3e1df051 Allow users to see an error when the server cannot stream a PCAP file. 2017-12-07 12:28:01 -06:00
3a1ba8f42d Fix issue with Qemu + SPICE when IPv4 is not enabled. 2017-12-07 12:02:41 -06:00
0a72e0db87 Fix more GNS3 VM related tests. 2017-12-05 20:38:48 -06:00
e3b3427cc6 Fix GNS3 VM start test. 2017-12-05 20:30:28 -06:00
dde2003168 Fix tests. 2017-12-05 16:56:50 -06:00
cfe8e9e85c Warn users if the GNS3 VM and local server are not in the same subnet. Fixes #1231. 2017-12-05 16:43:44 -06:00
6e2752648a Implement #1153 into 2.2 branch. 2017-11-27 15:16:46 +07:00
09b1cac676 Merge remote-tracking branch 'origin/2.2' into 2.2
# Conflicts:
#	requirements.txt
2017-11-27 14:21:02 +07:00
1699ce5d1c Add missing appliance files. 2017-11-27 13:43:47 +07:00
d0850927d0 Update appliance files. 2017-11-27 13:42:26 +07:00
745532bf23 Fix auto idlepc test. 2017-11-23 23:46:22 +07:00
78cf0309a0 Merge remote-tracking branch 'origin/2.1' into 2.1 2017-11-23 23:29:09 +07:00
851fcf5c71 Fix compute auto idlepc test. 2017-11-23 23:28:52 +07:00
a80355998d Merge pull request #1230 from GNS3/consitance-about-exc
Keep consistance of aiohttp.web.HTTPForbidden() execution
2017-11-23 23:02:42 +07:00
e54d574e47 Fix auto idle-pc from preferences. 2017-11-23 23:00:31 +07:00
e754db950d Merge pull request #1219 from GNS3/pyup-update-pytest-3.1.1-to-3.2.5
Update pytest to 3.2.5
2017-11-23 16:46:31 +01:00
68d8fecc36 Merge pull request #1220 from GNS3/pyup-pin-prompt-toolkit-1.0.15
Pin prompt-toolkit to latest version 1.0.15
2017-11-23 16:39:57 +01:00
5a6b0cc07b Keep at least this version 2017-11-23 16:39:15 +01:00
fe60c414b9 Keep consistance of aiohttp.web.HTTPForbidden() execution 2017-11-23 16:28:10 +01:00
efbf7728ea Fix Docker tests. 2017-11-23 11:27:17 +07:00
061af38b5a Make sure connected links are removed when a node is deleted. 2017-11-23 11:19:41 +07:00
f48549a997 Validate idle-pc values for auto idle-pc feature. 2017-11-23 10:40:51 +07:00
958ab2294c Merge remote-tracking branch 'origin/2.1' into 2.1 2017-11-23 10:04:46 +07:00
dd89b09f84 Fix error when updating packet filter on stopped Docker link. Fixes #1229. 2017-11-23 10:04:32 +07:00
642536a070 Merge pull request #1228 from GNS3/es-console
Close telnet console after stopping the node. Ref gui/#2330
2017-11-20 22:02:58 +07:00
860ca3b35d Remotely close telnet console. Ref #2330 2017-11-20 15:28:07 +01:00
96a0b52cf8 EthernetSwitch closing connections, Ref: gui/#2330 2017-11-20 13:51:07 +01:00
7c90c513d0 Merge pull request #1227 from GNS3/improved-export-project
Export files from remote server, Fixes: gui/#2271
2017-11-20 17:19:20 +07:00
fe59c937d5 Merge branch '2.1' into improved-export-project 2017-11-20 11:15:04 +01:00
b48f5df53f iExport files from remote server, Fixes: gui/#2271 2017-11-20 10:47:03 +01:00
3e2e8e61f7 New option: require KVM. If false, Qemu VMs will not be prevented to run without KVM. 2017-11-19 12:39:37 +07:00
068077c594 Remove forgotten debug. 2017-11-18 17:36:39 +07:00
e08aebf1f0 Implement variable replacement for Qemu VM options. 2017-11-18 17:36:11 +07:00
cfbcc1194d Avoid duplicate "-nographic" option. 2017-11-18 16:22:29 +07:00
035a078b5e Show qemu-img stdout in case of an error. 2017-11-17 18:13:34 +07:00
cf14deb2fa Fix IOU tests. 2017-11-16 17:07:51 +07:00
e1fe34ca07 Use the correct NVRAM amount when pushing private config to IOU. 2017-11-16 16:52:19 +07:00
840aa39457 Merge remote-tracking branch 'origin/2.1' 2017-11-16 15:04:33 +07:00
d3e55520d9 Merge remote-tracking branch 'remotes/origin/master' into 2.1 2017-11-16 15:03:20 +07:00
fb2e10d3c1 Merge remote-tracking branch 'remotes/origin/master' 2017-11-16 14:59:57 +07:00
4477cd4dfd Merge remote-tracking branch 'origin/2.1' 2017-11-16 14:54:53 +07:00
967798a7de Check and fix corrupt Qemu disk images. Fixes #2301. 2017-11-16 14:54:37 +07:00
0ce5b80a1d Pin prompt-toolkit to latest version 1.0.15 2017-11-15 13:20:52 +01:00
61acb939a4 Update pyup config to use 2.2 branch 2017-11-15 13:20:31 +01:00
49f1ef9693 Update pytest from 3.1.1 to 3.2.5 2017-11-15 13:17:57 +01:00
8c11b649e5 Update warning messages when connecting to non custom adapter for VMware VMs. 2017-11-15 16:55:19 +07:00
b14e2e73ed Fix "Can't use VirtualBox VM when an interface is managed by VirtualBox". Fixes #2335. 2017-11-15 16:41:33 +07:00
2235a8158f Update requirements.txt 2017-11-15 09:00:14 +01:00
9afe756462 Add low disk space warning when creating a new project. 2017-11-14 18:22:59 +07:00
135c529d4b Development on 2.1.1dev1 2017-11-09 10:49:56 +01:00
ce219e81ea Development on 2.1.0dev11 2017-11-09 10:48:48 +01:00
c2684f056c Release 2.1.0 2017-11-09 07:29:46 +01:00
009677f019 Fix typo in vcpus on VirtualBoxVM, fixes: #1213 2017-11-07 11:15:49 +01:00
9c3ee02797 Development on v2.1.0dev10 2017-11-07 10:19:19 +01:00
50c8fe070d Release v2.1.0rc4 2017-11-07 08:47:40 +01:00
ace7b0c69f Merge pull request #1212 from GNS3/fix-vcpus-controll-on-vmware
Fix GNS3VM vCPUs control on VMware, fixes: #2324
2017-11-06 23:46:04 +08:00
255dc7ed9b Fix GNS3VM vCPUs control on VMware, fixes: #2324 2017-11-06 15:15:37 +01:00
75ceffb458 Fix typo in sample gns3_server.conf. Fixes #1210. 2017-11-03 16:15:03 +08:00
21c2429aee Merge pull request #1209 from GNS3/ignore-env
Ignore env files
2017-10-30 17:43:39 +07:00
8cc04f25e2 Merge pull request #1208 from GNS3/info-about-api
Warning for getting endpoint of compute
2017-10-30 17:41:31 +07:00
815dca101f Ignore env files 2017-10-30 11:30:06 +01:00
022d76e88a Warning for getting endpoint of compute 2017-10-30 11:26:57 +01:00
2c0804d4ee Merge pull request #1204 from GNS3/loop-speed-on-win
Disable loop debug on default
2017-10-27 16:43:54 +07:00
b2c5e175d7 Enable debug loop only on debug mode 2017-10-27 11:19:06 +02:00
a7412d1c87 aiohttp 2.3.1 dependency 2017-10-26 16:29:01 +02:00
2171072ae4 Enable debug mode on async loop only in dev/debug mode 2017-10-26 12:24:01 +02:00
8fcfed53ed Add warning when using IOU with a hostname length above 15 characters. 2017-10-24 15:07:32 +07:00
df468bf2af Improve VMware VMs discovery process. Ref #1201. 2017-10-22 17:33:21 +07:00
8930b4c6e5 Improve error message when IOU VM process is unexpectedly stopped. 2017-10-22 16:28:54 +07:00
b4307e6035 Improved error message when the number of network adapters is above the maximum for VirtualBox VMs.
Better support for potential future chipsets in addition of PIIX3 and ICH9.
2017-10-22 15:23:43 +07:00
6a87047c18 Added localhost and gns3.github.io CORS 2017-10-20 13:21:43 +02:00
d918330472 Back to dev. at 2.1.0dev9 2017-10-20 08:37:47 +02:00
8fde8789f1 Fix Travis deployment 2017-10-19 09:57:52 +02:00
aaa8c4895f Development on 2.1.0dev9 2017-10-19 08:58:28 +02:00
66d5cb520d Release 2.1.0 rc3 2017-10-19 08:56:06 +02:00
d2a7f724e3 Merge pull request #1198 from GNS3/vmware-config
Set vhv.enable before run for VMware. Fixes #1184
2017-10-18 17:42:56 +07:00
c7015435c9 Update vmware_gns3_vm.py 2017-10-18 15:53:37 +07:00
44efab109e Set vhv.enable before run for VMWare 14. Fixes #1184 2017-10-18 10:32:56 +02:00
98b201e9e5 Tweak how VMware VMs are found with fallback to search in the default location for VMs. 2017-10-18 15:27:03 +07:00
1f4b87ae9c Merge pull request #1197 from GNS3/fix-win-tests
fix passing tests on Windows
2017-10-16 19:44:22 +08:00
bc782b6896 fix passing tests on Windows 2017-10-16 13:02:44 +02:00
4cae6b678a Merge pull request #1194 from GNS3/direct-file-uploads
Endpoint for obtaining direct action on compute
2017-10-16 17:27:35 +08:00
3a5a771b19 Merge pull request #1195 from ddragic/qemu-log-macaddress
QEMU: fix logging of base mac address when creating a new node
2017-10-14 16:00:22 +02:00
44bb912139 QEMU: fix logging of base mac address when creating a new node 2017-10-14 13:55:16 +02:00
74e7201ea6 Sync appliance files. 2017-10-13 17:56:42 +08:00
4f13c63a52 Do not use builtin name. 2017-10-13 17:51:19 +08:00
02ad98664f Fix creation of an VMware VM failed with invalid JSON. Fixes #2282. 2017-10-13 17:50:23 +08:00
b654d78ea6 Endpoint for obtaining direct action on compute 2017-10-13 11:03:56 +02:00
244a86bcbc Merge remote-tracking branch 'origin/2.1' into 2.1 2017-10-12 23:33:00 +08:00
1524493c33 Fix IOU detection of layer 1 keepalive support. Fixes #1183. 2017-10-12 23:32:45 +08:00
e52b83be11 Merge pull request #1192 from GNS3/travis-docker-tests
Tests on TravisCI with docker compose
2017-10-12 01:52:03 -07:00
0c7a92b710 Tests on TravisCI with docker compose 2017-10-12 10:40:49 +02:00
67c78ba2e3 Merge pull request #1188 from GNS3/fix-post-file-normalization
Fixes path normalization during file upload on nodes (Fixes: #2276)
2017-10-05 02:07:02 -07:00
9619827f44 Reenable tests and back to development on 2.1.0dev8 2017-10-04 13:05:00 +02:00
5b645cd455 Temporary disable passing tests 2017-10-04 12:58:53 +02:00
7d19312d44 Development on 2.1.0dev8 2017-10-04 11:39:52 +02:00
81048f44d6 Release 2.1.0 rc2 2017-10-04 11:37:12 +02:00
be35ad6874 Fixes path normalization during file upload on nodes (Fixes: #2276) 2017-10-03 18:13:19 +02:00
897f7656da Merge pull request #1185 from GNS3/fix-delete-project
Don't create directory structure during json dump. Fixes #2270
2017-10-02 13:49:46 -07:00
3d85bba9d4 Don't create directory structure during json dump. Fixes #2270 2017-10-02 10:41:57 +02:00
dbd41e44f8 Bump version to 2.1.0dev7 2017-10-02 04:04:38 +08:00
7269285b0f Add more information when qemu-img fails. 2017-10-02 00:47:16 +08:00
2a4ed9ba89 Fix issue with multidict when upgrading GNS3 VM to use dev channel. 2017-09-23 18:09:10 +08:00
a567b394f3 Restore file permissions fails for volumes with soft links. Fixes #1180. 2017-09-21 22:45:17 +08:00
d76bcf7078 Use RAW sockets by default on Linux. 2017-09-19 12:39:55 +07:00
fcd2c7b6d4 Add missing https console keyword in JSON schema. Fixes #1179. 2017-09-19 12:38:35 +07:00
60bc386d6b Merge remote-tracking branch 'origin/2.1' into 2.1 2017-09-14 17:58:25 +07:00
e1c8df170a Allow projects to be opened even when a node port is already used. 2017-09-14 17:57:58 +07:00
cdfce26b61 Development on v2.1.0dev6 2017-09-13 09:31:30 +02:00
f415d38ccd Release v2.1.0rc1 2017-09-13 09:29:31 +02:00
6a8f220ff1 Fix NAT test. 2017-09-11 15:09:32 +07:00
9e4cfaf787 Fix NAT node not working on Windows. Fixes #1163. 2017-09-11 13:02:26 +07:00
4a2dfb0037 Do not prevent a project to be deleted. Fixes #2237. 2017-09-06 18:12:22 +07:00
b538bd0a29 Back to development on v2.1.0dev5 2017-09-05 15:22:49 +02:00
36210b10c6 Re-release 2.1.0b2 2017-09-05 11:22:43 +02:00
fd623a5ad2 Fix test_ubridge_apply_filters 2017-09-05 11:07:10 +02:00
e5a7eb74ed Fix project tests 2017-09-05 10:38:17 +02:00
daf7ed8c95 Development on 2.1.0dev5 2017-09-05 08:39:53 +02:00
1f87d8222b Release 2.1.0 beta 2 2017-09-05 08:38:42 +02:00
90e3a8d612 Round-robin nodes across all available compute resources. Fixes #1165. 2017-09-03 22:51:51 +07:00
c22229101f Try to improve error reporting when streaming a PCAP file. Ref #2235. 2017-09-01 17:10:24 +07:00
ee486b32bd Use Npcap DLL on Windows when checking for uBridge version. 2017-09-01 16:22:43 +07:00
7492899b95 Merge pull request #1173 from GNS3/console-tests
Windows console bugfix tests
2017-08-29 17:45:29 +07:00
807bea40d4 Fixes running switch console inside PyCharm terminal (Ref. #1172) 2017-08-29 12:28:53 +02:00
4e3eee33fc Windows console bugfix tests 2017-08-29 10:08:10 +02:00
a7297ffca4 Merge pull request #1169 from GNS3/checking-nio-existance
Added checking if NIO exists (Fixes #1160)
2017-08-25 16:34:44 +08:00
2806b7b286 Merge pull request #1170 from GNS3/load-meta-when-project-opens
Load meta of the project on loading time (Fixes #2225)
2017-08-25 16:30:23 +08:00
b0783eeccc Load meta of the project on loading time (Fixes #2225) 2017-08-22 09:36:52 +02:00
4fc29504f2 Merge pull request #1168 from GNS3/nat-on-windows
Fixes NAT node not working on Windows (#1163)
2017-08-21 14:24:05 +02:00
efae614af2 Added checking if NIO exists (Fixes #1160) 2017-08-21 11:03:23 +02:00
7523e9c4bc Fixes NAT node not working on Windows (#1163) 2017-08-21 10:17:56 +02:00
3dd5dbe0c1 Merge pull request #1161 from GNS3/empty-link-on-compute
Fixes loading project when link_id is not set (#1159)
2017-08-10 22:09:49 +08:00
e15d1cd350 Fixes loading project when link_id is not set (#1159) 2017-08-10 10:02:18 +02:00
fc7377e999 Merge pull request #1158 from GNS3/platform-on-appliances-list
Return platform value on appliances list (Fixes #2211)
2017-08-08 22:16:40 +08:00
3fd86f5807 Return platform value on appliances list (Fixes #2211) 2017-08-08 13:58:43 +02:00
fc9d44011b Merge pull request #1157 from GNS3/bugfix-1156
Fixes not known category in Appliances (Fixes #1156)
2017-08-07 16:46:14 +08:00
3a1fd892ac Fixes not known category in Appliances (Fixes #1156) 2017-08-07 10:00:46 +02:00
3caba334c0 Development on 2.1.0dev4 2017-08-04 11:39:31 +02:00
e2de872036 Release 2.1.0 beta 1 2017-08-04 11:38:33 +02:00
44fc87a24c Sync appliances 2017-08-04 10:59:05 +02:00
2dc83d7894 Interface starting with gns3 are not display by default in the cloud
Fix https://github.com/GNS3/gns3-gui/issues/2199
2017-08-03 16:33:42 +02:00
211f48d981 Catch error when something that is not the GNS3 server answer to virtualbox requests
Fix #1155
2017-08-03 16:31:28 +02:00
3bb8cdafb2 Catch KeyError: <aiohttp.connector._TransportPlaceholder
Fix #1152
2017-08-02 10:16:49 +02:00
e74eaa8ea8 Add a warning when you try to load and the server is not started with --local
Ref #1151
2017-08-02 09:52:31 +02:00
8a028a6dce Merge pull request #1147 from GNS3/fix_docker_permission
Fix permission on exited container
2017-08-01 00:30:56 +08:00
1cde787ffa Sync appliances 2017-07-31 15:12:06 +02:00
81d77cabf9 Development on 2.1.0dev3 2017-07-31 11:57:45 +02:00
a93f3b0576 Fix permission on exited container
If a container is exited we quickly start it to fix
the permissions.

Fix https://github.com/GNS3/gns3-gui/issues/2181
2017-07-26 14:52:16 +02:00
1581 changed files with 104712 additions and 21904 deletions

View File

@ -0,0 +1,16 @@
name: Add new issues to GNS3 project
on:
issues:
types:
- opened
jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.4.0
with:
project-url: https://github.com/orgs/GNS3/projects/3
github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}

70
.github/workflows/codeql-analysis.yml vendored Normal file
View File

@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '44 1 * * 3'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

View File

@ -0,0 +1,43 @@
name: publish-api-documentation
on:
workflow_dispatch:
push:
tags:
- v3.*
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: "gh-pages"
- uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Merge changes from 3.0 branch
run: |
git config user.name github-actions
git config user.email github-actions@github.com
git merge origin/3.0 -X theirs
- name: Install dependencies
run: |
python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Install GNS3 server
run: |
python setup.py install
- name: Generate the API documentation
run: |
cd scripts
python3 publish_api_documentation.py
- name: Publish the API documentation
run: |
git add docs
git status
git commit -m "Publish API documentation"
git push

39
.github/workflows/testing.yml vendored Normal file
View File

@ -0,0 +1,39 @@
name: testing
on:
push:
branches:
- master
- 2.2
pull_request:
branches:
- master
- 2.2
jobs:
build:
runs-on: ubuntu-20.04 # Downgrade Ubuntu to 20.04 to fix missing Python 3.6
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest -vv

5
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.py[cod]
__pycache__
.pytest_cache
#py.test
.cache
@ -39,6 +40,7 @@ nosetests.xml
.project
.pydevproject
.settings
.vscode
# Pycharm
.idea
@ -55,5 +57,6 @@ startup.vpcs
.gns3_shell_history
# Virtualenv
env.ropeproject
env
venv
.ropeproject

View File

@ -1,2 +0,0 @@
branch:
2.0

View File

@ -1,22 +0,0 @@
language: python
python:
- '3.4'
- '3.5'
- '3.6'
sudo: false
cache: pip
install:
- pip install -U setuptools pip
- python setup.py install
- pip install -rdev-requirements.txt
script:
- mkdir ‡
- py.test -v -s tests --basetemp=‡
deploy:
provider: pypi
user: noplay
password:
secure: Fa66zp8ML4oSGwzkUMZi07MIYfO3tbS5gHFUaLN2mk2MBknhCjDYexmFJqT//sC/+xqv6sSJE6rz1EPoy/THbxj8R96ZgIyiUZIbDCbzgdy92d7J/eusrDoNdpApBLke8NqQqtFETb3addMZZNofQ3IDANFD2m2jY+KECU8z8NI=
on:
tags: true
repo: GNS3/gns3-server

14
.whitesource Normal file
View File

@ -0,0 +1,14 @@
{
"scanSettings": {
"configMode": "AUTO",
"configExternalURL": "",
"projectToken" : "",
"baseBranches": ["master", "2.2", "3.0"]
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure"
},
"issueSettings": {
"minSeverityLevel": "LOW"
}
}

990
CHANGELOG

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,10 @@
# Dockerfile for GNS3 server development
FROM ubuntu:16.04
FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive
# Set the locale
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
@ -13,22 +12,24 @@ ENV LC_ALL en_US.UTF-8
RUN apt-get update && apt-get install -y software-properties-common
RUN add-apt-repository ppa:gns3/ppa
RUN apt-get update && apt-get install -y \
locales \
python3-pip \
python3-dev \
qemu-system-x86 \
qemu-system-arm \
qemu-kvm \
libvirt-bin \
x11vnc
RUN locale-gen en_US.UTF-8
# Install uninstall to install dependencies
RUN apt-get install -y vpcs ubridge
ADD . /server
WORKDIR /server
RUN pip3 install -r /server/requirements.txt
RUN pip3 install --no-cache-dir -r /server/requirements.txt
EXPOSE 3080
CMD python3 -m gns3server --local
CMD python3 -m gns3server

View File

@ -1,10 +1,9 @@
include README.rst
include README.md
include AUTHORS
include INSTALL
include LICENSE
include MANIFEST.in
include tox.ini
include requirements.txt
include conf/*.conf
recursive-include tests *
recursive-exclude docs *
recursive-include gns3server *

257
README.md Normal file
View File

@ -0,0 +1,257 @@
GNS3-server
===========
[![image](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting)
[![image](https://img.shields.io/pypi/v/gns3-server.svg)](https://pypi.python.org/pypi/gns3-server)
[![image](https://snyk.io/test/github/GNS3/gns3-server/badge.svg)](https://snyk.io/test/github/GNS3/gns3-server)
This is the GNS3 server repository.
The GNS3 server manages emulators such as Dynamips, VirtualBox or
Qemu/KVM. Clients like the [GNS3 GUI](https://github.com/GNS3/gns3-gui/)
and the [GNS3 Web UI](https://github.com/GNS3/gns3-web-ui) control the
server using an HTTP REST API.
Software dependencies
---------------------
In addition of Python dependencies listed in a section below, other
software may be required, recommended or optional.
- [uBridge](https://github.com/GNS3/ubridge/) is required, it
interconnects the nodes.
- [Dynamips](https://github.com/GNS3/dynamips/) is required for
running IOS routers (using real IOS images) as well as the internal
switches and hubs.
- [VPCS](https://github.com/GNS3/vpcs/) is recommended, it is a
builtin node simulating a very simple computer to perform
connectitivy tests using ping, traceroute etc.
- Qemu is strongly recommended on Linux, as most node types are based
on Qemu, for example Cisco IOSv and Arista vEOS.
- libvirt is recommended (Linux only), as it\'s needed for the NAT
cloud.
- Docker is optional (Linux only), some nodes are based on Docker.
- mtools is recommended to support data transfer to/from QEMU VMs
using virtual disks.
- i386-libraries of libc and libcrypto are optional (Linux only), they
are only needed to run IOU based nodes.
### Docker support
Docker support needs the script program (bsdutils or
util-linux package), when running a docker VM and a static
busybox during installation (python3 setup.py install / pip3 install /
package creation).
Branches
--------
### master
master is the next stable release, you can test it in your day to day
activities. Bug fixes or small improvements pull requests go here.
### 2.x (2.3 for example)
Next major release
*Never* use this branch for production. Pull requests for major new
features go here.
Linux
-----
GNS3 is perhaps packaged for your distribution:
- Gentoo: <https://packages.gentoo.org/package/net-misc/gns3-server>
- Alpine:
<https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server>
- NixOS:
<https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server>
Linux (Debian based)
--------------------
The following instructions have been tested with Ubuntu and Mint. You
must be connected to the Internet in order to install the dependencies.
Dependencies:
- Python 3.6, setuptools and the ones listed
[here](https://github.com/GNS3/gns3-server/blob/master/requirements.txt)
The following commands will install some of these dependencies:
``` {.bash}
sudo apt-get install python3-setuptools python3-pip
```
Finally, these commands will install the server as well as the rest of
the dependencies:
``` {.bash}
cd gns3-server-master
python3 -m pip install -r requirements.txt
python3 -m pip install .
gns3server
```
To run tests use:
``` {.bash}
python3 -m pytest tests
```
### Docker container
For development, you can run the GNS3 server in a container
``` {.bash}
bash scripts/docker_dev_server.sh
```
### Run as daemon (Unix only)
You will find init sample scripts for various systems inside the init
directory.
Useful options:
- `--daemon`: start process as a daemon
- `--log logfile`: store output in a logfile
- `--pid pidfile`: store the pid of the running process in a file and
prevent double execution
All init scripts require the creation of a GNS3 user. You can change it
to another user.
``` {.bash}
sudo adduser gns3
```
upstart
-------
For ubuntu < 15.04
You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf
``` {.bash}
sudo chown root /etc/init/gns3.conf
sudo service gns3 start
```
systemd
-------
You need to copy init/gns3.service.systemd to
/lib/systemd/system/gns3.service
``` {.bash}
sudo chown root /lib/systemd/system/gns3.service
sudo systemctl start gns3
```
Windows
-------
Please use our [all-in-one
installer](https://community.gns3.com/software/download) to install the
stable build.
If you install via source you need to first install:
- Python (3.3 or above) - <https://www.python.org/downloads/windows/>
- Pywin32 - <https://sourceforge.net/projects/pywin32/>
Then you can call
``` {.bash}
python setup.py install
```
to install the remaining dependencies.
To run the tests, you also need to call
``` {.bash}
pip install pytest pytest-capturelog
```
before actually running the tests with
``` {.bash}
python setup.py test
```
or with
``` {.bash}
py.test -v
```
Mac OS X
--------
Please use our DMG package for a simple installation.
If you want to test the current git version or contribute to the
project, you can follow these instructions with virtualenvwrapper:
<http://virtualenvwrapper.readthedocs.org/> and homebrew:
<http://brew.sh/>.
``` {.bash}
brew install python3
mkvirtualenv gns3-server --python=/usr/local/bin/python3.5
python3 setup.py install
gns3server
```
SSL
---
If you want enable SSL support on GNS3 you can generate a self signed
certificate:
``` {.bash}
bash gns3server/cert_utils/create_cert.sh
```
This command will put the files in \~/.config/GNS3/ssl
After you can start the server in SSL mode with:
``` {.bash}
python gns3server/main.py --certfile ~/.config/GNS3/ssl/server.cert --certkey ~/.config/GNS3/ssl/server.key --ssl
```
Or in your gns3\_server.conf by adding in the Server section:
``` {.ini}
[Server]
certfile=/Users/noplay/.config/GNS3/ssl/server.cert
certkey=/Users/noplay/.config/GNS3/ssl/server.key
ssl=True
```
### Running tests
Just run:
``` {.bash}
py.test -vv
```
If you want test coverage:
``` {.bash}
py.test --cov-report term-missing --cov=gns3server
```
Security issues
---------------
Please contact us using contact form available here:
<http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html>

View File

@ -1,223 +0,0 @@
GNS3-server
===========
.. image:: https://travis-ci.org/GNS3/gns3-server.svg?branch=master
:target: https://travis-ci.org/GNS3/gns3-server
.. image:: https://img.shields.io/pypi/v/gns3-server.svg
:target: https://pypi.python.org/pypi/gns3-server
This is the GNS3 server repository.
The GNS3 server manages emulators such as Dynamips, VirtualBox or Qemu/KVM.
Clients like the GNS3 GUI controls the server using a HTTP REST API.
You will need the GNS3 GUI (gns3-gui repository) to control the server.
Branches
--------
master
******
master is the next stable release, you can test it in your day to day activities.
Bug fixes or small improvements pull requests go here.
2.x (2.1 for example)
********
Next major release
*Never* use this branch for production. Pull requests for major new features go here.
Linux
-----
GNS3 is perhaps packaged for your distribution:
* Gentoo: https://packages.gentoo.org/package/net-misc/gns3-server
Linux (Debian based)
--------------------
The following instructions have been tested with Ubuntu and Mint.
You must be connected to the Internet in order to install the dependencies.
Dependencies:
- Python 3.4 or above
- aiohttp
- setuptools
- psutil
- jsonschema
The following commands will install some of these dependencies:
.. code:: bash
sudo apt-get install python3-setuptools
Finally these commands will install the server as well as the rest of the dependencies:
.. code:: bash
cd gns3-server-master
sudo python3 setup.py install
gns3server
To run tests use:
.. code:: bash
py.test -v
Docker container
****************
For development you can run the GNS3 server in a container
.. code:: bash
bash scripts/docker_dev_server.sh
Run as daemon (Unix only)
**************************
You will found init sample script for various systems
inside the init directory.
Usefull options:
* --daemon: start process as a daemon
* --log logfile: store output in a logfile
* --pid pidfile: store the pid of the running process in a file and prevent double execution
All the init script require the creation of a GNS3 user. You can change it to another user.
.. code:: bash
sudo adduser gns3
upstart
~~~~~~~
For ubuntu < 15.04
You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf
.. code:: bash
sudo chown root /etc/init/gns3.conf
sudo service gns3 start
systemd
~~~~~~~~
You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service
.. code:: bash
sudo chown root /lib/systemd/system/gns3.service
sudo systemctl start gns3
Windows
-------
Please use our `all-in-one installer <https://community.gns3.com/community/software/download>`_ to install the stable build.
If you install via source you need to first install:
- Python (3.3 or above) - https://www.python.org/downloads/windows/
- Pywin32 - https://sourceforge.net/projects/pywin32/
Then you can call
.. code:: bash
python setup.py install
to install the remaining dependencies.
To run the tests, you also need to call
.. code:: bash
pip install pytest pytest-capturelog
before actually running the tests with
.. code:: bash
python setup.py test
or with
.. code:: bash
py.test -v
Mac OS X
--------
Please use our DMG package for a simple installation.
If you want to test the current git version or contribute to the project.
You can follow this instructions with virtualenwrapper: http://virtualenvwrapper.readthedocs.org/
and homebrew: http://brew.sh/.
.. code:: bash
brew install python3
mkvirtualenv gns3-server --python=/usr/local/bin/python3.4
python3 setup.py install
gns3server
SSL
---
If you want enable SSL support on GNS3 you can generate a self signed certificate:
.. code:: bash
bash gns3server/cert_utils/create_cert.sh
This command will put the files in ~/.config/GNS3/ssl
After you can start the server in SSL mode with:
.. code:: bash
python gns3server/main.py --certfile ~/.config/GNS3/ssl/server.cert --certkey ~/.config/GNS3/ssl/server.key --ssl
Or in your gns3_server.conf by adding in the Server section:
.. code:: ini
[Server]
certfile=/Users/noplay/.config/GNS3/ssl/server.cert
certkey=/Users/noplay/.config/GNS3/ssl/server.key
ssl=True
Running tests
*************
Just run:
.. code:: bash
py.test -vv
If you want test coverage:
.. code:: bash
py.test --cov-report term-missing --cov=gns3server
Security issues
----------------
Please contact us using contact informations available here:
http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html

17
SECURITY.md Normal file
View File

@ -0,0 +1,17 @@
# Security Policy
## Supported Versions
These are the versions of the GNS3 server that are
currently being supported with security updates.
| Version | Supported |
| ------- | ------------------ |
| 3.x.x | :white_check_mark: |
| 2.2.x | :white_check_mark: |
| 2.1.x | :x: |
| 1.x.x | :x: |
## Reporting a Vulnerability
Please use GitHub's report a vulnerability feature. More information can be found in https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability

View File

@ -1,17 +1,18 @@
version: '{build}-{branch}'
image: Visual Studio 2015
image: Visual Studio 2022
platform: x64
environment:
PYTHON: "C:\\Python36-x64"
PYTHON: "C:\\Python37-x64"
DISTUTILS_USE_SDK: "1"
API_TOKEN:
secure: VEKn4bYH3QO0ixtQW5ni4Enmn8cS1NlZV246ludBDgQ=
install:
- cinst nmap
- "%PYTHON%\\python.exe -m pip install -U pip setuptools" # upgrade pip & setuptools first
- "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
- "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"

View File

@ -18,6 +18,9 @@ projects_path = /home/gns3/GNS3/projects
; Path where user appliances are stored
appliances_path = /home/gns3/GNS3/appliances
; Path where custom device symbols are stored
symbols_path = /home/gns3/GNS3/symbols
; Option to automatically send crash reports to the GNS3 team
report_errors = True
@ -25,10 +28,19 @@ report_errors = True
console_start_port_range = 5000
; Last console port of the range allocated to devices
console_end_port_range = 10000
; First VNC console port of the range allocated to devices.
; The value MUST BE >= 5900 and <= 65535
vnc_console_start_port_range = 5900
; Last VNC console port of the range allocated to devices
; The value MUST BE >= 5900 and <= 65535
vnc_console_end_port_range = 10000
; First port of the range allocated for inter-device communication. Two ports are allocated per link.
udp_start_port_range = 10000
udp_start_port_range = 20000
; Last port of the range allocated for inter-device communication. Two ports are allocated per link
udp_start_end_range = 20000
udp_end_port_range = 30000
; uBridge executable location, default: search in PATH
;ubridge_path = ubridge
@ -39,6 +51,17 @@ user = gns3
; Password for HTTP authentication.
password = gns3
; Only allow these interfaces to be used by GNS3, for the Cloud node for example (Linux/OSX only)
; Do not forget to allow virbr0 in order for the NAT node to work
allowed_interfaces = eth0,eth1,virbr0
; Specify the NAT interface to be used by the NAT node
; Default is virbr0 on Linux (requires libvirt) and vmnet8 for other platforms (requires VMware)
default_nat_interface = vmnet10
; Enable the built-in templates
enable_builtin_templates = True
[VPCS]
; VPCS executable location, default: search in PATH
;vpcs_path = vpcs
@ -53,13 +76,23 @@ sparse_memory_support = True
ghost_ios_support = True
[IOU]
; iouyap executable path, default: search in PATH
;iouyap_path = iouyap
; Path of your .iourc file. If not provided, the file is searched in $HOME/.iourc
iourc_path = /home/gns3/.iourc
; Validate if the iourc license file is correct. If you turn this off and your licence is invalid IOU will not start and no errors will be shown.
license_check = True
[Qemu]
; !! Remember to add the gns3 user to the KVM group, otherwise you will not have read / write permssions to /dev/kvm !!
; !! Remember to add the gns3 user to the KVM group, otherwise you will not have read / write permissions to /dev/kvm !! (Linux only, has priority over enable_hardware_acceleration)
enable_kvm = True
; Require KVM to be installed in order to start VMs (Linux only, has priority over require_hardware_acceleration)
require_kvm = True
; Enable hardware acceleration (all platforms)
enable_hardware_acceleration = True
; Require hardware acceleration in order to start VMs (all platforms)
require_hardware_acceleration = False
[VMware]
; First vmnet interface of the range that can be managed by the GNS3 server
vmnet_start_range = 2
; Last vmnet interface of the range that can be managed by the GNS3 server. It must be maximum 19 on Windows.
vmnet_end_range = 255

View File

@ -1,7 +1,8 @@
-rrequirements.txt
sphinx==1.6.2
pytest==3.1.1
pep8==1.7.0
pytest-catchlog==1.2.2
pytest-timeout==1.2.0
pytest==7.2.0; python_version >= '3.7'
pytest==7.0.1; python_version < '3.7' # v7.0.1 is the last version to support Python 3.6
flake8==5.0.4
pytest-timeout==2.1.0
pytest-aiohttp==1.0.4; python_version >= '3.7'
pytest-aiohttp==0.3.0; python_version < '3.7' # last version to support Python 3.6

View File

@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:23 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:17 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5515357a-a5c1-47c7-b47a-fa004ed94bee'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/a022e62a-a40b-42a5-8efd-3d8141806276'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5515357a-a5c1-47c7-b47a-fa004ed94bee HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/a022e62a-a40b-42a5-8efd-3d8141806276 HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:00 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:49 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6558b3be-937a-46ed-aa2c-d55b2efbfae3/adapters/0/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/8a5e5e38-6a8a-408a-9d8c-31315e11d6f2/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6558b3be-937a-46ed-aa2c-d55b2efbfae3/adapters/0/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/8a5e5e38-6a8a-408a-9d8c-31315e11d6f2/adapters/0/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:06:59 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:43 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/0febefd7-5312-47ce-912e-30a68f3e206b/adapters/0/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c5e6e56f-2698-4bae-9365-0a9f9efd3418/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/0febefd7-5312-47ce-912e-30a68f3e206b/adapters/0/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c5e6e56f-2698-4bae-9365-0a9f9efd3418/adapters/0/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:05 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:50 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b3d3552b-c851-4c54-88ef-eca874685de5'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/81f7488a-6a28-46f0-8b26-331906bdcf2e'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b3d3552b-c851-4c54-88ef-eca874685de5 HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/81f7488a-6a28-46f0-8b26-331906bdcf2e HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:10 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:57 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9e34b2c0-6337-49ab-a409-745cceb673c5/adapters/1/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/04e77370-e8a1-4c6c-9c2a-d7d9076a6f63/adapters/1/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9e34b2c0-6337-49ab-a409-745cceb673c5/adapters/1/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/04e77370-e8a1-4c6c-9c2a-d7d9076a6f63/adapters/1/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:13 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:59 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b37db9cd-b92c-4f24-8706-1b30d3162d6d'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b77c05e8-dd60-4772-aedf-066339baee14'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b37db9cd-b92c-4f24-8706-1b30d3162d6d HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b77c05e8-dd60-4772-aedf-066339baee14 HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:17 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:16 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/d8c320f4-2877-484c-8f1c-f975527e0560/adapters/0/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/bd5f949e-b288-4e5f-97c7-f6a053898140/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/d8c320f4-2877-484c-8f1c-f975527e0560/adapters/0/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/bd5f949e-b288-4e5f-97c7-f6a053898140/adapters/0/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:16 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:10 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/31176da3-3e99-4b29-9040-d643abcefd4e'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/55307537-62a4-48ab-ac1c-ebd998794120'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/31176da3-3e99-4b29-9040-d643abcefd4e HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/55307537-62a4-48ab-ac1c-ebd998794120 HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:29 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:40 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/08907920-9653-45e4-b5c6-94bbca78b809/adapters/1/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ab332598-68ef-4ef6-bb29-d2f31a961273/adapters/1/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/08907920-9653-45e4-b5c6-94bbca78b809/adapters/1/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ab332598-68ef-4ef6-bb29-d2f31a961273/adapters/1/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:32 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:50 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -0,0 +1,14 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/36979ca4-4892-4b3e-9202-2143e261d128'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/36979ca4-4892-4b3e-9202-2143e261d128 HTTP/1.1
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}

View File

@ -0,0 +1,14 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/09736166-0e3a-4fe5-b914-72151a6362e2/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/09736166-0e3a-4fe5-b914-72151a6362e2/adapters/0/ports/0/nio HTTP/1.1
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/aaf3a28e-833c-449b-9670-b514ee746549/adapters/0/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a0d3abeb-9538-4660-a6e5-677822f8f943/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/aaf3a28e-833c-449b-9670-b514ee746549/adapters/0/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a0d3abeb-9538-4660-a6e5-677822f8f943/adapters/0/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:39 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:28 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -0,0 +1,14 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes/90f57222-bdca-4d92-867c-de3f945f83f5/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes/90f57222-bdca-4d92-867c-de3f945f83f5/adapters/0/ports/0/nio HTTP/1.1
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:42 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vmware/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b9adab99-ab1b-4a1d-8b45-fd3510f160bc'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f84fd457-cc5c-4eb9-88b8-3ac691d1fe52'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b9adab99-ab1b-4a1d-8b45-fd3510f160bc HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f84fd457-cc5c-4eb9-88b8-3ac691d1fe52 HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:43 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:48 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}

View File

@ -1,6 +1,6 @@
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e5994674-7209-4ee0-af3a-b7f77e344de2/adapters/0/ports/0/nio'
curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/358e43b9-c971-4a31-a42a-b62d18342bc6/adapters/0/ports/0/nio'
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e5994674-7209-4ee0-af3a-b7f77e344de2/adapters/0/ports/0/nio HTTP/1.1
DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/358e43b9-c971-4a31-a42a-b62d18342bc6/adapters/0/ports/0/nio HTTP/1.1
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:41 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:48 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio

View File

@ -6,10 +6,10 @@ GET /v2/compute/capabilities HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 347
Content-Length: 366
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:06:59 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:43 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/capabilities
{
@ -25,9 +25,10 @@ X-Route: /v2/compute/capabilities
"atm_switch",
"qemu",
"vmware",
"traceng",
"docker",
"iou"
],
"platform": "linuxdebian",
"version": "2.1.0dev1"
"version": "2.2.4dev1"
}

View File

@ -8,8 +8,8 @@ HTTP/1.1 200
Connection: close
Content-Length: 149
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:14 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:59 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/iou/images
[

View File

@ -6,160 +6,61 @@ GET /v2/compute/network/interfaces HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 3969
Content-Length: 1601
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:19 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:16 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/network/interfaces
[
{
"id": "bridge0",
"ip_address": "",
"mac_address": "d2:00:1b:c0:17:80",
"name": "bridge0",
"netmask": "",
"id": "docker0",
"ip_address": "172.17.0.1",
"mac_address": "02:42:0f:c7:42:69",
"name": "docker0",
"netmask": "255.255.0.0",
"special": true,
"type": "ethernet"
},
{
"id": "en0",
"ip_address": "",
"mac_address": "3c:07:54:78:07:cc",
"name": "en0",
"netmask": "",
"special": false,
"type": "ethernet"
},
{
"id": "en1",
"ip_address": "192.168.84.156",
"mac_address": "68:a8:6d:4a:c3:16",
"name": "en1",
"netmask": "255.255.255.0",
"special": false,
"type": "ethernet"
},
{
"id": "en2",
"ip_address": "",
"mac_address": "d2:00:1b:c0:17:80",
"name": "en2",
"netmask": "",
"special": false,
"type": "ethernet"
},
{
"id": "fw0",
"ip_address": "",
"mac_address": "3c:07:54:ff:fe:bc:01:78",
"name": "fw0",
"netmask": "",
"special": true,
"type": "ethernet"
},
{
"id": "lo0",
"id": "lo",
"ip_address": "127.0.0.1",
"mac_address": "",
"name": "lo0",
"mac_address": "00:00:00:00:00:00",
"name": "lo",
"netmask": "255.0.0.0",
"special": true,
"type": "ethernet"
},
{
"id": "p2p0",
"id": "virbr0",
"ip_address": "192.168.122.1",
"mac_address": "52:54:00:d4:71:01",
"name": "virbr0",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "virbr0-nic",
"ip_address": "",
"mac_address": "0a:a8:6d:4a:c3:16",
"name": "p2p0",
"mac_address": "52:54:00:d4:71:01",
"name": "virbr0-nic",
"netmask": "",
"special": true,
"type": "ethernet"
},
{
"id": "utun0",
"ip_address": "",
"mac_address": "",
"name": "utun0",
"netmask": "",
"special": false,
"type": "ethernet"
},
{
"id": "vmnet1",
"ip_address": "172.16.16.1",
"ip_address": "172.16.9.1",
"mac_address": "00:50:56:c0:00:01",
"name": "vmnet1",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet10",
"ip_address": "172.16.7.1",
"mac_address": "00:50:56:c0:00:0a",
"name": "vmnet10",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet2",
"ip_address": "172.16.0.1",
"mac_address": "00:50:56:c0:00:02",
"name": "vmnet2",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet3",
"ip_address": "172.16.1.1",
"mac_address": "00:50:56:c0:00:03",
"name": "vmnet3",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet4",
"ip_address": "172.16.2.1",
"mac_address": "00:50:56:c0:00:04",
"name": "vmnet4",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet5",
"ip_address": "172.16.3.1",
"mac_address": "00:50:56:c0:00:05",
"name": "vmnet5",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet6",
"ip_address": "172.16.4.1",
"mac_address": "00:50:56:c0:00:06",
"name": "vmnet6",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet7",
"ip_address": "172.16.5.1",
"mac_address": "00:50:56:c0:00:07",
"name": "vmnet7",
"netmask": "255.255.255.0",
"special": true,
"type": "ethernet"
},
{
"id": "vmnet8",
"ip_address": "192.168.229.1",
"ip_address": "192.168.193.1",
"mac_address": "00:50:56:c0:00:08",
"name": "vmnet8",
"netmask": "255.255.255.0",
@ -167,12 +68,12 @@ X-Route: /v2/compute/network/interfaces
"type": "ethernet"
},
{
"id": "vmnet9",
"ip_address": "172.16.6.1",
"mac_address": "00:50:56:c0:00:09",
"name": "vmnet9",
"id": "wlp2s0",
"ip_address": "192.168.1.175",
"mac_address": "9c:b6:d0:99:3c:07",
"name": "wlp2s0",
"netmask": "255.255.255.0",
"special": true,
"special": false,
"type": "ethernet"
}
]

View File

@ -6,19 +6,21 @@ GET /v2/compute/projects HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 198
Content-Length: 252
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:22 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:17 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects
[
{
"name": "test",
"project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f"
"project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f",
"variables": null
},
{
"name": "test",
"project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b"
"project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b",
"variables": null
}
]

View File

@ -6,13 +6,14 @@ GET /v2/compute/projects/40010203-0405-0607-0809-0a0b0c0d0e02 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 80
Content-Length: 103
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:21 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:17 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}
{
"name": "test",
"project_id": "40010203-0405-0607-0809-0a0b0c0d0e02"
"project_id": "40010203-0405-0607-0809-0a0b0c0d0e02",
"variables": null
}

View File

@ -1,139 +1,70 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6e8d100d-88bb-4f15-8750-d4fa9c614314'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/75228bef-1806-41fc-8b73-1c5752870ac6'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6e8d100d-88bb-4f15-8750-d4fa9c614314 HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/75228bef-1806-41fc-8b73-1c5752870ac6 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 2951
Content-Length: 1406
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:06:59 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:43 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
{
"interfaces": [
{
"name": "bridge0",
"name": "docker0",
"special": true,
"type": "ethernet"
},
{
"name": "en0",
"special": false,
"type": "ethernet"
},
{
"name": "en1",
"special": false,
"type": "ethernet"
},
{
"name": "en2",
"special": false,
"type": "ethernet"
},
{
"name": "fw0",
"name": "lo",
"special": true,
"type": "ethernet"
},
{
"name": "lo0",
"name": "virbr0",
"special": true,
"type": "ethernet"
},
{
"name": "p2p0",
"name": "virbr0-nic",
"special": true,
"type": "ethernet"
},
{
"name": "utun0",
"special": false,
"type": "ethernet"
},
{
"name": "vmnet1",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet10",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet2",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet3",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet4",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet5",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet6",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet7",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet8",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet9",
"special": true,
"name": "wlp2s0",
"special": false,
"type": "ethernet"
}
],
"name": "Cloud 1",
"node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/project-files/builtin/6e8d100d-88bb-4f15-8750-d4fa9c614314",
"node_id": "6e8d100d-88bb-4f15-8750-d4fa9c614314",
"node_directory": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/builtin/75228bef-1806-41fc-8b73-1c5752870ac6",
"node_id": "75228bef-1806-41fc-8b73-1c5752870ac6",
"ports_mapping": [
{
"interface": "en0",
"name": "en0",
"interface": "wlp2s0",
"name": "wlp2s0",
"port_number": 0,
"type": "ethernet"
},
{
"interface": "en1",
"name": "en1",
"port_number": 1,
"type": "ethernet"
},
{
"interface": "en2",
"name": "en2",
"port_number": 2,
"type": "ethernet"
},
{
"interface": "utun0",
"name": "utun0",
"port_number": 3,
"type": "ethernet"
}
],
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"remote_console_host": "",
"remote_console_http_path": "/",
"remote_console_port": 23,
"remote_console_type": "none",
"status": "started"
}

View File

@ -1,18 +1,19 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/3719606a-bb6a-4a9d-b58d-6ca9e81d4cc2'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/a4155e63-9b40-4c8e-bbbc-d93aad187b07'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/3719606a-bb6a-4a9d-b58d-6ca9e81d4cc2 HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/a4155e63-9b40-4c8e-bbbc-d93aad187b07 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 640
Content-Length: 631
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:08 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:57 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
{
"application_id": 1,
"command_line": "",
"console": 5004,
"console_type": "telnet",
@ -20,13 +21,14 @@ X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
"l1_keepalives": false,
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "PC TEST 1",
"node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/project-files/iou/3719606a-bb6a-4a9d-b58d-6ca9e81d4cc2",
"node_id": "3719606a-bb6a-4a9d-b58d-6ca9e81d4cc2",
"node_directory": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/iou/a4155e63-9b40-4c8e-bbbc-d93aad187b07",
"node_id": "a4155e63-9b40-4c8e-bbbc-d93aad187b07",
"nvram": 128,
"path": "iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"status": "stopped",
"usage": "",
"use_default_iou_values": true
}

View File

@ -1,6 +1,6 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/82feae22-4a86-4664-ac99-5b694c99bfd8'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/f76e8c5c-0a0c-451d-a4ba-f01286d06a16'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/82feae22-4a86-4664-ac99-5b694c99bfd8 HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/f76e8c5c-0a0c-451d-a4ba-f01286d06a16 HTTP/1.1
@ -8,13 +8,13 @@ HTTP/1.1 200
Connection: close
Content-Length: 335
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:15 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:09 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
{
"name": "Nat 1",
"node_id": "82feae22-4a86-4664-ac99-5b694c99bfd8",
"node_id": "f76e8c5c-0a0c-451d-a4ba-f01286d06a16",
"ports_mapping": [
{
"interface": "virbr0",

View File

@ -1,19 +1,18 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c3f10549-f4ca-45cb-9831-6aeda28c5ffa'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c54889dc-8163-4fa4-8e7c-14eca8dd6474'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c3f10549-f4ca-45cb-9831-6aeda28c5ffa HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c54889dc-8163-4fa4-8e7c-14eca8dd6474 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 1468
Content-Length: 1381
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:27 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:29 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"bios_image": "",
@ -44,15 +43,16 @@ X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
"mac_address": "00:dd:80:5f:fa:00",
"mac_address": "0c:dd:80:64:74:00",
"name": "PC TEST 1",
"node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpogl9mqkr/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/c3f10549-f4ca-45cb-9831-6aeda28c5ffa",
"node_id": "c3f10549-f4ca-45cb-9831-6aeda28c5ffa",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/c54889dc-8163-4fa4-8e7c-14eca8dd6474",
"node_id": "c54889dc-8163-4fa4-8e7c-14eca8dd6474",
"on_close": "power_off",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp47ntn6ne/qemu-system-x86_64",
"qemu_path": "/tmp/tmphb4tqqk2/qemu-system-x86_64",
"ram": 256,
"status": "stopped",
"usage": ""

View File

@ -0,0 +1,26 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/c03cc894-a5e9-4359-b85a-1fd917184de4'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/c03cc894-a5e9-4359-b85a-1fd917184de4 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 443
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}
{
"command_line": "",
"console": null,
"console_type": "none",
"default_destination": "",
"ip_address": "",
"name": "TraceNG TEST 1",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/traceng/c03cc894-a5e9-4359-b85a-1fd917184de4",
"node_id": "c03cc894-a5e9-4359-b85a-1fd917184de4",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped"
}

View File

@ -1,19 +1,18 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2901742a-3226-4ac7-96a1-85be8dd885d5'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bcd3206f-3edd-4b44-b5c8-e40f4a5c8909'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2901742a-3226-4ac7-96a1-85be8dd885d5 HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bcd3206f-3edd-4b44-b5c8-e40f4a5c8909 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 465
Content-Length: 483
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:37 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
{
"acpi_shutdown": false,
"adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
"adapters": 0,
"console": 5004,
@ -22,10 +21,12 @@ X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
"linked_clone": false,
"name": "VMTEST",
"node_directory": null,
"node_id": "2901742a-3226-4ac7-96a1-85be8dd885d5",
"node_id": "bcd3206f-3edd-4b44-b5c8-e40f4a5c8909",
"on_close": "power_off",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 0,
"status": "stopped",
"usage": "",
"use_any_adapter": false,
"vmname": "VMTEST"
}

View File

@ -0,0 +1,31 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes/716f8727-4421-4ba9-9e24-031505533c36'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes/716f8727-4421-4ba9-9e24-031505533c36 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 611
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:29 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vmware/nodes/{node_id}
{
"adapter_type": "e1000",
"adapters": 0,
"console": 5004,
"console_type": "telnet",
"headless": false,
"linked_clone": false,
"name": "VMTEST",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vmware/716f8727-4421-4ba9-9e24-031505533c36",
"node_id": "716f8727-4421-4ba9-9e24-031505533c36",
"on_close": "power_off",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped",
"usage": "",
"use_any_adapter": false,
"vmx_path": "/tmp/pytest-of-grossmj/pytest-41/test_vmware_get0/test.vmx"
}

View File

@ -1,15 +1,15 @@
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ccb9b060-d1b7-4c90-a567-4fdb15ffe05f'
curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/aa44ff6f-52fa-4bf9-9b93-2e73c9eb8071'
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ccb9b060-d1b7-4c90-a567-4fdb15ffe05f HTTP/1.1
GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/aa44ff6f-52fa-4bf9-9b93-2e73c9eb8071 HTTP/1.1
HTTP/1.1 200
Connection: close
Content-Length: 428
Content-Length: 384
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:39 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:47 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
{
@ -17,8 +17,8 @@ X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
"console": 5004,
"console_type": "telnet",
"name": "PC TEST 1",
"node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpogl9mqkr/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/ccb9b060-d1b7-4c90-a567-4fdb15ffe05f",
"node_id": "ccb9b060-d1b7-4c90-a567-4fdb15ffe05f",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/aa44ff6f-52fa-4bf9-9b93-2e73c9eb8071",
"node_id": "aa44ff6f-52fa-4bf9-9b93-2e73c9eb8071",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped"
}

View File

@ -12,8 +12,8 @@ HTTP/1.1 200
Connection: close
Content-Length: 212
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:32 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:55 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/qemu/binaries
[

View File

@ -8,8 +8,8 @@ HTTP/1.1 200
Connection: close
Content-Length: 39
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:35 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:19 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/qemu/capabilities
{

View File

@ -8,11 +8,11 @@ HTTP/1.1 200
Connection: close
Content-Length: 49
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:36 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:25 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/version
{
"local": true,
"version": "2.1.0dev1"
"version": "2.2.4dev1"
}

View File

@ -9,13 +9,14 @@ POST /v2/compute/projects HTTP/1.1
HTTP/1.1 201
Connection: close
Content-Length: 80
Content-Length: 103
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:20 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:17 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects
{
"name": "test",
"project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f"
"project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
"variables": null
}

View File

@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:24 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:17 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/close

View File

@ -8,134 +8,65 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes HTTP/
HTTP/1.1 201
Connection: close
Content-Length: 2951
Content-Length: 1406
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:06:59 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:43 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes
{
"interfaces": [
{
"name": "bridge0",
"name": "docker0",
"special": true,
"type": "ethernet"
},
{
"name": "en0",
"special": false,
"type": "ethernet"
},
{
"name": "en1",
"special": false,
"type": "ethernet"
},
{
"name": "en2",
"special": false,
"type": "ethernet"
},
{
"name": "fw0",
"name": "lo",
"special": true,
"type": "ethernet"
},
{
"name": "lo0",
"name": "virbr0",
"special": true,
"type": "ethernet"
},
{
"name": "p2p0",
"name": "virbr0-nic",
"special": true,
"type": "ethernet"
},
{
"name": "utun0",
"special": false,
"type": "ethernet"
},
{
"name": "vmnet1",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet10",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet2",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet3",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet4",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet5",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet6",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet7",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet8",
"special": true,
"type": "ethernet"
},
{
"name": "vmnet9",
"special": true,
"name": "wlp2s0",
"special": false,
"type": "ethernet"
}
],
"name": "Cloud 1",
"node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/project-files/builtin/d3c99fe4-9f9c-4667-add5-2e37a75dbbb1",
"node_id": "d3c99fe4-9f9c-4667-add5-2e37a75dbbb1",
"node_directory": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/builtin/3cba86a4-73d7-4989-9c83-f0bb480ff950",
"node_id": "3cba86a4-73d7-4989-9c83-f0bb480ff950",
"ports_mapping": [
{
"interface": "en0",
"name": "en0",
"interface": "wlp2s0",
"name": "wlp2s0",
"port_number": 0,
"type": "ethernet"
},
{
"interface": "en1",
"name": "en1",
"port_number": 1,
"type": "ethernet"
},
{
"interface": "en2",
"name": "en2",
"port_number": 2,
"type": "ethernet"
},
{
"interface": "utun0",
"name": "utun0",
"port_number": 3,
"type": "ethernet"
}
],
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"remote_console_host": "",
"remote_console_http_path": "/",
"remote_console_port": 23,
"remote_console_type": "none",
"status": "started"
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2cd925a3-2a7f-4d92-bd2d-f0fbf93f0bc8/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5a669280-f313-421f-8d05-5cd30731964f/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2cd925a3-2a7f-4d92-bd2d-f0fbf93f0bc8/adapters/0/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5a669280-f313-421f-8d05-5cd30731964f/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@ -13,8 +13,8 @@ HTTP/1.1 201
Connection: close
Content-Length: 89
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:06:59 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:43 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{

View File

@ -0,0 +1,20 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/3c524997-ecb4-43c8-b0eb-4978446be73d/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/3c524997-ecb4-43c8-b0eb-4978446be73d/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
}
HTTP/1.1 200
Connection: close
Content-Length: 104
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:25:49 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/captures/test.pcap"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5def67e9-a974-4da2-9cd3-17866ede1898/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/5def67e9-a974-4da2-9cd3-17866ede1898/adapters/0/ports/0/stop_capture HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:25:49 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/63fcdc24-7a76-4ad3-a47a-08f3c54fd574/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/bfba66b2-35db-441e-8015-3041cf886105/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/63fcdc24-7a76-4ad3-a47a-08f3c54fd574/adapters/0/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/bfba66b2-35db-441e-8015-3041cf886105/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@ -13,8 +13,8 @@ HTTP/1.1 201
Connection: close
Content-Length: 89
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:04 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:50 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/389b8efd-70d1-4305-a1e0-5ea3bb3e647c/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/937a4da0-7334-4fee-a351-5433acaaa298/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/389b8efd-70d1-4305-a1e0-5ea3bb3e647c/adapters/0/ports/0/start_capture HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/937a4da0-7334-4fee-a351-5433acaaa298/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
@ -9,12 +9,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/389b
HTTP/1.1 200
Connection: close
Content-Length: 145
Content-Length: 104
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:06 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:51 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/tmp/captures/test.pcap"
"pcap_file_path": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/captures/test.pcap"
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/4b535824-c72f-484b-a5c5-da2e67e908f2/adapters/0/ports/0/stop_capture' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/e44e037c-3b3e-4172-aff7-b9bb510646c6/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/4b535824-c72f-484b-a5c5-da2e67e908f2/adapters/0/ports/0/stop_capture HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/e44e037c-3b3e-4172-aff7-b9bb510646c6/adapters/0/ports/0/stop_capture HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:06 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:51 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -0,0 +1,17 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c5f0877d-6201-4fe8-8c0b-aaeb84222bee/duplicate' -d '{"destination_node_id": "72462999-933a-4be7-9ef5-0528f04c3870"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c5f0877d-6201-4fe8-8c0b-aaeb84222bee/duplicate HTTP/1.1
{
"destination_node_id": "72462999-933a-4be7-9ef5-0528f04c3870"
}
HTTP/1.1 201
Connection: close
Content-Length: 4
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:25:51 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/duplicate
true

View File

@ -1,9 +1,9 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "adb7de66-2415-44b5-8a84-2dc5fdee6979", "path": "iou.bin", "startup_config_content": "hostname test"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "0de29446-fa90-4e91-89f3-5ea84860f212", "path": "iou.bin", "startup_config_content": "hostname test"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes HTTP/1.1
{
"name": "PC TEST 1",
"node_id": "adb7de66-2415-44b5-8a84-2dc5fdee6979",
"node_id": "0de29446-fa90-4e91-89f3-5ea84860f212",
"path": "iou.bin",
"startup_config_content": "hostname test"
}
@ -11,13 +11,14 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes HTTP/1.
HTTP/1.1 201
Connection: close
Content-Length: 640
Content-Length: 631
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:08 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:56 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes
{
"application_id": 1,
"command_line": "",
"console": 5004,
"console_type": "telnet",
@ -25,13 +26,14 @@ X-Route: /v2/compute/projects/{project_id}/iou/nodes
"l1_keepalives": false,
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "PC TEST 1",
"node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/project-files/iou/adb7de66-2415-44b5-8a84-2dc5fdee6979",
"node_id": "adb7de66-2415-44b5-8a84-2dc5fdee6979",
"node_directory": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/iou/0de29446-fa90-4e91-89f3-5ea84860f212",
"node_id": "0de29446-fa90-4e91-89f3-5ea84860f212",
"nvram": 128,
"path": "iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"status": "stopped",
"usage": "",
"use_default_iou_values": true
}

View File

@ -1,8 +1,8 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/eb58fbf6-61da-4b9f-9d3d-114fc01b2819/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fadca255-3eb8-44fa-9a14-31c52604d094/adapters/1/ports/0/nio' -d '{"ethernet_device": "docker0", "type": "nio_ethernet"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/eb58fbf6-61da-4b9f-9d3d-114fc01b2819/adapters/1/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fadca255-3eb8-44fa-9a14-31c52604d094/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "bridge0",
"ethernet_device": "docker0",
"type": "nio_ethernet"
}
@ -11,11 +11,11 @@ HTTP/1.1 201
Connection: close
Content-Length: 64
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:11 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:58 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{
"ethernet_device": "bridge0",
"ethernet_device": "docker0",
"type": "nio_ethernet"
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/77839213-c55a-484c-98a3-2bf0d2893352/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b63d611d-066b-4673-ad6c-c0e8a93cedbb/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/77839213-c55a-484c-98a3-2bf0d2893352/adapters/0/ports/0/start_capture HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b63d611d-066b-4673-ad6c-c0e8a93cedbb/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
@ -9,12 +9,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7783921
HTTP/1.1 200
Connection: close
Content-Length: 145
Content-Length: 104
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:13 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:59 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/tmp/captures/test.pcap"
"pcap_file_path": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/captures/test.pcap"
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d11f7bfb-6250-4d9d-ae8d-a3d152c3de7c/adapters/0/ports/0/stop_capture' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/73ab14a4-9338-4428-89a7-bce3d8daf1eb/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d11f7bfb-6250-4d9d-ae8d-a3d152c3de7c/adapters/0/ports/0/stop_capture HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/73ab14a4-9338-4428-89a7-bce3d8daf1eb/adapters/0/ports/0/stop_capture HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:14 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:59 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -0,0 +1,17 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/12cd096f-f0c1-45f9-ac57-360f1d379c48/duplicate' -d '{"destination_node_id": "3949cfaa-2574-4064-a088-5f48ae784e9b"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/12cd096f-f0c1-45f9-ac57-360f1d379c48/duplicate HTTP/1.1
{
"destination_node_id": "3949cfaa-2574-4064-a088-5f48ae784e9b"
}
HTTP/1.1 201
Connection: close
Content-Length: 4
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:26:09 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/duplicate
true

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d1e486ba-72d8-4fd3-a5fe-b2f4bcdb353b/reload' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c9e6143c-cf69-416d-8935-8af81fb8ff1d/reload' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d1e486ba-72d8-4fd3-a5fe-b2f4bcdb353b/reload HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c9e6143c-cf69-416d-8935-8af81fb8ff1d/reload HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:09 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:57 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/reload

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/866ec4e8-835c-41bc-ae06-ef3aefc3133c/start' -d '{"iourc_content": "test"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/03423f2a-311d-4436-8c9a-8b34945f6cd2/start' -d '{"iourc_content": "test"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/866ec4e8-835c-41bc-ae06-ef3aefc3133c/start HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/03423f2a-311d-4436-8c9a-8b34945f6cd2/start HTTP/1.1
{
"iourc_content": "test"
}
@ -8,13 +8,14 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/866ec4e
HTTP/1.1 200
Connection: close
Content-Length: 640
Content-Length: 631
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:09 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:57 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
{
"application_id": 1,
"command_line": "",
"console": 5004,
"console_type": "telnet",
@ -22,13 +23,14 @@ X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
"l1_keepalives": false,
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "PC TEST 1",
"node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-63/test_json4/project-files/iou/866ec4e8-835c-41bc-ae06-ef3aefc3133c",
"node_id": "866ec4e8-835c-41bc-ae06-ef3aefc3133c",
"node_directory": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/iou/03423f2a-311d-4436-8c9a-8b34945f6cd2",
"node_id": "03423f2a-311d-4436-8c9a-8b34945f6cd2",
"nvram": 128,
"path": "iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"status": "stopped",
"usage": "",
"use_default_iou_values": true
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/a11a0e08-4013-4727-b16b-29e92fc6f7cf/stop' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/5fcb7418-3e0c-4a47-8cff-c5e0b3e68000/stop' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/a11a0e08-4013-4727-b16b-29e92fc6f7cf/stop HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/5fcb7418-3e0c-4a47-8cff-c5e0b3e68000/stop HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:09 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:25:57 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/stop

View File

@ -10,13 +10,13 @@ HTTP/1.1 201
Connection: close
Content-Length: 335
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:15 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:09 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes
{
"name": "Nat 1",
"node_id": "0bfda9f4-d320-437b-ad78-524022eb0ea7",
"node_id": "4b2c0443-0726-4507-a30b-7ac535b1bbaf",
"ports_mapping": [
{
"interface": "virbr0",

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/87b491bd-60dd-44d1-a2d3-98859e4a9c8d/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/d8f89cb0-b60f-404a-8431-af581957e29c/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/87b491bd-60dd-44d1-a2d3-98859e4a9c8d/adapters/0/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/d8f89cb0-b60f-404a-8431-af581957e29c/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@ -13,8 +13,8 @@ HTTP/1.1 201
Connection: close
Content-Length: 89
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:16 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:09 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{

View File

@ -0,0 +1,20 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/bc78e678-408d-4d03-9670-c29da452f6c7/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/bc78e678-408d-4d03-9670-c29da452f6c7/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
}
HTTP/1.1 200
Connection: close
Content-Length: 104
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:26:16 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/tmp/pytest-of-grossmj/pytest-41/test_json4/project-files/captures/test.pcap"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/da53ab8a-106c-48a9-ba35-48167fb1b6d1/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/da53ab8a-106c-48a9-ba35-48167fb1b6d1/adapters/0/ports/0/stop_capture HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:26:16 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -8,10 +8,10 @@ HTTP/1.1 201
Connection: close
Content-Length: 25
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:18 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:16 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/ports/udp
{
"udp_port": 10000
"udp_port": 20000
}

View File

@ -1,24 +1,22 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp47ntn6ne/qemu-system-x86_64", "ram": 1024}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "hello.img", "name": "PC TEST 1", "qemu_path": "/tmp/tmphb4tqqk2/qemu-system-x86_64"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes HTTP/1.1
{
"hda_disk_image": "linux\u8f7d.img",
"hda_disk_image": "hello.img",
"name": "PC TEST 1",
"qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp47ntn6ne/qemu-system-x86_64",
"ram": 1024
"qemu_path": "/tmp/tmphb4tqqk2/qemu-system-x86_64"
}
HTTP/1.1 201
Connection: close
Content-Length: 1514
Content-Length: 1420
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:26 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:28 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"bios_image": "",
@ -31,8 +29,8 @@ X-Route: /v2/compute/projects/{project_id}/qemu/nodes
"console_type": "telnet",
"cpu_throttling": 0,
"cpus": 1,
"hda_disk_image": "linux\u8f7d.img",
"hda_disk_image_md5sum": "c4ca4238a0b923820dcc509a6f75849b",
"hda_disk_image": "hello.img",
"hda_disk_image_md5sum": "7d793037a0760186574b0282f2f435e7",
"hda_disk_interface": "ide",
"hdb_disk_image": "",
"hdb_disk_image_md5sum": null,
@ -49,16 +47,17 @@ X-Route: /v2/compute/projects/{project_id}/qemu/nodes
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
"mac_address": "00:dd:80:08:57:00",
"mac_address": "0c:dd:80:dd:e2:00",
"name": "PC TEST 1",
"node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpogl9mqkr/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/8f66a9c3-60bd-4a10-8feb-73e3341f0857",
"node_id": "8f66a9c3-60bd-4a10-8feb-73e3341f0857",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/2320a0b9-ed9b-45d9-9bef-c6d13bd9dde2",
"node_id": "2320a0b9-ed9b-45d9-9bef-c6d13bd9dde2",
"on_close": "power_off",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp47ntn6ne/qemu-system-x86_64",
"ram": 1024,
"qemu_path": "/tmp/tmphb4tqqk2/qemu-system-x86_64",
"ram": 256,
"status": "stopped",
"usage": ""
}

View File

@ -1,21 +1,25 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3a264a0f-bcdc-4c4e-b28f-ab27486dacf0/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5048489f-46b4-4720-bee9-f4cf1ec7af49/adapters/1/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3a264a0f-bcdc-4c4e-b28f-ab27486dacf0/adapters/1/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5048489f-46b4-4720-bee9-f4cf1ec7af49/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "eth0",
"type": "nio_ethernet"
"lport": 4242,
"rhost": "127.0.0.1",
"rport": 4343,
"type": "nio_udp"
}
HTTP/1.1 409
HTTP/1.1 201
Connection: close
Content-Length: 81
Content-Length: 89
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:31 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:44 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{
"message": "NIO of type nio_ethernet is not supported",
"status": 409
"lport": 4242,
"rhost": "127.0.0.1",
"rport": 4343,
"type": "nio_udp"
}

View File

@ -0,0 +1,20 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/40fc7ce3-f4fe-469e-a94a-fb95906d9e22/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/40fc7ce3-f4fe-469e-a94a-fb95906d9e22/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
}
HTTP/1.1 200
Connection: close
Content-Length: 123
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:24 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4258adbd-3115-4b8f-b751-cb117dcff450/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4258adbd-3115-4b8f-b751-cb117dcff450/adapters/0/ports/0/stop_capture HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:24 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -0,0 +1,17 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/839fb609-bd90-4a20-b496-6e225594c697/duplicate' -d '{"destination_node_id": "eb9e761d-0029-4644-b586-dc903e7abd71"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/839fb609-bd90-4a20-b496-6e225594c697/duplicate HTTP/1.1
{
"destination_node_id": "eb9e761d-0029-4644-b586-dc903e7abd71"
}
HTTP/1.1 201
Connection: close
Content-Length: 4
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:21 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/duplicate
true

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c081c6f2-a073-410d-a182-a99fee27f1a2/reload' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/314c42be-e138-42f3-a59e-a7c3c2e6514f/reload' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c081c6f2-a073-410d-a182-a99fee27f1a2/reload HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/314c42be-e138-42f3-a59e-a7c3c2e6514f/reload HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:28 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:33 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/reload

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1f21573b-5ec1-401d-84a7-803d19f11b8c/resume' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ad58dbd9-6558-4750-bec5-1de4cf77ed70/resume' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1f21573b-5ec1-401d-84a7-803d19f11b8c/resume HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ad58dbd9-6558-4750-bec5-1de4cf77ed70/resume HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:29 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:35 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/resume

View File

@ -1,19 +1,18 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ee86570c-7cc3-4c9d-95a7-55fbb442fd43/start' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9a4b2f04-74a6-4528-a6a7-b02365417fe9/start' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ee86570c-7cc3-4c9d-95a7-55fbb442fd43/start HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9a4b2f04-74a6-4528-a6a7-b02365417fe9/start HTTP/1.1
{}
HTTP/1.1 200
Connection: close
Content-Length: 1468
Content-Length: 1381
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:27 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:30 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
"bios_image": "",
@ -44,15 +43,16 @@ X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
"mac_address": "00:dd:80:fd:43:00",
"mac_address": "0c:dd:80:7f:e9:00",
"name": "PC TEST 1",
"node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpogl9mqkr/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/ee86570c-7cc3-4c9d-95a7-55fbb442fd43",
"node_id": "ee86570c-7cc3-4c9d-95a7-55fbb442fd43",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/9a4b2f04-74a6-4528-a6a7-b02365417fe9",
"node_id": "9a4b2f04-74a6-4528-a6a7-b02365417fe9",
"on_close": "power_off",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp47ntn6ne/qemu-system-x86_64",
"qemu_path": "/tmp/tmphb4tqqk2/qemu-system-x86_64",
"ram": 256,
"status": "stopped",
"usage": ""

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/96005c5e-f02b-433b-a826-92d8cb52ebe8/stop' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/6aacea07-76ca-4fb9-94d2-24da00e33037/stop' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/96005c5e-f02b-433b-a826-92d8cb52ebe8/stop HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/6aacea07-76ca-4fb9-94d2-24da00e33037/stop HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:28 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:31 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/stop

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3faa953d-5669-40a0-8ede-8e6671e506fe/suspend' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/073074f6-83d4-40b4-8042-771b3df49f60/suspend' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3faa953d-5669-40a0-8ede-8e6671e506fe/suspend HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/073074f6-83d4-40b4-8042-771b3df49f60/suspend HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:28 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:26:33 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/suspend

View File

@ -0,0 +1,28 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes' -d '{"name": "TraceNG TEST 1"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes HTTP/1.1
{
"name": "TraceNG TEST 1"
}
HTTP/1.1 201
Connection: close
Content-Length: 443
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes
{
"command_line": "",
"console": null,
"console_type": "none",
"default_destination": "",
"ip_address": "",
"name": "TraceNG TEST 1",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/traceng/f27f5247-e419-4404-9150-b1bb9306d783",
"node_id": "f27f5247-e419-4404-9150-b1bb9306d783",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped"
}

View File

@ -0,0 +1,25 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/243bc8d3-6531-4e9e-99c6-23ad9a4898c8/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/243bc8d3-6531-4e9e-99c6-23ad9a4898c8/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
"rport": 4343,
"type": "nio_udp"
}
HTTP/1.1 201
Connection: close
Content-Length: 89
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{
"lport": 4242,
"rhost": "127.0.0.1",
"rport": 4343,
"type": "nio_udp"
}

View File

@ -0,0 +1,20 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/770d23d8-e568-4fc4-8497-216c2e129d53/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/770d23d8-e568-4fc4-8497-216c2e129d53/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
}
HTTP/1.1 200
Connection: close
Content-Length: 123
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/2a0e5c7d-6773-45a3-886c-d19e329eaeba/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/2a0e5c7d-6773-45a3-886c-d19e329eaeba/adapters/0/ports/0/stop_capture HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -0,0 +1,17 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/fe70324f-78a3-4ada-a675-bd693250d403/duplicate' -d '{"destination_node_id": "64e0db26-82e6-416a-ac11-97add4614131"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/fe70324f-78a3-4ada-a675-bd693250d403/duplicate HTTP/1.1
{
"destination_node_id": "64e0db26-82e6-416a-ac11-97add4614131"
}
HTTP/1.1 201
Connection: close
Content-Length: 4
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/duplicate
true

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/d12252b3-0698-441d-b7a8-cf0f5c8de536/reload' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/d12252b3-0698-441d-b7a8-cf0f5c8de536/reload HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/reload

View File

@ -0,0 +1,28 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/9ba1f859-a8f5-46b7-beda-ce49116bdce7/start' -d '{"destination": "192.168.1.2"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/9ba1f859-a8f5-46b7-beda-ce49116bdce7/start HTTP/1.1
{
"destination": "192.168.1.2"
}
HTTP/1.1 200
Connection: close
Content-Length: 443
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/start
{
"command_line": "",
"console": null,
"console_type": "none",
"default_destination": "",
"ip_address": "",
"name": "TraceNG TEST 1",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/traceng/9ba1f859-a8f5-46b7-beda-ce49116bdce7",
"node_id": "9ba1f859-a8f5-46b7-beda-ce49116bdce7",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/797b0b03-d612-437a-91cc-f6b6a2e1341f/stop' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/traceng/nodes/797b0b03-d612-437a-91cc-f6b6a2e1341f/stop HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:26 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/traceng/nodes/{node_id}/stop

View File

@ -10,14 +10,13 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes
HTTP/1.1 201
Connection: close
Content-Length: 459
Content-Length: 477
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:36 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes
{
"acpi_shutdown": false,
"adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
"adapters": 0,
"console": 5004,
@ -26,10 +25,12 @@ X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes
"linked_clone": false,
"name": "VM1",
"node_directory": null,
"node_id": "9e2ac63a-073c-4a24-aeac-f61357a5f90f",
"node_id": "e7a8f831-0fb0-4946-a188-d3ac4112e097",
"on_close": "power_off",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 0,
"status": "stopped",
"usage": "",
"use_any_adapter": false,
"vmname": "VM1"
}

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/96f83848-0576-4ef0-ae34-59e94f151aa9/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/85a79b7b-1c7a-49a9-bdda-b97c036420b5/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/96f83848-0576-4ef0-ae34-59e94f151aa9/adapters/0/ports/0/nio HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/85a79b7b-1c7a-49a9-bdda-b97c036420b5/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@ -13,8 +13,8 @@ HTTP/1.1 201
Connection: close
Content-Length: 89
Content-Type: application/json
Date: Thu, 29 Jun 2017 15:07:38 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{

View File

@ -0,0 +1,20 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/e99d891a-06ed-4923-9110-4dfae366af6d/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/e99d891a-06ed-4923-9110-4dfae366af6d/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
}
HTTP/1.1 200
Connection: close
Content-Length: 123
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:28 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
{
"pcap_file_path": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
}

View File

@ -0,0 +1,14 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/27bdd057-dedc-424e-9593-3ea522aa7d1f/adapters/0/ports/0/stop_capture' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/27bdd057-dedc-424e-9593-3ea522aa7d1f/adapters/0/ports/0/stop_capture HTTP/1.1
{}
HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Wed, 08 Jan 2020 02:27:28 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2266dbe5-4a29-42e2-8b96-4fcd5f53ead0/reload' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2e55edb4-1f15-4b41-8107-bf931e81f779/reload' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2266dbe5-4a29-42e2-8b96-4fcd5f53ead0/reload HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2e55edb4-1f15-4b41-8107-bf931e81f779/reload HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:38 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/reload

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/648ab272-9340-4b8c-ac48-1ab94d347414/resume' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/7e8bf660-9d03-4005-80b6-f63666aa1a1d/resume' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/648ab272-9340-4b8c-ac48-1ab94d347414/resume HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/7e8bf660-9d03-4005-80b6-f63666aa1a1d/resume HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:37 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/resume

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5fb0ae01-4a89-4441-ab26-387d99e59966/start' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/311dba8a-1030-46da-94d8-76cf6430cc5e/start' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5fb0ae01-4a89-4441-ab26-387d99e59966/start HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/311dba8a-1030-46da-94d8-76cf6430cc5e/start HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:37 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/start

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/691076a7-5d1c-47b2-b100-7e3eda812e42/stop' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/40d1d4a5-7e95-41fc-8c51-1883dc9eb71b/stop' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/691076a7-5d1c-47b2-b100-7e3eda812e42/stop HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/40d1d4a5-7e95-41fc-8c51-1883dc9eb71b/stop HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:37 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/stop

View File

@ -1,6 +1,6 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/4928f9c9-5741-47ad-8dc3-6478e5a2d2cc/suspend' -d '{}'
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/079cef97-d46e-4033-b1b5-96e032817a0e/suspend' -d '{}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/4928f9c9-5741-47ad-8dc3-6478e5a2d2cc/suspend HTTP/1.1
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/079cef97-d46e-4033-b1b5-96e032817a0e/suspend HTTP/1.1
{}
@ -8,7 +8,7 @@ HTTP/1.1 204
Connection: close
Content-Length: 0
Content-Type: application/octet-stream
Date: Thu, 29 Jun 2017 15:07:37 GMT
Server: Python/3.6 GNS3/2.1.0dev1
Date: Wed, 08 Jan 2020 02:27:27 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/suspend

View File

@ -0,0 +1,35 @@
curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes' -d '{"linked_clone": false, "name": "VM1", "vmx_path": "/tmp/pytest-of-grossmj/pytest-41/test_vmware_create0/test.vmx"}'
POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vmware/nodes HTTP/1.1
{
"linked_clone": false,
"name": "VM1",
"vmx_path": "/tmp/pytest-of-grossmj/pytest-41/test_vmware_create0/test.vmx"
}
HTTP/1.1 201
Connection: close
Content-Length: 611
Content-Type: application/json
Date: Wed, 08 Jan 2020 02:27:28 GMT
Server: Python/3.6 GNS3/2.2.4dev1
X-Route: /v2/compute/projects/{project_id}/vmware/nodes
{
"adapter_type": "e1000",
"adapters": 0,
"console": 5004,
"console_type": "telnet",
"headless": false,
"linked_clone": false,
"name": "VM1",
"node_directory": "/tmp/tmp3gc2avyo/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vmware/1008243f-21b0-4861-8f06-0622df304234",
"node_id": "1008243f-21b0-4861-8f06-0622df304234",
"on_close": "power_off",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"status": "stopped",
"usage": "",
"use_any_adapter": false,
"vmx_path": "/tmp/pytest-of-grossmj/pytest-41/test_vmware_create0/test.vmx"
}

Some files were not shown because too many files have changed in this diff Show More