Merge pull request #2430 from GNS3/2.2

Release v2.2.50
GNS3 · Oct 21, 2024 · 97e5a5e · 97e5a5e
2 parents 225779b + 2b5c6ce
commit 97e5a5e
Show file tree

Hide file tree

Showing 34 changed files with 750 additions and 312 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -13,10 +13,16 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
+        os: ["ubuntu-latest"]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        #include:
+          # only test with Python 3.10 on Windows
+        #  - os: windows-latest
+        #    python-version: "3.10"
 
     steps:
     - uses: actions/checkout@v4
@@ -27,7 +33,15 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi
+        python -m pip install -r dev-requirements.txt
+
+    - name: Install Windows specific dependencies
+      if: runner.os == 'Windows'
+      run: |
+        python -m pip install -r win-requirements.txt
+        curl -O "http://www.win10pcap.org/download/Win10Pcap-v10.2-5002.msi"
+        msiexec /i "Win10Pcap-v10.2-5002.msi" /qn /norestart
+
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,19 @@
 # Change Log
 
+## 2.2.50 21/10/2024
+
+* Bundle web-ui v2.2.50
+* Symbolic links support for project export/import
+* Add comment to indicate sentry-sdk is optional. Ref https://github.com/GNS3/gns3-server/issues/2423
+* Fix issues with recent busybox versions
+* Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.
+* Update README.md to change the minimum required Python version.
+* Faster project duplication for local projects (no remote compute)
+* Improve error message when a project cannot be parsed.
+* Fix for running Docker containers with user namespaces enabled
+* Support for configuring MAC address in Docker containers
+* Upgrade aiohttp to v3.10.3
+
 ## 2.2.49 06/08/2024
 
 * Bundle web-ui v2.2.49

diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ must be connected to the Internet in order to install the dependencies.
 
 Dependencies:
 
--   Python 3.6, setuptools and the ones listed
+-   Python >= 3.8, 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:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,6 +1,6 @@
 -rrequirements.txt
 
-pytest==8.3.2
+pytest==8.3.3
 flake8==7.1.0
 pytest-timeout==2.3.1
 pytest-aiohttp==1.0.5
diff --git a/gns3server/appliances/almalinux.gns3a b/gns3server/appliances/almalinux.gns3a
@@ -30,24 +30,24 @@
             "version": "9.2",
             "md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
             "filesize": 563347456,
