Skip to content

Commit fe90d2b

Browse files
grossmjgrossmj
committed
Merge branch '2.2' into 3.0
# Conflicts: # gns3server/controller/__init__.py # gns3server/controller/appliance_manager.py # gns3server/crash_report.py # gns3server/run.py # gns3server/static/web-ui/index.html # gns3server/utils/images.py # gns3server/version.py # requirements.txt # scripts/update-bundled-web-ui.sh
2 parents 05d594f + 35e1519 commit fe90d2b

19 files changed

+310
-34
lines changed

‎CHANGELOG

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

3+
## 2.2.42 09/08/2023
4+
5+
* Bundle web-ui v2.2.42
6+
* Handle API version key in VirtualBox 7. Fixes #2266
7+
* Enable system certificate store for SSL connections
8+
* Use DEFAULT_BUFFER_SIZE for md5sum
9+
* Fix version check when installing appliances. Ref https://github.com/GNS3/gns3-gui/issues/3486
10+
* Allow connection to ws console over IPv6. Fixes https://github.com/GNS3/gns3-web-ui/issues/1400
11+
* Support for Python 3.12
12+
* Remove import urllib3 and let sentry_sdk import and patch it. Fixes https://github.com/GNS3/gns3-gui/issues/3498
13+
314
## 2.2.41 12/07/2023
415

516
* Bundle web-ui v2.2.41

‎gns3server/appliances/almalinux.gns3a

