1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-18 14:28:08 +00:00
Commit Graph

3447 Commits

Author SHA1 Message Date
grossmj
fef1d01e26 Merge branch 'master' into 2.2 2019-09-30 16:20:19 +08:00
grossmj
af3ae0df24 Merge branch '2.1'
# Conflicts:
#	gns3server/compute/dynamips/nodes/atm_switch.py
2019-09-30 16:11:26 +08:00
grossmj
87390274cc Add debug message for what directory is checked for Qemu binaries. Ref #1655 2019-09-30 15:54:57 +08:00
grossmj
f424e2dfd5 Sync appliance files. 2019-09-30 11:59:41 +08:00
Piotr Pekala
4031fd0c18 Release 2019.2.0-alpha.8 2019-09-27 01:57:03 -07:00
grossmj
1c678e296e Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/version.py
2019-09-24 14:07:18 +08:00
grossmj
958ec94f13 Sync appliance files. 2019-09-24 14:06:26 +08:00
grossmj
a9fd990904 Bump version to 2.2.0dev18 2019-09-24 14:02:36 +08:00
grossmj
9d18ac1e3e Merge branch 'master' into 2.2 2019-09-24 13:56:16 +08:00
grossmj
2cfac30810 Fix single quote is not closed. Fixes #1654 2019-09-17 18:54:18 +07:00
grossmj
67e70c4628 Fix wrong Dynamips command used to rename an ATM switch. Fixes #1651 2019-09-11 15:06:08 +07:00
grossmj
8b71e9b20c Release v2.2.0rc5 2019-09-09 15:06:14 +07:00
grossmj
7cd9bb6ca6 Merge branch '2.1' into 2.2 2019-09-09 15:02:06 +07:00
Jeremy Grossmann
2e41328ae9
Merge branch 'master' into fix-sata 2019-09-05 17:36:53 +07:00
David Kreitschmann
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
David Kreitschmann
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
grossmj
5d4de9d0ba Fix AttributeError: Cannot set attribute '%s'. Fixes #1646 2019-08-31 14:43:35 +07:00
grossmj
4470519d9f Release v2.2.0rc4 2019-08-30 15:23:32 +07:00
Piotr Pekala
941857470d Release 2019.2.0-alpha.7 2019-08-29 09:39:26 -07:00
grossmj
e64ed839f5 Check that vcpus value for GNS3 VM is an integer. Fixes #1636 2019-08-27 18:01:46 +07:00
grossmj
647dde1bb4 Make x,y optional for creating links via API. Fixes #1630 2019-08-26 19:51:03 +07:00
grossmj
63c0bfe46e Sync appliance files. 2019-08-26 17:08:33 +07:00
grossmj
fb288db50a Set default_name_format for some builtin nodes. 2019-08-26 17:00:18 +07:00
grossmj
55a9abfcea Allow "none" for compute_id in templates. 2019-08-26 16:48:03 +07:00
grossmj
dac2cf4089 Bump version to 2.2.0dev17 2019-08-23 18:20:44 +07:00
grossmj
3b0bb8df4e Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/version.py
2019-08-20 17:34:47 +07:00
grossmj
9559748f9d Bump version to 2.2.0dev16 2019-08-20 17:33:48 +07:00
grossmj
4656521987 Release v2.2.0rc3 2019-08-11 19:14:56 -07:00
grossmj
86772d9127 Release v2.2.0rc2 2019-08-10 12:04:19 -05:00
grossmj
27d447c926 Release v2.2.0rc1 2019-08-10 11:42:10 -05:00
grossmj
df9f717d7c Sync appliance files 2019-08-10 11:35:32 -05:00
grossmj
39da0f3904 List Hyper-V VMs on non-english OSes. Fixes #1612 2019-07-30 15:01:17 -02:30
grossmj
6a7d47ce97 Merge branch '2.2' 2019-07-12 12:07:44 +02:00
grossmj
7c07d0b4bd Add missing default values in Cloud schema. 2019-07-12 11:32:55 +02:00
grossmj
6626bf37a6 Development on 2.2.0dev15 2019-07-11 17:34:56 +02:00
grossmj
f7376ee382 Release v2.2.0b4 2019-07-11 16:58:35 +02:00
grossmj
3172985a21 Sync appliance files. 2019-07-11 16:55:13 +02:00
grossmj
dcf94a5852 Requires a project to be opened to start/stop/suspend all nodes. Fixes #1609 2019-07-10 17:07:13 +02:00
grossmj
cba39a3744 Fix issue when starting GNS3 VM for Hyper-V 2019-07-10 15:56:54 +02:00
grossmj
03c7744efd Set defaults for custom cloud nodes. 2019-07-10 15:51:06 +02:00
grossmj
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
grossmj
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
ziajka
507090d69d Fix base href for web ui 2019-07-04 10:37:14 +02:00
Piotr Pekala
ed27a46dee Release 2019.2.0-alpha.5 2019-07-04 00:20:54 -07:00
ziajka
8d02405e88 Fix redirection to web-ui bundled server 2019-07-04 08:59:33 +02:00
Piotr Pekala
7adf5201f0 Release 2019.2.0-alpha.4 2019-07-03 06:08:46 -07:00
grossmj
0df3322b6c Development on 2.2.0dev14 2019-06-15 16:38:06 +02:00
grossmj
43c7acb0cf Release v2.2.0b3 2019-06-15 15:39:32 +02:00
Jeremy Grossmann
239d9e6fd6
Merge pull request #1599 from GNS3/cdrom-refresh
Refresh mounted media after ISO switch
2019-06-15 15:26:48 +02:00
grossmj
9e54ab77d0 Merge 2.1 into 2.2 branch. 2019-06-15 15:26:20 +02:00
grossmj
5dbedb744e Sync appliance files. 2019-06-15 15:24:45 +02:00
grossmj
7a463676cd Eject cdrom first before changing an image. Use 'force' when ejecting. 2019-06-15 15:20:21 +02:00
grossmj
b0700b8787 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-06-15 12:53:55 +02:00
grossmj
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
grossmj
7c33d3510a Development on 2.1.22dev1 2019-06-14 19:42:18 +02:00
grossmj
cb1f73e9a2 Release v2.1.21 2019-06-14 10:47:07 +02:00
grossmj
2476581dca Change uBridge debug level to '1' when debugging is enabled. Fixes #1598 2019-06-12 14:35:13 +02:00
grossmj
b7af2e4d5c Refresh mounted media after ISO switch. 2019-06-12 14:23:03 +02:00
Jeremy Grossmann
b002812907
Merge pull request #1597 from kazkansouh/2.2-fix-1595-volumes
Fix for issue #1595
2019-06-05 12:10:34 +02:00
Karim
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
grossmj
61c87e57a4 Use console port to allocate guest CID (console ID) for Qemu VMs. Fixes #2804 2019-06-05 11:25:35 +02:00
grossmj
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
grossmj
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
grossmj
dd05884096 Development on 2.2.0dev13 2019-05-29 17:52:38 +07:00
grossmj
e58f86e204 Release v2.2.0b2 2019-05-29 17:16:59 +07:00
grossmj
a6bc6bc79c Update appliance files. 2019-05-29 16:52:50 +07:00
grossmj
336b77e28a Merging 2.1 into 2.2 branch 2019-05-29 16:50:36 +07:00
grossmj
3dbce3fa40 Development on 2.1.21dev1 2019-05-29 16:37:42 +07:00
grossmj
053a16960c Release v2.1.20 2019-05-29 15:44:25 +07:00
grossmj
a860243531 Ignore Unicode errors when reading base config file contents. 2019-05-29 15:43:17 +07:00
grossmj
99886d3f0c Development on 2.1.20dev1 2019-05-28 16:33:43 +07:00
grossmj
6fb613dcff Release v2.1.19 2019-05-28 15:23:35 +07:00
grossmj
4f803ff162 Sync appliances. 2019-05-28 10:37:43 +07:00
grossmj
591d4f29ff Fix minor bugs with log rotation support. Ref #1586 2019-05-28 10:34:27 +07:00
grossmj
5cbfafbeb2 Support snapshots for portable projects. Fixes https://github.com/GNS3/gns3-gui/issues/2792 2019-05-27 15:35:47 +07:00
grossmj
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
grossmj
2289fd4a2f Set log max size to 10MB. Ref #1586 2019-05-25 21:33:47 +07:00
grossmj
4ac999461b Support for log rotation and compression. Fixes #1586 2019-05-25 18:23:51 +07:00
grossmj
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
grossmj
a86f881d83 Avoid sending warning message all the time for Ethernet switch. 2019-05-23 15:57:08 +07:00
grossmj
457ae4783f Development on 2.1.19dev1 2019-05-23 14:37:37 +07:00
grossmj
878987a26e Release v2.1.18 2019-05-22 16:13:28 +07:00
grossmj
40d7ae6866 Support to include snapshots in portable projects. 2019-05-22 14:35:37 +07:00
grossmj
39f6f4edd5 Development on 2.2.0dev12 2019-05-21 19:16:19 +07:00
grossmj
5b3be13e73 Release v2.2.0b1 2019-05-21 15:26:54 +07:00
ziajka
16908df8b2 Upgrade GNS3 Web UI to v2019.2.0-alpha.3 2019-05-20 14:23:25 +02:00
grossmj
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
grossmj
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
grossmj
424db843ca Fix Docker extra volumes support 2019-05-19 14:26:03 +07:00
Jeremy Grossmann
cdae1f9e00
Merge pull request #1584 from kazkansouh/2.2-docker-volumes
Custom persistent docker volumes
2019-05-18 20:17:11 +07:00
grossmj
cf0cc8bb87 Ensure Qemu monitor commands are executed. Ref #1582. 2019-05-18 19:31:41 +07:00
grossmj
2340823f53 Update appliance files. 2019-05-18 15:45:28 +07:00
grossmj
470cea327f Fix console variable replacement issue. 2019-05-18 14:31:21 +07:00
grossmj
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
grossmj
a7e449ff0e Bump version to 2.2.0dev11 2019-05-18 14:11:07 +07:00
grossmj
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
grossmj
6b54cc27da Release v2.1.17 2019-05-17 15:10:28 +07:00
Karim
81ddb0cfe6 Impoved docker volumes user input validation 2019-04-22 12:46:28 +01:00
Karim
0c19bc8d43 Support for additional persistent docker volumes to be specified within appliance configuration 2019-04-22 10:26:41 +01:00
grossmj
7543d7587c Release v2.2.0a5 2019-04-15 17:05:20 +07:00
grossmj
f41158173b Development on 2.1.17dev1 2019-04-15 12:41:40 +07:00
grossmj
cb5dc36987 Release v2.1.16 2019-04-15 12:00:18 +07:00
grossmj
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
grossmj
6dbb992513 Fix templates missing after server restart. Fixes https://github.com/GNS3/gns3-gui/issues/2769 2019-04-14 20:39:55 +07:00
grossmj
e962717448 Fix bug when GNS3 VM were not saved. Fix tests. 2019-04-14 17:42:20 +07:00
grossmj
6dc58b28fd Some adjustments with compute WebSocket handling. Ref https://github.com/GNS3/gns3-server/issues/1564 2019-04-14 16:48:12 +07:00
grossmj
6db8cecda5 Merge 2.1 into 2.2 2019-04-13 18:39:06 +07:00
grossmj
cc1980ac1c Fix broken embedded console for Ethernet switch. Fixes #1574 2019-04-11 17:57:47 +07:00
grossmj
2af9c9c8ec Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764 2019-04-10 15:43:51 +07:00
grossmj
8cd66cfc02 Remove old unused argument option. Fixes #1569 2019-04-09 19:26:07 +07:00
grossmj
4d222ddc0a Bump version to 2.2.0dev10 2019-04-09 19:20:21 +07:00
grossmj
5c884702e5 Development on 2.2.0dev9 2019-04-05 22:01:35 +08:00
grossmj
62c5aa2948 Release v2.2.0a4 2019-04-05 19:10:04 +08:00
Jeremy Grossmann
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
grossmj
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
Karim
6df93d4db0 Updated tests for setting docker user 2019-04-05 11:06:35 +01:00
Karim
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
grossmj
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
grossmj
a17119187b Fix remote packet capture for Dynamips. 2019-04-01 20:58:18 +07:00
grossmj
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
grossmj
c075baa05b Store config files in version specific location 2019-04-01 15:53:39 +07:00
grossmj
21bed54768 Fix opening previously saved 2.1 project grid overlapping. Fixes #2734 2019-03-31 16:48:08 +07:00
grossmj
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
ziajka
6a6cabc2d2 Bundle v2019.1.0-alpha.3 web-ui 2019-03-27 12:34:45 +01:00
grossmj
541101741b Development on 2.2.0dev8 2019-03-25 23:44:19 +08:00
grossmj
2b786e40b9 Release v2.2.0a3 2019-03-25 19:35:22 +08:00
grossmj
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
ziajka
106df1d4ab Load v2019.1.0-alpha.2 of WebUI 2019-03-22 14:17:40 +01:00
ziajka
3f4bdfef11 Fix mimetype for javascript, #1559 2019-03-22 08:35:27 +01:00
ziajka
cbb6eccad8 Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2019-03-21 10:39:55 +01:00
ziajka
9edbd27b4f Serve WebUI via get_resource for freezed app 2019-03-21 10:39:49 +01:00
grossmj
645031ee15 Development on 2.1.16dev1 2019-03-21 13:56:11 +08:00
grossmj
c70b344133 Release v2.1.15 2019-03-21 11:41:44 +08:00
grossmj
1f1d93d078 Deactivate the embedded shell for Ethernet switch. Ref #1424 #1556 2019-03-20 16:23:30 +08:00
grossmj
dd211bce52 Fix VBoxManage fails if VM has specific special characters in name. Fixes #2739 2019-03-18 23:29:18 +07:00
grossmj
e00bde51da Merge branch '2.1' into 2.2 2019-03-18 19:26:46 +07:00
grossmj
e291ec1eb9 Fix IOU symlink issue on remote servers. 2019-03-18 18:11:16 +07:00
grossmj
3daa3f450b Fix IOU symlink issue on remote servers. 2019-03-18 18:05:40 +07:00
grossmj
8e8985c69f Fix vcpus configuration for GNS3 VM on VMware. Ref #2738. 2019-03-18 17:53:14 +07:00
grossmj
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
grossmj
4e396ac690 Save the GNS3 VM settings even if the GNS3 VM cannot be stopped. 2019-03-18 15:30:59 +07:00
grossmj
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
grossmj
23b568678a Development on 2.2.0dev7 2019-03-14 23:27:11 +07:00
grossmj
8ad632976f Release v2.2.0a2 2019-03-14 17:09:53 +07:00
ziajka
b8bf2bf465 Web-UI v2019.1.0-alpha.1 2019-03-14 10:44:09 +01:00
grossmj
7d591b0228 Fix issue when loading and quickly closing a project and opening it again. Fixes #1501. 2019-03-14 15:15:27 +07:00
grossmj
a059e6b943 Disable unreliable nested virtualization check. 2019-03-13 23:13:54 +07:00
grossmj
aff67b324f Fix issue not checking build number on Windows. 2019-03-13 12:56:33 +07:00
grossmj
010d65114d Hyper-V with nested virtualization is only supported on Windows 10 Anniversary Update or later. 2019-03-13 02:15:58 +07:00
grossmj
3dcb7799e3 Use accurate info to detect Windows version. 2019-03-12 22:40:37 +07:00