Skip to content

Commit 97e5a5e

Browse files
grossmjgrossmj
authored
Merge pull request #2430 from GNS3/2.2
Release v2.2.50
2 parents 225779b + 2b5c6ce commit 97e5a5e

34 files changed

+750
-312
lines changed

‎.github/workflows/testing.yml

+16-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ on:
1313
jobs:
1414
build:
1515

16-
runs-on: ubuntu-22.04
16+
runs-on: ${{ matrix.os }}
17+
1718
strategy:
1819
matrix:
20+
os: ["ubuntu-latest"]
1921
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
22+
#include:
23+
# only test with Python 3.10 on Windows
24+
# - os: windows-latest
25+
# python-version: "3.10"
2026

2127
steps:
2228
- uses: actions/checkout@v4
@@ -27,7 +33,15 @@ jobs:
2733
- name: Install dependencies
2834
run: |
2935
python -m pip install --upgrade pip
30-
if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi
36+
python -m pip install -r dev-requirements.txt
37+
38+
- name: Install Windows specific dependencies
39+
if: runner.os == 'Windows'
40+
run: |
41+
python -m pip install -r win-requirements.txt
42+
curl -O "http://www.win10pcap.org/download/Win10Pcap-v10.2-5002.msi"
43+
msiexec /i "Win10Pcap-v10.2-5002.msi" /qn /norestart
44+
3145
- name: Lint with flake8
3246
run: |
3347
# stop the build if there are Python syntax errors or undefined names

‎CHANGELOG

+14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Change Log
22

3+
## 2.2.50 21/10/2024
4+
5+
* Bundle web-ui v2.2.50
6+
* Symbolic links support for project export/import
7+
* Add comment to indicate sentry-sdk is optional. Ref https://github.com/GNS3/gns3-server/issues/2423
8+
* Fix issues with recent busybox versions
9+
* Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.
10+
* Update README.md to change the minimum required Python version.
11+
* Faster project duplication for local projects (no remote compute)
12+
* Improve error message when a project cannot be parsed.
13+
* Fix for running Docker containers with user namespaces enabled
14+
* Support for configuring MAC address in Docker containers
15+
* Upgrade aiohttp to v3.10.3
16+
317
## 2.2.49 06/08/2024
418

519
* Bundle web-ui v2.2.49

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ must be connected to the Internet in order to install the dependencies.
7979

8080
Dependencies:
8181