-            "download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
             "version": "8.8",
             "md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
             "filesize": 565444608,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
             "version": "8.7",
             "md5sum": "b2b8c7fd3b6869362f3f8ed47549c804",
             "filesize": 566231040,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
         },
         {
             "filename": "almalinux-cloud-init-data.iso",

diff --git a/gns3server/appliances/fortigate.gns3a b/gns3server/appliances/fortigate.gns3a
@@ -29,10 +29,10 @@
     },
     "images": [
         {
-            "filename": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
+            "filename": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
             "version": "7.4.4",
             "md5sum": "dfe0e78827ec728631539669001bb23f",
-            "filesize": 100728832,
+            "filesize": 102170624,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
         {
@@ -391,7 +391,7 @@
         {
             "name": "7.4.4",
             "images": {
-                "hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },

diff --git a/gns3server/appliances/hbcd-pe.gns3a b/gns3server/appliances/hbcd-pe.gns3a
@@ -0,0 +1,62 @@
+{
+    "appliance_id": "ac98ab6f-7966-444b-842f-9507c965b8b7",
+    "name": "HBCD-PE",
+    "category": "guest",
+    "description": "Hiren’s BootCD PE (Preinstallation Environment) is a restored edition of Hiren’s BootCD based on Windows 11 PE x64. ",
+    "vendor_name": "hirensbootcd.org",
+    "vendor_url": "https://www.hirensbootcd.org/",
+    "documentation_url": "https://www.hirensbootcd.org/howtos/",
+    "product_name": "Hiren’s BootCD PE",
+    "product_url": "https://www.hirensbootcd.org/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "[email protected]",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 4096,
+        "hda_disk_interface": "sata",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "c",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "HBCD_PE_x64.iso",
+            "version": "1.0.8",
+            "md5sum": "45baab64b088431bdf3370292e9a74b0",
+            "filesize": 3291686912,
+            "download_url": "https://www.hirensbootcd.org/download/",
+            "direct_download_url": "https://www.hirensbootcd.org/files/HBCD_PE_x64.iso"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        },
+        {
+            "filename": "OVMF-edk2-stable202305.fd",
+            "version": "stable202305",
+            "md5sum": "6c4cf1519fec4a4b95525d9ae562963a",
+            "filesize": 4194304,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-edk2-stable202305.fd.zip/download",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "1.0.8",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "HBCD_PE_x64.iso"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/mikrotik-chr.gns3a b/gns3server/appliances/mikrotik-chr.gns3a
@@ -28,149 +28,80 @@
     },
     "images": [
         {
-            "filename": "chr-7.14.2.img",
-            "version": "7.14.2",
-            "md5sum": "531901dac85b67b23011e946a62abc7b",
+            "filename": "chr-7.16.img",
+            "version": "7.16",
+            "md5sum": "a4c2d00a87e73b3129cd66a4e0743c9a",
             "filesize": 134217728,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.14.2/chr-7.14.2.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.16/chr-7.16.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-7.11.2.img",
-            "version": "7.11.2",
-            "md5sum": "fbffd097d2c5df41fc3335c3977f782c",
+            "filename": "chr-7.15.3.img",
+            "version": "7.15.3",
+            "md5sum": "5af8c748a0de4e8e8b303180738721a9",
             "filesize": 134217728,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.11.2/chr-7.11.2.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.15.3/chr-7.15.3.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-7.10.1.img",
-            "version": "7.10.1",
-            "md5sum": "917729e79b9992562f4160d461b21cac",
+            "filename": "chr-7.14.3.img",
+            "version": "7.14.3",
+            "md5sum": "73f527efef81b529b267a0683cb87617",
             "filesize": 134217728,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.10.1/chr-7.10.1.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.14.3/chr-7.14.3.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-7.7.img",
-            "version": "7.7",
-            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-7.6.img",
-            "version": "7.6",
-            "md5sum": "864482f9efaea9d40910c050318f65b9",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-7.3.1.img",
-            "version": "7.3.1",
-            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-7.1.5.img",
-            "version": "7.1.5",
-            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.49.10.img",
-            "version": "6.49.10",
-            "md5sum": "49ae1ecfe310aea1df37b824aa13cf84",
+            "filename": "chr-6.49.17.img",
+            "version": "6.49.17",
+            "md5sum": "ad9f4bd8cd4965a403350deeb5d35b96",
             "filesize": 67108864,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.10/chr-6.49.10.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.17/chr-6.49.17.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-6.49.6.img",
-            "version": "6.49.6",
-            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filename": "chr-6.49.13.img",
+            "version": "6.49.13",
+            "md5sum": "18349e1c3209495e571bcbee8a7e3259",
             "filesize": 67108864,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.48.6.img",
-            "version": "6.48.6",
-            "md5sum": "875574a561570227ff8f395aabe478c6",
-            "filesize": 67108864,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.13/chr-6.49.13.img.zip",
             "compression": "zip"
         }
     ],
     "versions": [
         {
-            "name": "7.11.2",
-            "images": {
-                "hda_disk_image": "chr-7.11.2.img"
-            }
-        },
-        {
-            "name": "7.10.1",
-            "images": {
-                "hda_disk_image": "chr-7.10.1.img"
-            }
-        },
-        {
-            "name": "7.7",
-            "images": {
-                "hda_disk_image": "chr-7.7.img"
-            }
-        },
-        {
-            "name": "7.6",
-            "images": {
-                "hda_disk_image": "chr-7.6.img"
-            }
-        },
-        {
-            "name": "7.3.1",
+            "name": "7.16",
             "images": {
-                "hda_disk_image": "chr-7.3.1.img"
+                "hda_disk_image": "chr-7.16.img"
             }
         },
         {
-            "name": "7.1.5",
+            "name": "7.15.3",
             "images": {
-                "hda_disk_image": "chr-7.1.5.img"
+                "hda_disk_image": "chr-7.15.3.img"
             }
         },
         {
-            "name": "6.49.10",
+            "name": "7.14.3",
             "images": {
-                "hda_disk_image": "chr-6.49.10.img"
+                "hda_disk_image": "chr-7.14.3.img"
             }
         },
         {
-            "name": "6.49.6",
+            "name": "6.49.17",
             "images": {
-                "hda_disk_image": "chr-6.49.6.img"
+                "hda_disk_image": "chr-6.49.17.img"
             }
         },
         {
-            "name": "6.48.6",
+            "name": "6.49.13",
             "images": {
-                "hda_disk_image": "chr-6.48.6.img"
+                "hda_disk_image": "chr-6.49.13.img"
             }
         }
     ]