+30
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
"kvm": "allow"
2525
},
2626
"images": [
27+
{
28+
"filename": "AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2",
29+
"version": "9.2",
30+
"md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
31+
"filesize": 563347456,
32+
"download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
33+
"direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
34+
},
35+
{
36+
"filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
37+
"version": "8.8",
38+
"md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
39+
"filesize": 565444608,
40+
"download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
41+
"direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
42+
},
2743
{
2844
"filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
2945
"version": "8.7",
@@ -42,6 +58,20 @@
4258
}
4359
],
4460
"versions": [
61+
{
62+
"name": "9.2",
63+
"images": {
64+
"hda_disk_image": "AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2",
65+
"cdrom_image": "almalinux-cloud-init-data.iso"
66+
}
67+
},
68+
{
69+
"name": "8.8",
70+
"images": {
71+
"hda_disk_image": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
72+
"cdrom_image": "almalinux-cloud-init-data.iso"
73+
}
74+
},
4575
{
4676
"name": "8.7",
4777
"images": {

‎gns3server/appliances/centos-cloud.gns3a

+30
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@
2626
"options": "-nographic"
2727
},
2828
"images": [
29+
{
30+
"filename": "CentOS-Stream-GenericCloud-9-20230727.1.x86_64.qcow2",
31+
"version": "Stream-9 (20230727.1)",
32+
"md5sum": "b66b7e4951cb5491ae44d5616d56b7cf",
33+
"filesize": 1128764416,
34+
"download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images",
35+
"direct_download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230727.1.x86_64.qcow2"
36+
},
37+
{
38+
"filename": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
39+
"version": "Stream-8 (20230710.0)",
40+
"md5sum": "83e02ce98c29753c86fb7be7d802aa75",
41+
"filesize": 1676164096,
42+
"download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images",
43+
"direct_download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2"
44+
},
2945
{
3046
"filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
3147
"version": "8.4 (2105)",
@@ -60,6 +76,20 @@
6076
}
6177
],
6278
"versions": [
79+
{
80+
"name": "Stream-9 (20230727.1)",
81+
"images": {
82+
"hda_disk_image": "CentOS-Stream-GenericCloud-9-20230727.1.x86_64.qcow2",
83+
"cdrom_image": "centos-cloud-init-data.iso"
84+
}
85+
},
86+
{
87+
"name": "Stream-8 (20230710.0)",
88+
"images": {
89+
"hda_disk_image": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
90+
"cdrom_image": "centos-cloud-init-data.iso"
91+
}
92+
},
6393
{
6494
"name": "8.4 (2105)",
6595
"images": {

‎gns3server/appliances/debian.gns3a

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
},
2525
"images": [
2626
{
27-
"filename": "debian-12-genericcloud-amd64-20230612-1409.qcow2",
28-
"version": "12.0",
29-
"md5sum": "524cf33a1284d6e3363bd4d843756386",
27+
"filename": "debian-12-genericcloud-amd64-20230723-1450.qcow2",
28+
"version": "12.1",
29+
"md5sum": "6d1efcaa206de01eeeb590d773421c5c",
3030
"filesize": 280166400,
3131
"download_url": "https://cloud.debian.org/images/cloud/bookworm/",
32-
"direct_download_url": "https://cloud.debian.org/images/cloud/bookworm/20230612-1409/debian-12-genericcloud-amd64-20230612-1409.qcow2"
32+
"direct_download_url": "https://cloud.debian.org/images/cloud/bookworm/20230723-1450/debian-12-genericcloud-amd64-20230723-1450.qcow2"
3333
},
3434
{
3535
"filename": "debian-11-genericcloud-amd64-20230601-1398.qcow2",
@@ -58,9 +58,9 @@
5858
],
5959
"versions": [
6060
{
61-
"name": "12.0",
61+
"name": "12.1",
6262
"images": {
63-
"hda_disk_image": "debian-12-genericcloud-amd64-20230612-1409.qcow2",
63+
"hda_disk_image": "debian-12-genericcloud-amd64-20230723-1450.qcow2",
6464
"cdrom_image": "debian-cloud-init-data.iso"
6565
}
6666
},

‎gns3server/appliances/endhost.gns3a

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"appliance_id": "f59a5cf6-baaa-45a6-9685-989a2c3f3f4a",
3+
"name": "endhost",
4+
"category": "guest",
5+
"description": "General purpose alpine-based endhost",
6+
"vendor_name": "endhost",
7+
"vendor_url": "https://www.alpinelinux.org",
8+
"product_name": "endhost",
9+
"registry_version": 4,
10+
"status": "experimental",
11+
"maintainer": "GNS3 Team",
12+
"maintainer_email": "[email protected]",
13+
"docker": {
14+
"adapters": 1,
15+
"image": "gns3/endhost:latest"
16+
}
17+
}

‎gns3server/appliances/extreme-networks-voss.gns3a

+14
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727
"options": "-nographic"
2828
},
2929
"images": [
30+
{
31+
"filename": "VOSSGNS3.8.10.1.0.qcow2",
32+
"version": "v8.10.1.0",
33+
"md5sum": "d8f09f5a9759882be84ad7e4be575ed3",
34+
"filesize": 433258496,
35+
"direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.10.1.0.qcow2"
36+
},
3037
{
3138
"filename": "VOSSGNS3.8.8.0.0.qcow2",
3239
"version": "v8.8.0.0",
@@ -85,6 +92,13 @@
8592
}
8693
],
8794
"versions": [
95+
{
96+
"name": "v8.10.1.0",
97+
"images":
98+
{
99+
"hda_disk_image": "VOSSGNS3.8.10.1.0.qcow2"
100+
}
101+
},
88102
{
89103
"name": "v8.8.0.0",
90104
"images": {

‎gns3server/appliances/fedora-cloud.gns3a

+45
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,30 @@
2626
"options": "-nographic"
2727
},
2828
"images": [
29+
{
30+
"filename": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
31+
"version": "38-1.6",
32+
"md5sum": "53ddfe7b28666d5ddc55e93ff06abad2",
33+
"filesize": 497287168,
34+
"download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images",
35+
"direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/Fedora-Cloud-Base-38-1.6.x86_64.qcow2"
36+
},
37+
{
38+
"filename": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
39+
"version": "37-1.7",
40+
"md5sum": "36f7b464b6ab46ad97c001b539495e90",
41+
"filesize": 492830720,
42+
"download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images",
43+
"direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2"
44+
},
45+
{
46+
"filename": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
47+
"version": "36-1.5",
48+
"md5sum": "7f7cdad25b77f232078bf454c39529d3",
49+
"filesize": 448266240,
50+
"download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images",
51+
"direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2"
52+
},
2953
{
3054
"filename": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
3155
"version": "35-1.2",
@@ -44,6 +68,27 @@
4468
}
4569
],
4670
"versions": [
71+
{
72+
"name": "38-1.6",
73+
"images": {
74+
"hda_disk_image": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
75+
"cdrom_image": "fedora-cloud-init-data.iso"
76+
}
77+
},
78+
{
79+
"name": "37-1.7",
80+
"images": {
81+
"hda_disk_image": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
82+
"cdrom_image": "fedora-cloud-init-data.iso"
83+
}
84+
},
85+
{
86+
"name": "36-1.5",
87+
"images": {
88+
"hda_disk_image": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
89+
"cdrom_image": "fedora-cloud-init-data.iso"
90+
}
91+
},
4792
{
4893
"name": "35-1.2",
4994
"images": {

‎gns3server/appliances/haproxy.gns3a

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"appliance_id": "79df483d-8cc9-48de-85ea-e6cb45b93e2a",
3+
"name": "haproxy",
4+
"category": "guest",
5+
"description": "haproxy alpine container",
6+
"vendor_name": "haproxy",
7+
"vendor_url": "https://www.haproxy.org",
8+
"product_name": "haproxy",
9+
"registry_version": 4,
10+
"status": "experimental",
11+
"maintainer": "GNS3 Team",
12+
"maintainer_email": "[email protected]",
13+
"usage": "Modify /etc/haproxy/haproxy.cfg to suit your needs.",
14+
"docker": {
15+
"adapters": 1,
16+
"image": "gns3/haproxy:latest"
17+
}
18+
}

‎gns3server/appliances/huawei-ce12800.gns3a

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"arch": "x86_64",
2222
"console_type": "telnet",
2323
"kvm": "require",
24-
"options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
24+
"options": "-machine type=pc,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
2525
},
2626
"images": [
2727
{

‎gns3server/appliances/huawei-ne40e.gns3a

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"arch": "x86_64",
2424
"console_type": "telnet",
2525
"kvm": "require",
26-
"options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
26+
"options": "-machine type=pc,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
2727
},
2828
"images": [
2929
{

‎gns3server/appliances/rhel.gns3a

+85-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"availability": "service-contract",
1414
"maintainer": "Neyder Achahuanco",
1515
"maintainer_email": "[email protected]",
16-
"usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.5/x86_64/product-software attach/customize cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
16+
"usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.2/x86_64/product-software attach/customize cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
1717
"qemu": {
1818
"adapter_type": "virtio-net-pci",
1919
"adapters": 1,
@@ -26,6 +26,48 @@
2626
"options": "-nographic"
2727
},
2828
"images": [
29+
{
30+
"filename": "rhel-9.2-x86_64-kvm.qcow2",
31+
"version": "9.2",
32+
"md5sum": "f33845298b387dbcfbf162c6b4e3f8c8",
33+
"filesize": 819265536,
34+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.2/x86_64/product-software"
35+
},
36+
{
37+
"filename": "rhel-baseos-9.1-x86_64-kvm.qcow2",
38+
"version": "9.1",
39+
"md5sum": "622de743da83bcec1ad2959ecaedb8f4",
40+
"filesize": 753401856,
41+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.1/x86_64/product-software"
42+
},
43+
{
44+
"filename": "rhel-baseos-9.0-x86_64-kvm.qcow2",
45+
"version": "9.0",
46+
"md5sum": "4a41497d354fe99a4abf55f1ed73edcb",
47+
"filesize": 696582144,
48+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.0/x86_64/product-software"
49+
},
50+
{
51+
"filename": "rhel-8.8-x86_64-kvm.qcow2",
52+
"version": "8.8",
53+
"md5sum": "bf22af816ba6abd846bbb0c9ecf7bce1",
54+
"filesize": 926810112,
55+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.8/x86_64/product-software"
56+
},
57+
{
58+
"filename": "rhel-8.7-x86_64-kvm.qcow2",
59+
"version": "8.7",
60+
"md5sum": "ab71a2c4cc276441bf999f531e064507",
61+
"filesize": 858128384,
62+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.7/x86_64/product-software"
63+
},
64+
{
65+
"filename": "rhel-8.6-x86_64-kvm.qcow2",
66+
"version": "8.6",
67+
"md5sum": "19501666f46df6b5472db1254e86a339",
68+
"filesize": 832438272,
69+
"download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.6/x86_64/product-software"
70+
},
2971
{
3072
"filename": "rhel-8.5-x86_64-kvm.qcow2",
3173
"version": "8.5",
@@ -70,6 +112,48 @@
70112
}
71113
],
72114
"versions": [
115+
{
116+
"name": "9.2",
117+
"images": {
118+
"hda_disk_image": "rhel-9.2-x86_64-kvm.qcow2",
119+
"cdrom_image": "rhel-cloud-init.iso"
120+
}
121+
},
122+
{
123+
"name": "9.1",
124+
"images": {
125+
"hda_disk_image": "rhel-baseos-9.1-x86_64-kvm.qcow2",
126+
"cdrom_image": "rhel-cloud-init.iso"
127+
}
128+
},
129+
{
130+
"name": "9.0",
131+
"images": {
132+
"hda_disk_image": "rhel-baseos-9.0-x86_64-kvm.qcow2",
133+
"cdrom_image": "rhel-cloud-init.iso"
134+
}
135+
},
136+
{
137+
"name": "8.8",
138+
"images": {
139+
"hda_disk_image": "rhel-8.8-x86_64-kvm.qcow2",
140+
"cdrom_image": "rhel-cloud-init.iso"
141+
}
142+
},
143+
{
144+
"name": "8.7",
145+
"images": {
146+
"hda_disk_image": "rhel-8.7-x86_64-kvm.qcow2",
147+
"cdrom_image": "rhel-cloud-init.iso"
148+
}
149+
},
150+
{
151+
"name": "8.6",
152+
"images": {
153+
"hda_disk_image": "rhel-8.6-x86_64-kvm.qcow2",
154+
"cdrom_image": "rhel-cloud-init.iso"
155+
}
156+
},
73157
{
74158
"name": "8.5",
75159
"images": {

0 commit comments

Comments
 (0)