82-
- Python 3.6, setuptools and the ones listed
82+
- Python >= 3.8, setuptools and the ones listed
8383
[here](https://github.com/GNS3/gns3-server/blob/master/requirements.txt)
8484

8585
The following commands will install some of these dependencies:

‎appveyor.yml

-22
This file was deleted.

‎dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-rrequirements.txt
22

3-
pytest==8.3.2
3+
pytest==8.3.3
44
flake8==7.1.0
55
pytest-timeout==2.3.1
66
pytest-aiohttp==1.0.5

‎gns3server/appliances/almalinux.gns3a

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030
"version": "9.2",
3131
"md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
3232
"filesize": 563347456,
33-
"download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
34-
"direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
33+
"download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/",
34+
"direct_download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
3535
},
3636
{
3737
"filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
3838
"version": "8.8",
3939
"md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
4040
"filesize": 565444608,
41-
"download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
42-
"direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
41+
"download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/",
42+
"direct_download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
4343
},
4444
{
4545
"filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
4646
"version": "8.7",
4747
"md5sum": "b2b8c7fd3b6869362f3f8ed47549c804",
4848
"filesize": 566231040,
49-
"download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
50-
"direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
49+
"download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/",
50+
"direct_download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
5151
},
5252
{
5353
"filename": "almalinux-cloud-init-data.iso",

‎gns3server/appliances/fortigate.gns3a

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
},
3030
"images": [
3131
{
32-
"filename": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
32+
"filename": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
3333
"version": "7.4.4",
3434
"md5sum": "dfe0e78827ec728631539669001bb23f",
35-
"filesize": 100728832,
35+
"filesize": 102170624,
3636
"download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
3737
},
3838
{
@@ -391,7 +391,7 @@
391391
{
392392
"name": "7.4.4",
393393
"images": {
394-
"hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
394+
"hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
395395
"hdb_disk_image": "empty30G.qcow2"
396396
}
397397
},

‎gns3server/appliances/hbcd-pe.gns3a

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"appliance_id": "ac98ab6f-7966-444b-842f-9507c965b8b7",
3+
"name": "HBCD-PE",
4+
"category": "guest",
5+
"description": "Hiren’s BootCD PE (Preinstallation Environment) is a restored edition of Hiren’s BootCD based on Windows 11 PE x64. ",
6+
"vendor_name": "hirensbootcd.org",
7+
"vendor_url": "https://www.hirensbootcd.org/",
8+
"documentation_url": "https://www.hirensbootcd.org/howtos/",
9+
"product_name": "Hiren’s BootCD PE",
10+
"product_url": "https://www.hirensbootcd.org/",
11+
"registry_version": 4,
12+
"status": "stable",
13+
"maintainer": "GNS3 Team",
14+
"maintainer_email": "[email protected]",
15+
"qemu": {
16+
"adapter_type": "e1000",
17+
"adapters": 1,
18+
"ram": 4096,
19+
"hda_disk_interface": "sata",
20+
"arch": "x86_64",
21+
"console_type": "vnc",
22+
"boot_priority": "c",
23+
"kvm": "require"
24+
},
25+
"images": [
26+
{
27+
"filename": "HBCD_PE_x64.iso",
28+
"version": "1.0.8",
29+
"md5sum": "45baab64b088431bdf3370292e9a74b0",
30+
"filesize": 3291686912,
31+
"download_url": "https://www.hirensbootcd.org/download/",
32+
"direct_download_url": "https://www.hirensbootcd.org/files/HBCD_PE_x64.iso"
33+
},
34+
{
35+
"filename": "empty30G.qcow2",
36+
"version": "1.0",
37+
"md5sum": "3411a599e822f2ac6be560a26405821a",
38+
"filesize": 197120,
39+
"download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
40+
"direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
41+
},
42+
{
43+
"filename": "OVMF-edk2-stable202305.fd",
44+
"version": "stable202305",
45+
"md5sum": "6c4cf1519fec4a4b95525d9ae562963a",
46+
"filesize": 4194304,
47+
"download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
48+
"direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-edk2-stable202305.fd.zip/download",
49+
"compression": "zip"
50+
}
51+
],
52+
"versions": [
53+
{
54+
"name": "1.0.8",
55+
"images": {
56+
"bios_image": "OVMF-edk2-stable202305.fd",
57+
"hda_disk_image": "empty30G.qcow2",
58+
"cdrom_image": "HBCD_PE_x64.iso"
59+
}
60+
}
61+
]
62+
}

‎gns3server/appliances/mikrotik-chr.gns3a

+30-99
Original file line numberDiff line numberDiff line change
@@ -28,149 +28,80 @@
2828
},
2929
"images": [
3030
{
31-
"filename": "chr-7.14.2.img",
32-
"version": "7.14.2",
33-
"md5sum": "531901dac85b67b23011e946a62abc7b",
31+
"filename": "chr-7.16.img",
32+
"version": "7.16",
33+
"md5sum": "a4c2d00a87e73b3129cd66a4e0743c9a",
3434
"filesize": 134217728,
3535
"download_url": "http://www.mikrotik.com/download",
36-
"direct_download_url": "https://download.mikrotik.com/routeros/7.14.2/chr-7.14.2.img.zip",
36+
"direct_download_url": "https://download.mikrotik.com/routeros/7.16/chr-7.16.img.zip",
3737
"compression": "zip"
3838
},
3939
{
40-
"filename": "chr-7.11.2.img",
41-
"version": "7.11.2",
42-
"md5sum": "fbffd097d2c5df41fc3335c3977f782c",
40+
"filename": "chr-7.15.3.img",
41+
"version": "7.15.3",
42+
"md5sum": "5af8c748a0de4e8e8b303180738721a9",
4343
"filesize": 134217728,
4444
"download_url": "http://www.mikrotik.com/download",
45-
"direct_download_url": "https://download.mikrotik.com/routeros/7.11.2/chr-7.11.2.img.zip",
45+
"direct_download_url": "https://download.mikrotik.com/routeros/7.15.3/chr-7.15.3.img.zip",
4646
"compression": "zip"
4747
},
4848
{
49-
"filename": "chr-7.10.1.img",
50-
"version": "7.10.1",
51-
"md5sum": "917729e79b9992562f4160d461b21cac",
49+
"filename": "chr-7.14.3.img",
50+
"version": "7.14.3",
51+
"md5sum": "73f527efef81b529b267a0683cb87617",
5252
"filesize": 134217728,
5353
"download_url": "http://www.mikrotik.com/download",
54-
"direct_download_url": "https://download.mikrotik.com/routeros/7.10.1/chr-7.10.1.img.zip",
54+
"direct_download_url": "https://download.mikrotik.com/routeros/7.14.3/chr-7.14.3.img.zip",
5555
"compression": "zip"
5656
},
5757
{
58-
"filename": "chr-7.7.img",
59-
"version": "7.7",
60-
"md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
61-
"filesize": 134217728,
62-
"download_url": "http://www.mikrotik.com/download",
63-
"direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
64-
"compression": "zip"
65-
},
66-
{
67-
"filename": "chr-7.6.img",
68-
"version": "7.6",
69-
"md5sum": "864482f9efaea9d40910c050318f65b9",
70-
"filesize": 134217728,
71-
"download_url": "http://www.mikrotik.com/download",
72-
"direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
73-
"compression": "zip"
74-
},
75-
{
76-
"filename": "chr-7.3.1.img",
77-
"version": "7.3.1",
78-
"md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
79-
"filesize": 134217728,
80-
"download_url": "http://www.mikrotik.com/download",
81-
"direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
82-
"compression": "zip"
83-
},
84-
{
85-
"filename": "chr-7.1.5.img",
86-
"version": "7.1.5",
87-
"md5sum": "9c0be05f891df2b1400bdae5e719898e",
88-
"filesize": 134217728,
89-
"download_url": "http://www.mikrotik.com/download",
90-
"direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
91-
"compression": "zip"
92-
},
93-
{
94-
"filename": "chr-6.49.10.img",
95-
"version": "6.49.10",
96-
"md5sum": "49ae1ecfe310aea1df37b824aa13cf84",
58+
"filename": "chr-6.49.17.img",
59+
"version": "6.49.17",
60+
"md5sum": "ad9f4bd8cd4965a403350deeb5d35b96",
9761
"filesize": 67108864,
9862
"download_url": "http://www.mikrotik.com/download",
99-
"direct_download_url": "https://download.mikrotik.com/routeros/6.49.10/chr-6.49.10.img.zip",
63+
"direct_download_url": "https://download.mikrotik.com/routeros/6.49.17/chr-6.49.17.img.zip",
10064
"compression": "zip"
10165
},
10266
{
103-
"filename": "chr-6.49.6.img",
104-
"version": "6.49.6",
105-
"md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
67+
"filename": "chr-6.49.13.img",
68+
"version": "6.49.13",
69+
"md5sum": "18349e1c3209495e571bcbee8a7e3259",
10670
"filesize": 67108864,
10771
"download_url": "http://www.mikrotik.com/download",
108-
"direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
109-
"compression": "zip"
110-
},
111-
{
112-
"filename": "chr-6.48.6.img",
113-
"version": "6.48.6",
114-
"md5sum": "875574a561570227ff8f395aabe478c6",
115-
"filesize": 67108864,
116-
"download_url": "http://www.mikrotik.com/download",
117-
"direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
72+
"direct_download_url": "https://download.mikrotik.com/routeros/6.49.13/chr-6.49.13.img.zip",
11873
"compression": "zip"
11974
}
12075
],
12176
"versions": [
12277
{
123-
"name": "7.11.2",
124-
"images": {
125-
"hda_disk_image": "chr-7.11.2.img"
126-
}
127-
},
128-
{
129-
"name": "7.10.1",
130-
"images": {
131-
"hda_disk_image": "chr-7.10.1.img"
132-
}
133-
},
134-
{
135-
"name": "7.7",
136-
"images": {
137-
"hda_disk_image": "chr-7.7.img"
138-
}
139-
},
140-
{
141-
"name": "7.6",
142-
"images": {
143-
"hda_disk_image": "chr-7.6.img"
144-
}
145-
},
146-
{
147-
"name": "7.3.1",
78+
"name": "7.16",
14879
"images": {
149-
"hda_disk_image": "chr-7.3.1.img"
80+
"hda_disk_image": "chr-7.16.img"
15081
}
15182
},
15283
{
153-
"name": "7.1.5",
84+
"name": "7.15.3",
15485
"images": {
155-
"hda_disk_image": "chr-7.1.5.img"
86+
"hda_disk_image": "chr-7.15.3.img"
15687
}
15788
},
15889
{
159-
"name": "6.49.10",
90+
"name": "7.14.3",
16091
"images": {
161-
"hda_disk_image": "chr-6.49.10.img"
92+
"hda_disk_image": "chr-7.14.3.img"
16293
}
16394
},
16495
{
165-
"name": "6.49.6",
96+
"name": "6.49.17",
16697
"images": {
167-
"hda_disk_image": "chr-6.49.6.img"
98+
"hda_disk_image": "chr-6.49.17.img"
16899
}
169100
},
170101
{
171-
"name": "6.48.6",
102+
"name": "6.49.13",
172103
"images": {
173-
"hda_disk_image": "chr-6.48.6.img"
104+
"hda_disk_image": "chr-6.49.13.img"
174105
}
175106
}
176107
]

0 commit comments

Comments
 (0)